diff options
| author | Raif S. Naffah <raif@swiftdsl.com.au> | 2006-02-11 08:48:51 +0000 |
|---|---|---|
| committer | Raif S. Naffah <raif@swiftdsl.com.au> | 2006-02-11 08:48:51 +0000 |
| commit | 990f79695de74b3e87cd87242121bdcbe77fcc3d (patch) | |
| tree | e510bff7f40411dd258a42952c1be166124cf0c9 /gnu/java/security/key/rsa | |
| parent | 660d207c40968d9e77c54cb94f3f72c9f5318ea9 (diff) | |
| download | classpath-990f79695de74b3e87cd87242121bdcbe77fcc3d.tar.gz | |
2006-02-11 Raif S. Naffah <raif@swiftdsl.com.au>
* gnu/java/security/jce/sig/EncodedKeyFactory.java
(engineGeneratePublic): Added support for raw key-specifications.
(engineGeneratePrivate): Likewise.
(decodeDSSPublicKey): New method.
(decodeRSAPublicKey): Likewise.
(decodeDSSPrivateKey): Likewise.
(decodeRSAPrivateKey): Likewise.
* gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
(encodePrivateKey): Throw InvalidParameterException.
(decodePublicKey): Likewise.
(decodePrivateKey): Likewise.
* gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java
(encodePublicKey): Likewise.
(encodePrivateKey): Likewise.
(decodePublicKey): Likewise.
* gnu/java/security/key/dss/DSSKeyPairX509Codec.java
(encodePrivateKey): Likewise.
(decodePublicKey): Likewise.
(decodePrivateKey): Likewise.
* gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java
(encodePublicKey): Likewise.
(encodePrivateKey): Likewise.
(decodePublicKey): Likewise.
Diffstat (limited to 'gnu/java/security/key/rsa')
| -rw-r--r-- | gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java | 12 | ||||
| -rw-r--r-- | gnu/java/security/key/rsa/RSAKeyPairX509Codec.java | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java b/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java index 56b0ecf95..40a67625d 100644 --- a/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java +++ b/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java @@ -82,9 +82,12 @@ public class RSAKeyPairPKCS8Codec return PKCS8_FORMAT; } + /** + * @throws InvalidParameterException ALWAYS. + */ public byte[] encodePublicKey(PublicKey key) { - throw new IllegalArgumentException("Wrong format for public keys"); + throw new InvalidParameterException("Wrong format for public keys"); } /** @@ -129,7 +132,7 @@ public class RSAKeyPairPKCS8Codec public byte[] encodePrivateKey(PrivateKey key) { if (! (key instanceof GnuRSAPrivateKey)) - throw new IllegalArgumentException("Wrong key type"); + throw new InvalidParameterException("Wrong key type"); GnuRSAPrivateKey pk = (GnuRSAPrivateKey) key; BigInteger n = pk.getN(); @@ -198,9 +201,12 @@ public class RSAKeyPairPKCS8Codec return result; } + /** + * @throws InvalidParameterException ALWAYS. + */ public PublicKey decodePublicKey(byte[] input) { - throw new IllegalArgumentException("Wrong format for public keys"); + throw new InvalidParameterException("Wrong format for public keys"); } /** diff --git a/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java b/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java index 1a153b542..5845e7c95 100644 --- a/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java +++ b/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java @@ -167,9 +167,12 @@ public class RSAKeyPairX509Codec return result; } + /** + * @throws InvalidParameterException ALWAYS. + */ public byte[] encodePrivateKey(PrivateKey key) { - throw new IllegalArgumentException("Wrong format for private keys"); + throw new InvalidParameterException("Wrong format for private keys"); } /** @@ -201,7 +204,7 @@ public class RSAKeyPairX509Codec OID algOID = (OID) derOID.getValue(); if (! algOID.equals(RSA_ALG_OID)) - throw new IllegalArgumentException("Unexpected OID: " + algOID); + throw new InvalidParameterException("Unexpected OID: " + algOID); DERValue val = der.read(); if (! (val.getValue() instanceof BitString)) @@ -230,8 +233,11 @@ public class RSAKeyPairX509Codec return new GnuRSAPublicKey(Registry.X509_ENCODING_ID, n, e); } + /** + * @throws InvalidParameterException ALWAYS. + */ public PrivateKey decodePrivateKey(byte[] input) { - throw new IllegalArgumentException("Wrong format for private keys"); + throw new InvalidParameterException("Wrong format for private keys"); } } |