2004-06-01 Michael Koch <konqueror@gmx.de>

	* java/security/Security.java
	(insertProviderAt): Use equals() instead of ==.
	(removeProvicer): Likewise.
	(getProvider): Likewise.
	* java/security/Signature.java
	(sign): Don't set state to UNINITIALIZED.
	(verify): Likewise.

From-SVN: r82543

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index aed49734797a799161c96feab9b2b0b54b3d4b9b..d775572f2290616445f732e9e692518d5441b161 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2004-06-01  Michael Koch  <konqueror@gmx.de>
+
+       * java/security/Security.java
+       (insertProviderAt): Use equals() instead of ==.
+       (removeProvicer): Likewise.
+       (getProvider): Likewise.
+       * java/security/Signature.java
+       (sign): Don't set state to UNINITIALIZED.
+       (verify): Likewise.
+
 2004-06-01  Mark Wielaard  <mark@klomp.org>
 
        * gnu/java/awt/peer/gtk/GtkComponentPeer.java (requestFocus):

diff --git a/libjava/java/security/Security.java b/libjava/java/security/Security.java
index 25cadcac465a43a9876115a020a9be623706d583..6c8d2b4c04c7e308cd4d89f615c985c660f9fc33 100644 (file)
--- a/libjava/java/security/Security.java
+++ b/libjava/java/security/Security.java
@@ -1,5 +1,5 @@
 /* Security.java --- Java base security class implementation
-   Copyright (C) 1999, 2001, 2002, 2003, 2004, Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -237,7 +237,7 @@ public final class Security
     int max = providers.size ();
     for (int i = 0; i < max; i++)
       {
-       if (((Provider) providers.elementAt(i)).getName() == provider.getName())
+       if (((Provider) providers.elementAt(i)).getName().equals(provider.getName()))
          return -1;
       }
 
@@ -312,7 +312,7 @@ public final class Security
     int max = providers.size ();
     for (int i = 0; i < max; i++)
       {
-       if (((Provider) providers.elementAt(i)).getName() == name)
+       if (((Provider) providers.elementAt(i)).getName().equals(name))
          {
            providers.remove(i);
            break;
@@ -349,7 +349,7 @@ public final class Security
     for (int i = 0; i < max; i++)
       {
        p = (Provider) providers.elementAt(i);
-       if (p.getName() == name)
+       if (p.getName().equals(name))
          return p;
       }
     return null;

diff --git a/libjava/java/security/Signature.java b/libjava/java/security/Signature.java
index bf614e388b3fe43694ce81b1e13e7be4d26dbf2b..b7979791042f8cdcb43a4c981462bb3f3b97c006 100644 (file)
--- a/libjava/java/security/Signature.java
+++ b/libjava/java/security/Signature.java
@@ -1,5 +1,5 @@
 /* Signature.java --- Signature Class
-   Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -368,10 +368,7 @@ public abstract class Signature extends SignatureSpi
   public final byte[] sign() throws SignatureException
   {
     if (state == SIGN)
-      {
-        state = UNINITIALIZED;
-        return engineSign();
-      }
+      return engineSign();
     else
       throw new SignatureException();
   }
@@ -398,10 +395,7 @@ public abstract class Signature extends SignatureSpi
     throws SignatureException
   {
     if (state == SIGN)
-      {
-        state = UNINITIALIZED;
-        return engineSign(outbuf, offset, len);
-      }
+      return engineSign(outbuf, offset, len);
     else
       throw new SignatureException();
   }
@@ -425,10 +419,7 @@ public abstract class Signature extends SignatureSpi
   public final boolean verify(byte[]signature) throws SignatureException
   {
     if (state == VERIFY)
-      {
-        state = UNINITIALIZED;
-        return engineVerify(signature);
-      }
+      return engineVerify(signature);
     else
       throw new SignatureException();
   }
@@ -464,7 +455,7 @@ public abstract class Signature extends SignatureSpi
       throw new SignatureException("illegal state");
 
     if (signature == null)
-      throw new IllegalArgumentException("signaure is null");
+      throw new IllegalArgumentException("signature is null");
     if (offset < 0)
       throw new IllegalArgumentException("offset is less than 0");
     if (length < 0)
@@ -472,7 +463,6 @@ public abstract class Signature extends SignatureSpi
     if (offset + length < signature.length)
       throw new IllegalArgumentException("range is out of bounds");
 
-    state = UNINITIALIZED;
     return engineVerify(signature, offset, length);
   }