summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2006-07-30 22:11:47 +0000
committerMark Wielaard <mark@klomp.org>2006-07-30 22:11:47 +0000
commitf8281aa7c87e365bdf1adcced842e4ae8be87985 (patch)
tree38ea1a047ceb5ff4318aeeedda47fb7ce7df89aa
parent34063436fb8dd5f2235ec693422b1f7946be4bc8 (diff)
downloadclasspath-f8281aa7c87e365bdf1adcced842e4ae8be87985.tar.gz
* gnu/java/security/Engine.java
(getInstance): Ignore self referencing aliases.
-rw-r--r--ChangeLog5
-rw-r--r--gnu/java/security/Engine.java17
2 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d7a3bddd3..af00e869a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-30 Matt Wringe <mwringe@redhat.com>
+
+ * gnu/java/security/Engine.java
+ (getInstance): Ignore self referencing aliases.
+
2006-07-30 Mark Wielaard <mark@klomp.org>
* resource/java/security/classpath.security: Add /dev/urandom as
diff --git a/gnu/java/security/Engine.java b/gnu/java/security/Engine.java
index 59a5d0e52..c6271e3f2 100644
--- a/gnu/java/security/Engine.java
+++ b/gnu/java/security/Engine.java
@@ -166,13 +166,16 @@ public final class Engine
{
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 (! algorithm.equalsIgnoreCase(alias)) // does not refer to itself
+ {
+ 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();
+ }
}
}