[multiple changes]

2002-10-04  C. Scott Ananian <cananian@lesser-magoo.lcs.mit.edu>

	* java/lang/ProtectionDomain.java (linesep): Remove field.
	(toString): Use System.getProperty("line.separator").

2002-10-04  Michael Koch  <konqueror@gmx.de>

	* java/security/Identity.java: Added serialVersionUID.
	* java/security/KeyPair.java: Added serialVersionUID.
	* java/security/Provider.java: Added serialVersionUID.
	* java/security/SecureRandom.java: Added serialVersionUID.
	* java/security/SecureRandomSpi.java: Added serialVersionUID.
	* java/security/SignedObject.java: Added serialVersionUID.
	* java/security/cert/Certificate.java: Added serialVersionUID.

2002-10-04  Mark Wielaard <mark@klomp.org>

	* java/security/Security.java: Use java.home or gnu.classpath.home
	to load providers.
	(loadProviders): Extra dir argument.
	(getProvider): Return null when not found.

From-SVN: r57827
This commit is contained in:
Mark Wielaard 2002-10-04 20:17:26 +00:00
parent c5d3d49b58
commit 7992cddd91
10 changed files with 46 additions and 11 deletions

View file

@ -59,8 +59,9 @@ public final class Security extends Object
static
{
loadProviders(System.getProperty("java.vm.name"));
loadProviders("classpath");
loadProviders(System.getProperty("java.home"),
System.getProperty("java.vm.name"));
loadProviders(System.getProperty("gnu.classpath.home"), "classpath");
}
// This class can't be instantiated.
@ -68,13 +69,13 @@ public final class Security extends Object
{
}
private static void loadProviders(String vendor)
private static void loadProviders(String dir, String vendor)
{
if (vendor == null)
if (dir == null || vendor == null)
return;
String separator = System.getProperty("file.separator");
String secfilestr = (System.getProperty("java.home") +
String secfilestr = (dir +
separator + "lib" +
separator + "security" +
separator + vendor + ".security");
@ -263,15 +264,15 @@ public final class Security extends Object
*/
public static Provider getProvider(String name)
{
Provider p = null;
Provider p;
int max = providers.size ();
for (int i = 0; i < max; i++)
{
p = (Provider) providers.elementAt(i);
if (p.getName() == name)
break;
return p;
}
return p;
return null;
}
/**