Mercurial > hg > icedtea7-forest > jdk
changeset 8920:cc1ed9a35188 jdk7u111-b01
8162344: The API changes made by CR 7064075 need to be reverted
Summary: Remove type parameters added to SecretKeyFactory.getKeySpec and SecretKeyFactorySpi.engineGetKeySpec
Reviewed-by: omajid
| author | andrew |
|---|---|
| date | Fri, 22 Jul 2016 13:58:07 +0100 |
| parents | b015efd2ab82 |
| children | 8364a54c9138 |
| files | src/share/classes/com/sun/crypto/provider/DESKeyFactory.java src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java src/share/classes/com/sun/crypto/provider/PBEKeyFactory.java src/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java src/share/classes/javax/crypto/SecretKeyFactory.java src/share/classes/javax/crypto/SecretKeyFactorySpi.java src/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java |
| diffstat | 7 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/crypto/provider/DESKeyFactory.java Thu Dec 10 12:21:26 2015 +0000 +++ b/src/share/classes/com/sun/crypto/provider/DESKeyFactory.java Fri Jul 22 13:58:07 2016 +0100 @@ -92,7 +92,7 @@ * inappropriate for the given key, or the given key cannot be processed * (e.g., the given key has an unrecognized algorithm or format). */ - protected KeySpec engineGetKeySpec(SecretKey key, Class<?> keySpec) + protected KeySpec engineGetKeySpec(SecretKey key, Class keySpec) throws InvalidKeySpecException { try {
--- a/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java Thu Dec 10 12:21:26 2015 +0000 +++ b/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java Fri Jul 22 13:58:07 2016 +0100 @@ -92,7 +92,7 @@ * inappropriate for the given key, or the given key cannot be processed * (e.g., the given key has an unrecognized algorithm or format). */ - protected KeySpec engineGetKeySpec(SecretKey key, Class<?> keySpec) + protected KeySpec engineGetKeySpec(SecretKey key, Class keySpec) throws InvalidKeySpecException { try {
--- a/src/share/classes/com/sun/crypto/provider/PBEKeyFactory.java Thu Dec 10 12:21:26 2015 +0000 +++ b/src/share/classes/com/sun/crypto/provider/PBEKeyFactory.java Fri Jul 22 13:58:07 2016 +0100 @@ -131,7 +131,7 @@ * inappropriate for the given key, or the given key cannot be processed * (e.g., the given key has an unrecognized algorithm or format). */ - protected KeySpec engineGetKeySpec(SecretKey key, Class<?> keySpecCl) + protected KeySpec engineGetKeySpec(SecretKey key, Class keySpecCl) throws InvalidKeySpecException { if ((key instanceof SecretKey) && (validTypes.contains(key.getAlgorithm().toUpperCase()))
--- a/src/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java Thu Dec 10 12:21:26 2015 +0000 +++ b/src/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java Fri Jul 22 13:58:07 2016 +0100 @@ -86,7 +86,7 @@ * given key cannot be processed (e.g., the given key has an * unrecognized algorithm or format). */ - protected KeySpec engineGetKeySpec(SecretKey key, Class<?> keySpecCl) + protected KeySpec engineGetKeySpec(SecretKey key, Class keySpecCl) throws InvalidKeySpecException { if (key instanceof javax.crypto.interfaces.PBEKey) { // Check if requested key spec is amongst the valid ones
--- a/src/share/classes/javax/crypto/SecretKeyFactory.java Thu Dec 10 12:21:26 2015 +0000 +++ b/src/share/classes/javax/crypto/SecretKeyFactory.java Fri Jul 22 13:58:07 2016 +0100 @@ -368,7 +368,7 @@ * (e.g., the given key has an algorithm or format not supported by this * secret-key factory). */ - public final KeySpec getKeySpec(SecretKey key, Class<?> keySpec) + public final KeySpec getKeySpec(SecretKey key, Class keySpec) throws InvalidKeySpecException { if (serviceIterator == null) { return spi.engineGetKeySpec(key, keySpec);
--- a/src/share/classes/javax/crypto/SecretKeyFactorySpi.java Thu Dec 10 12:21:26 2015 +0000 +++ b/src/share/classes/javax/crypto/SecretKeyFactorySpi.java Fri Jul 22 13:58:07 2016 +0100 @@ -88,7 +88,7 @@ * (e.g., the given key has an algorithm or format not supported by this * secret-key factory). */ - protected abstract KeySpec engineGetKeySpec(SecretKey key, Class<?> keySpec) + protected abstract KeySpec engineGetKeySpec(SecretKey key, Class keySpec) throws InvalidKeySpecException; /**
--- a/src/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java Thu Dec 10 12:21:26 2015 +0000 +++ b/src/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java Fri Jul 22 13:58:07 2016 +0100 @@ -319,7 +319,7 @@ } // see JCE spec - protected KeySpec engineGetKeySpec(SecretKey key, Class<?> keySpec) + protected KeySpec engineGetKeySpec(SecretKey key, Class keySpec) throws InvalidKeySpecException { token.ensureValid(); if ((key == null) || (keySpec == null)) {