diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/security/Security.java | 15 |
2 files changed, 16 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 91c0789..af82b9b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2001-10-17 Tom Tromey <tromey@redhat.com> + + * java/security/Security.java (loadProviders): Added `vendor' + argument. + Load both `classpath' and `java.vm.name' providers. + 2001-10-17 Anthony Green <green@redhat.com> * java/security/Security.java (loadProviders): Fix bug in how diff --git a/libjava/java/security/Security.java b/libjava/java/security/Security.java index 1de341c..373637a 100644 --- a/libjava/java/security/Security.java +++ b/libjava/java/security/Security.java @@ -49,7 +49,8 @@ public final class Security extends Object static { - loadProviders(); + loadProviders(System.getProperty("java.vm.name")); + loadProviders("classpath"); } // This class can't be instantiated. @@ -57,12 +58,16 @@ public final class Security extends Object { } - private static void loadProviders() + private static void loadProviders(String vendor) { + if (vendor == null) + return; + String separator = System.getProperty("file.separator"); - String secfilestr = System.getProperty("java.home") + - separator + "lib" + separator + "security" + separator + - "classpath.security"; + String secfilestr = (System.getProperty("java.home") + + separator + "lib" + + separator + "security" + + separator + vendor + ".security"); providerCount = 0; try |