OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Michael Koch 2004-06-01 11:57:10 +00:00 committed by Michael Koch
parent 1460af9501
commit 6ef44cfd0b
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libjava/ChangeLog
View File

@ -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> 2004-06-01 Mark Wielaard <mark@klomp.org>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java (requestFocus): * gnu/java/awt/peer/gtk/GtkComponentPeer.java (requestFocus):

8
libjava/java/security/Security.java
View File

@ -1,5 +1,5 @@
/* Security.java --- Java base security class implementation /* 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. This file is part of GNU Classpath.
@ -237,7 +237,7 @@ public final class Security
int max = providers.size (); int max = providers.size ();
for (int i = 0; i < max; i++) 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; return -1;
} }
@ -312,7 +312,7 @@ public final class Security
int max = providers.size (); int max = providers.size ();
for (int i = 0; i < max; i++) 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); providers.remove(i);
break; break;
@ -349,7 +349,7 @@ public final class Security
for (int i = 0; i < max; i++) for (int i = 0; i < max; i++)
{ {
p = (Provider) providers.elementAt(i); p = (Provider) providers.elementAt(i);
if (p.getName() == name) if (p.getName().equals(name))
return p; return p;
} }
return null; return null;

20
libjava/java/security/Signature.java
View File

@ -1,5 +1,5 @@
/* Signature.java --- Signature Class /* 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. This file is part of GNU Classpath.
@ -368,10 +368,7 @@ public abstract class Signature extends SignatureSpi
public final byte[] sign() throws SignatureException public final byte[] sign() throws SignatureException
{ {
if (state == SIGN) if (state == SIGN)
{ return engineSign();
state = UNINITIALIZED;
return engineSign();
}
else else
throw new SignatureException(); throw new SignatureException();
} }
@ -398,10 +395,7 @@ public abstract class Signature extends SignatureSpi
throws SignatureException throws SignatureException
{ {
if (state == SIGN) if (state == SIGN)
{ return engineSign(outbuf, offset, len);
state = UNINITIALIZED;
return engineSign(outbuf, offset, len);
}
else else
throw new SignatureException(); throw new SignatureException();
} }
@ -425,10 +419,7 @@ public abstract class Signature extends SignatureSpi
public final boolean verify(byte[]signature) throws SignatureException public final boolean verify(byte[]signature) throws SignatureException
{ {
if (state == VERIFY) if (state == VERIFY)
{ return engineVerify(signature);
state = UNINITIALIZED;
return engineVerify(signature);
}
else else
throw new SignatureException(); throw new SignatureException();
} }
@ -464,7 +455,7 @@ public abstract class Signature extends SignatureSpi
throw new SignatureException("illegal state"); throw new SignatureException("illegal state");
if (signature == null) if (signature == null)
throw new IllegalArgumentException("signaure is null"); throw new IllegalArgumentException("signature is null");
if (offset < 0) if (offset < 0)
throw new IllegalArgumentException("offset is less than 0"); throw new IllegalArgumentException("offset is less than 0");
if (length < 0) if (length < 0)
@ -472,7 +463,6 @@ public abstract class Signature extends SignatureSpi
if (offset + length < signature.length) if (offset + length < signature.length)
throw new IllegalArgumentException("range is out of bounds"); throw new IllegalArgumentException("range is out of bounds");
state = UNINITIALIZED;
return engineVerify(signature, offset, length); return engineVerify(signature, offset, length);
} }