infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 03:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8375549: ConcurrentModificationException if jdk.crypto.disabledAlgorithms has multiple entries with known oid

Browse Source 
Reviewed-by: mullan, coffeys
This commit is contained in:
Valerie Peng 2026-01-23 19:46:40 +00:00
parent e617ccd529
commit e55124041e
2 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java.base/share/classes/sun/security/util/CryptoAlgorithmConstraints.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -82,8 +82,10 @@ public class CryptoAlgorithmConstraints extends AbstractAlgorithmConstraints {
CryptoAlgorithmConstraints(String propertyName) { CryptoAlgorithmConstraints(String propertyName) {
super(null); super(null);
disabledServices = getAlgorithms(propertyName, true); disabledServices = getAlgorithms(propertyName, true);
debug("Before " + Arrays.deepToString(disabledServices.toArray())); String[] entries = disabledServices.toArray(new String[0]);
for (String dk : disabledServices) { debug("Before " + Arrays.deepToString(entries));
for (String dk : entries) {
int idx = dk.indexOf("."); int idx = dk.indexOf(".");
if (idx < 1 || idx == dk.length() - 1) { if (idx < 1 || idx == dk.length() - 1) {
// wrong syntax: missing "." or empty service or algorithm // wrong syntax: missing "." or empty service or algorithm

47
test/jdk/javax/crypto/Cipher/TestDisabledWithOids.java Normal file
View File

@ -0,0 +1,47 @@
/*
* Copyright (c) 2026, 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 8375549
* @summary Test JCE layer algorithm restriction using algorithms w/ oids
* @library /test/lib
* @run main/othervm -Djdk.crypto.disabledAlgorithms=Cipher.DES,Cipher.RSA/ECB/PKCS1Padding TestDisabledWithOids
* @run main/othervm -Djdk.crypto.disabledAlgorithms=Cipher.RSA/ECB/PKCS1Padding,Cipher.DES TestDisabledWithOids
*/
import java.security.NoSuchAlgorithmException;
import javax.crypto.Cipher;
import jdk.test.lib.Utils;
public class TestDisabledWithOids {
public static void main(String[] args) throws Exception {
String algo1 = "RSA/ECB/PKCS1Padding";
String algo2 = "DES";
Utils.runAndCheckException(() -> Cipher.getInstance(algo1),
NoSuchAlgorithmException.class);
Utils.runAndCheckException(() -> Cipher.getInstance(algo2),
NoSuchAlgorithmException.class);
System.out.println("Done");
}
}