diff options
author | Mark Wielaard <mark@klomp.org> | 2006-07-29 15:51:16 +0000 |
---|---|---|
committer | Mark Wielaard <mark@klomp.org> | 2006-07-29 15:51:16 +0000 |
commit | 36fd88a9441d38f8756724539c412b4e76dbab04 (patch) | |
tree | b22b16316df248df8a0eac84214e9659a89121ff /gnu/java | |
parent | ab446e5fd427510c0dd2f7e6e474cabfc4393dad (diff) | |
download | classpath-36fd88a9441d38f8756724539c412b4e76dbab04.tar.gz |
2006-07-29 Matt Wringe <mwringe@redhat.com>
* gnu/java/security/Engine.java
(getInstance): Add case insentivity to algorithm names
* java/security/Provider.java
(put): Stop using canonical key naming
(remove): Likewise
(toCanonicalKey): Method removed
(get): Method removed, no longer needs to overwrite
parent implementation
Diffstat (limited to 'gnu/java')
-rw-r--r-- | gnu/java/security/Engine.java | 47 |
1 files changed, 34 insertions, 13 deletions
diff --git a/gnu/java/security/Engine.java b/gnu/java/security/Engine.java index 4b6bd10d9..59a5d0e52 100644 --- a/gnu/java/security/Engine.java +++ b/gnu/java/security/Engine.java @@ -42,6 +42,7 @@ import java.lang.reflect.InvocationTargetException; import java.security.NoSuchAlgorithmException; import java.security.Provider; +import java.util.Enumeration; /** * Generic implementation of the getInstance methods in the various @@ -141,26 +142,46 @@ public final class Engine || provider == null || initArgs == null) throw new IllegalArgumentException(); - // If there is no property "service.algorithm" - if (provider.getProperty(service + "." + algorithm) == null) + + Enumeration enumer = provider.propertyNames(); + String key; + String alias; + int count = 0; + boolean algorithmFound = false; + + while (enumer.hasMoreElements()) { - // Iterate through aliases, until we find the class name or resolve - // too many aliases. - String alias = null; - int count = 0; - while ((alias = provider.getProperty( - ALG_ALIAS + service + "." + algorithm)) != null) + key = (String) enumer.nextElement(); + + if (key.equalsIgnoreCase(service + "." + algorithm)) + { + // remove the service portion from the key + algorithm = key.substring(service.length() + 1); + + algorithmFound = true; + break; + + } + else if (key.equalsIgnoreCase(ALG_ALIAS + service + "." + algorithm)) { - if (algorithm.equals(alias)) // Refers to itself! - break; + + alias = (String) provider.getProperty(key); algorithm = alias; if (count++ > MAX_ALIASES) throw new NoSuchAlgorithmException("too many aliases"); + + // need to reset enumeration to now look for the alias + enumer = provider.propertyNames(); + } - if (provider.getProperty(service + "." + algorithm) == null) - throw new NoSuchAlgorithmException(algorithm); } - + + if (! algorithmFound) + { + throw new NoSuchAlgorithmException(algorithm); + } + + // Find and instantiate the implementation. Class clazz = null; ClassLoader loader = provider.getClass().getClassLoader(); |