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

8286024: PKCS12 keystore shows "DES/CBC" as the algorithm of a DES SecretKeyEntry

Browse Source 
Reviewed-by: valeriep
This commit is contained in:
Weijun Wang 2022-05-02 22:37:32 +00:00
parent f973b78383
commit 50a4df87c8
2 changed files with 53 additions and 1 deletions
src/java.base/share/classes/sun/security/pkcs12
PKCS12KeyStore.java
test/jdk/sun/security/pkcs12
DESName.java

5
src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2022, 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
@ -405,6 +405,9 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
// decode secret key
} else {
byte[] keyBytes = in.getOctetString();
if (keyAlgo.equals(KnownOIDs.OIW_DES_CBC.stdName())) {
keyAlgo = "DES";
}
SecretKeySpec secretKeySpec =
new SecretKeySpec(keyBytes, keyAlgo);

49
test/jdk/sun/security/pkcs12/DESName.java Normal file

@ -0,0 +1,49 @@
/*
* Copyright (c) 2022, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8286024
* @library /test/lib
* @summary PKCS12 keystore shows "DES/CBC" as the algorithm of a DES SecretKeyEntry
*/
import jdk.test.lib.Asserts;
import javax.crypto.KeyGenerator;
import java.security.Key;
import java.security.KeyStore;
public class DESName {
public static void main(String[] args) throws Exception {
char[] pass = "changeit".toCharArray();
KeyStore ks = KeyStore.getInstance("PKCS12");
ks.load(null, null);
KeyGenerator g = KeyGenerator.getInstance("DES");
Key k = g.generateKey();
Asserts.assertEQ(k.getAlgorithm(), "DES");
ks.setKeyEntry("d", k, pass, null);
k = ks.getKey("d", pass);
Asserts.assertEQ(k.getAlgorithm(), "DES");
}
}