stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8251117: Cannot check P11Key size in P11Cipher and P11AEADCipher

Browse Source 
Reviewed-by: valeriep
This commit is contained in:
Zdenek Zambersky 2020-08-04 17:19:21 -03:00 committed by Martin Balao
parent ed5696dd2c
commit 1cc09ccaef
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java
View File

@ -280,7 +280,9 @@ final class P11AEADCipher extends CipherSpi {
SecureRandom sr) SecureRandom sr)
throws InvalidKeyException, InvalidAlgorithmParameterException { throws InvalidKeyException, InvalidAlgorithmParameterException {
reset(true); reset(true);
if (fixedKeySize != -1 && key.getEncoded().length != fixedKeySize) { if (fixedKeySize != -1 &&
((key instanceof P11Key) ? ((P11Key) key).length() >> 3 :
key.getEncoded().length) != fixedKeySize) {
throw new InvalidKeyException("Key size is invalid"); throw new InvalidKeyException("Key size is invalid");
} }
P11Key newKey = P11SecretKeyFactory.convertKey(token, key, ALGO); P11Key newKey = P11SecretKeyFactory.convertKey(token, key, ALGO);

4
src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java
View File

@ -345,7 +345,9 @@ final class P11Cipher extends CipherSpi {
SecureRandom random) SecureRandom random)
throws InvalidKeyException, InvalidAlgorithmParameterException { throws InvalidKeyException, InvalidAlgorithmParameterException {
reset(true); reset(true);
if (fixedKeySize != -1 && key.getEncoded().length != fixedKeySize) { if (fixedKeySize != -1 &&
((key instanceof P11Key) ? ((P11Key) key).length() >> 3 :
key.getEncoded().length) != fixedKeySize) {
throw new InvalidKeyException("Key size is invalid"); throw new InvalidKeyException("Key size is invalid");
} }
switch (opmode) { switch (opmode) {