diff options
| author | Raif S. Naffah <raif@swiftdsl.com.au> | 2006-02-19 01:45:42 +0000 |
|---|---|---|
| committer | Raif S. Naffah <raif@swiftdsl.com.au> | 2006-02-19 01:45:42 +0000 |
| commit | 70be1e6d568d0e673204711d4546585901c1303c (patch) | |
| tree | b4ce6af9b5d310c4e5962a840146900ca3cb43b4 /gnu/java/security/key/dss/DSSKey.java | |
| parent | c368cf0534aaddd5a3f26a76611650081dca9273 (diff) | |
| download | classpath-70be1e6d568d0e673204711d4546585901c1303c.tar.gz | |
2006-02-19 Raif S. Naffah <raif@swiftdsl.com.au>
* gnu/javax/crypto/key/OutgoingMessage.java (writePublicKey): Handle new
internal format.
(writePrivateKey): Likewise.
(writeKey): New method.
(getKeyType): Likewise.
* gnu/javax/crypto/key/IncomingMessage.java (readPublicKey): Handle new
internal format.
(readPrivateKey): Likewise.
(getKeyPairCodec): New method.
* gnu/javax/crypto/key/srp6/SRPKey.java (getFormat): Always return Raw.
* gnu/javax/crypto/key/dh/GnuDHKey.java (getFormat): Use FormatUtil.
* gnu/java/security/Registry.java (RSA_SIG_PREFIX): New constant.
(RSA_PSS_ENCODING): Likewise..
(RSA_PKCS1_V1_5_ENCODING): Likewise.
(RSA_PSS_SIG): Redefined using other constants.
(RSA_PKCS1_V1_5_SIG): Likewise.
(MAGIC_RAW_RSA_PKCS1V1_5_SIGNATURE): New constant.
* gnu/java/security/util/FormatUtil.java: New file.
* gnu/java/security/sig/SignatureFactory.java (names): New field.
(getInstance): Let RSASignatureFactory handle RSA signature names.
(getNames): Handle new RSA signature (with format) names.
* gnu/java/security/sig/SignatureCodecFactory.java: New file.
* gnu/java/security/sig/BaseSignature.java (BaseSignature): Add check
for null md.
(name): Include hash algorithm name.
* gnu/java/security/sig/rsa/RSASignatureFactory.java: New file.
* gnu/java/security/sig/rsa/RSAPSSSignature.java
(RSAPSSSignature): Call constructor with IMessageDigest.
(RSAPSSSignature(ImessageDigest,int)): New constructor.
* gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.java: New
file.
* gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.java:
Likewise.
* gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java
(RSAPKCS1V1_5Signature(String)): Call constructor with IMessageDigest.
(RSAPKCS1V1_5Signature(IMessageDigest)): New constructor.
* gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java (getInstance): Added
hash algorithm name to exception.
* gnu/java/security/sig/dss/DSSSignatureX509Codec.java: New file.
* gnu/java/security/key/KeyPairCodecFactory.java
(names): New class field.
(getInstance(Sitrng)): Deconstruct and call getInstance(String,String).
(getInstance(String,String)): New method.
(getInstance(String,int)): New method.
(getInstance(byte[])): Removed.
(getInstance(Key)): Handle new formats.
(getNames): Likewise.
(getEncodingName(int)): Moved to FormatUtil.
(getEncodingShortName(int)): Likewise.
(getRawCodec(String)): New method.
(getX509Codec(String)): Likewise.
(getPKCS8Codec(String)): Likewise.
(getRawCodec(Key)): Likewise.
(getX509Codec(Key)): Likewise.
(getPKCS8Codec(Key)): Likewise.
* gnu/java/security/key/dss/DSSKey.java (getFormat): Use FormatUtil.
* gnu/java/security/key/rsa/GnuRSAKey.java (getFormat): Likewise.
* gnu/java/security/jce/sig/SHA512withRSA.java: New File.
* gnu/java/security/jce/sig/SHA384withRSA.java: Likewise.
* gnu/java/security/jce/sig/SHA256withRSA.java: Likewise.
* gnu/java/security/jce/sig/SHA160withRSA.java: Likewise.
* gnu/java/security/jce/sig/SHA160withDSS.java: Likewsie.
* gnu/java/security/jce/sig/MD5withRSA.java: Likewise.
* gnu/java/security/jce/sig/MD2withRSA.java: Likewise.
Diffstat (limited to 'gnu/java/security/key/dss/DSSKey.java')
| -rw-r--r-- | gnu/java/security/key/dss/DSSKey.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/java/security/key/dss/DSSKey.java b/gnu/java/security/key/dss/DSSKey.java index 96d9c6703..8c906a650 100644 --- a/gnu/java/security/key/dss/DSSKey.java +++ b/gnu/java/security/key/dss/DSSKey.java @@ -40,7 +40,7 @@ package gnu.java.security.key.dss; import gnu.java.security.Registry; import gnu.java.security.key.IKeyPairCodec; -import gnu.java.security.key.KeyPairCodecFactory; +import gnu.java.security.util.FormatUtil; import java.math.BigInteger; import java.security.Key; @@ -60,7 +60,7 @@ import java.security.spec.DSAParameterSpec; * the relevant <code>getEncoded()</code> methods of each of the private and * public keys.</p> * - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * @see DSSPrivateKey#getEncoded * @see DSSPublicKey#getEncoded */ @@ -147,7 +147,7 @@ public abstract class DSSKey implements Key, DSAKey public String getFormat() { - return KeyPairCodecFactory.getEncodingShortName(defaultFormat); + return FormatUtil.getEncodingShortName(defaultFormat); } // Other instance methods -------------------------------------------------- |