forked from openjdk/jdk
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8189441: Define algorithm names for keys derived from KeyAgreement
Reviewed-by: mullan
- Loading branch information
Showing
10 changed files
with
162 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * Copyright (c) 2025, 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 8189441 | ||
| * @library /test/lib /test/jdk/sun/security/pkcs11 | ||
| * @summary make sure Generic is accepted by all KeyAgreement implementations | ||
| * @run main Generic builtin | ||
| * @run main/othervm Generic nss | ||
| * @run main/othervm -DCUSTOM_P11_CONFIG_NAME=p11-nss-sensitive.txt Generic nss | ||
| */ | ||
| import jdk.test.lib.Asserts; | ||
|
|
||
| import javax.crypto.KeyAgreement; | ||
| import java.security.KeyPairGenerator; | ||
| import java.security.Provider; | ||
| import java.security.Security; | ||
| import java.util.List; | ||
|
|
||
| public class Generic { | ||
|
|
||
| public static void main(String[] args) throws Exception { | ||
| if (args[0].equals("nss")) { | ||
| test(PKCS11Test.getSunPKCS11(PKCS11Test.getNssConfig())); | ||
| } else { | ||
| for (var p : Security.getProviders()) { | ||
| test(p); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| static void test(Provider p) throws Exception { | ||
| for (var s : p.getServices()) { | ||
| if (s.getType().equalsIgnoreCase("KeyAgreement")) { | ||
| try { | ||
| System.out.println(s.getProvider().getName() + "." + s.getAlgorithm()); | ||
| var g = KeyPairGenerator.getInstance(ka2kpg(s.getAlgorithm()), p); | ||
| var kp1 = g.generateKeyPair(); | ||
| var kp2 = g.generateKeyPair(); | ||
| var ka = KeyAgreement.getInstance(s.getAlgorithm(), s.getProvider()); | ||
| for (var alg : List.of("TlsPremasterSecret", "Generic")) { | ||
| ka.init(kp1.getPrivate()); | ||
| ka.doPhase(kp2.getPublic(), true); | ||
| Asserts.assertEquals( | ||
| ka.generateSecret(alg).getAlgorithm(), alg); | ||
| } | ||
| } catch (Exception e) { | ||
| throw e; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Find key algorithm from KeyAgreement algorithm | ||
| private static String ka2kpg(String ka) { | ||
| return ka.equals("ECDH") ? "EC" : ka; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters