2006-07-30 Matt Wringe <mwringe@redhat.com>

       * gnu/java/security/Engine.java
       (getInstance): Ignore self referencing aliases.

2 files changed, 15 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f58a1740..2f27fd043 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>
 
 	* javax/swing/JComponent.java (getListeners): Revert
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();
+              }
           }
       }