From 2df02dca8b74f6ac6f71bda19b03978510657be7 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 4 Oct 2002 20:17:26 +0000 Subject: 2002-10-04 C. Scott Ananian * java/lang/ProtectionDomain.java (linesep): Remove field. (toString): Use System.getProperty("line.separator"). 2002-10-04 Michael Koch * 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 * java/security/Security.java: Use java.home or gnu.classpath.home to load providers. (loadProviders): Extra dir argument. (getProvider): Return null when not found. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@57827 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/security/Security.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'libjava/java/security/Security.java') diff --git a/libjava/java/security/Security.java b/libjava/java/security/Security.java index 2c73da62dde..9ae90ba365c 100644 --- a/libjava/java/security/Security.java +++ b/libjava/java/security/Security.java @@ -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; } /** -- cgit v1.2.3