Integrate work by Raif S.

Integrate work by Raif S. Naffah (raif@fl.net.au)
	* java/security/DummyKeyPairGenerator.java (clone): New method.
	* java/security/DummyMessageDigest.java (clone): New method.
	(engineUpdate): Now public.
	(engineReset): Likewise.
	(engineDigest): Likewise.
	(engineGetDigestLength): New method.
	* java/security/DummySignature.java (clone): New method.
	* java/security/KeyPairGenerator.java (provider): Now package private.
	(getInstance(String)): Use getInstance(String,Provider).
	(getInstance(String,String): Use getInstance(String,Provider)
	(getInstance(String,Provider): New method.
	(getInstance(String,String,Provider): Don't cast DummyKeyPairGenerator.
	* java/security/KeyPairGeneratorSpi.java (clone): New method.
	* java/security/MessageDigest.java (provider): Now package private.
	(getInstance(String): Use getInstance(String,Provider).
	(getInstance(String,String): Use getInstance(String,Provider)
	(getInstance(String,Provider): New method.
	* java/security/Provider.java (toCanonicalKey): New method.
	(get): New method that uses toCanonicalKey().
	(put): Use toCanonicalKey().
	(remove): Likewise.
	* java/security/Security.java (insertProviderAt): Provider index is one
	based, not zero based.
	(addProvider): Likewise.
	(removeProvider): Likewise.
	* java/security/Signature.java (provider): Now package private.
	(getInstance(String)): Use getInstance(String,Provider).
	(getInstance(String,String): Use getInstance(String,Provider)
	(getInstance(String,Provider): New method.
	(getInstance(String,String,Provider): Don't cast DummySignature.

From-SVN: r59179
This commit is contained in:
Mark Wielaard 2002-11-17 00:10:24 +00:00 committed by Mark Wielaard
parent aaefd21647
commit b0fc58713d
10 changed files with 349 additions and 116 deletions

View file

@ -1,5 +1,5 @@
/* DummyMessageDigest.java
Copyright (C) 1999 Free Software Foundation, Inc.
/* DummyMessageDigest.java - Wrapper for MessageDigestSpi
Copyright (C) 1999, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -37,10 +37,6 @@ exception statement from your version. */
package java.security;
import java.security.MessageDigest;
import java.security.MessageDigestSpi;
import java.security.DigestException;
final class DummyMessageDigest extends MessageDigest
{
private MessageDigestSpi mdSpi = null;
@ -51,23 +47,47 @@ final class DummyMessageDigest extends MessageDigest
this.mdSpi = mdSpi;
}
protected void engineUpdate(byte input)
public Object clone() throws CloneNotSupportedException
{
mdSpi.engineUpdate(input);
if (!(mdSpi instanceof Cloneable))
throw new CloneNotSupportedException();
MessageDigest result = new DummyMessageDigest
((MessageDigestSpi) mdSpi.clone(), this.getAlgorithm());
result.provider = this.getProvider();
return result;
}
protected void engineUpdate(byte[]input, int offset, int len)
{
mdSpi.engineUpdate(input, offset, len);
}
// java.security.MessageDigestSpi abstract methods implementation ---------
protected byte[] engineDigest()
public byte[] engineDigest()
{
return mdSpi.engineDigest();
}
protected void engineReset()
public int engineDigest(byte[] buf, int offset, int len)
throws DigestException
{
return mdSpi.engineDigest(buf, offset, len);
}
public int engineGetDigestLength()
{
return mdSpi.engineGetDigestLength();
}
public void engineReset()
{
mdSpi.engineReset();
}
public void engineUpdate(byte input)
{
mdSpi.engineUpdate(input);
}
public void engineUpdate(byte[] input, int offset, int len)
{
mdSpi.engineUpdate(input, offset, len);
}
}