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

8214513: A PKCS12 keystore from Java 8 using custom PBE parameters cannot be read in Java 11

Browse source 
Reviewed-by: mullan
This commit is contained in:
Weijun Wang 2018-12-05 08:48:49 +08:00
parent bffe795d2d
commit 8036ce51b2
2 changed files with 174 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,7 +26,6 @@
package com.sun.crypto.provider;
import java.io.*;
import java.math.BigInteger;
import java.security.NoSuchAlgorithmException;
import java.security.AlgorithmParametersSpi;
import java.security.spec.AlgorithmParameterSpec;
@ -264,7 +263,20 @@ abstract class PBES2Parameters extends AlgorithmParametersSpi {
throw new IOException("PBE parameter parsing error: "
+ "not an ASN.1 SEQUENCE tag");
}
kdfAlgo = parseKDF(pBES2_params.data.getDerValue());
DerValue kdf = pBES2_params.data.getDerValue();
// Before JDK-8202837, PBES2-params was mistakenly encoded like
// an AlgorithmId which is a sequence of its own OID and the real
// PBES2-params. If the first DerValue is an OID instead of a
// PBES2-KDFs (which should be a SEQUENCE), we are likely to be
// dealing with this buggy encoding. Skip the OID and treat the
// next DerValue as the real PBES2-params.
if (kdf.getTag() == DerValue.tag_ObjectId) {
pBES2_params = pBES2_params.data.getDerValue();
kdf = pBES2_params.data.getDerValue();
}
kdfAlgo = parseKDF(kdf);
if (pBES2_params.tag != DerValue.tag_Sequence) {
throw new IOException("PBE parameter parsing error: "