archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8202837: PBES2 AlgorithmId encoding error in PKCS12 KeyStore

Browse source 
Reviewed-by: xuelei
This commit is contained in:
Weijun Wang 2018-07-19 00:14:40 +08:00
parent a825fe0a2d
commit bde972d645
3 changed files with 170 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
View file

@ -2098,7 +2098,8 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
RetryWithZero.run(pass -> {
// Use JCE
SecretKey skey = getPBEKey(pass);
Cipher cipher = Cipher.getInstance(algOid.toString());
Cipher cipher = Cipher.getInstance(
mapPBEParamsToAlgorithm(algOid, algParams));
cipher.init(Cipher.DECRYPT_MODE, skey, algParams);
loadSafeContents(new DerInputStream(cipher.doFinal(rawData)));
return null;