infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-07 00:48:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

8318328: DHKEM should check XDH name in case-insensitive mode

Browse Source 
Reviewed-by: ascarpino, hchao
This commit is contained in:
Weijun Wang 2023-10-17 19:36:17 +00:00
parent c566dfccf8
commit 5145e5a40a
3 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java.base/share/classes/com/sun/crypto/provider/DHKEM.java
View File

@ -353,9 +353,9 @@ public class DHKEM implements KEMSpi {
}
} else if (k instanceof XECKey xkey
&& xkey.getParams() instanceof NamedParameterSpec ns) {
if (ns.getName().equals("X25519")) {
if (ns.getName().equalsIgnoreCase("X25519")) {
return Params.X25519;
} else if (ns.getName().equals("X448")) {
} else if (ns.getName().equalsIgnoreCase("X448")) {
return Params.X448;
}
}

2
src/java.base/share/classes/sun/security/ec/XDHPrivateKeyImpl.java
View File

@ -103,7 +103,7 @@ public final class XDHPrivateKeyImpl extends PKCS8Key implements XECPrivateKey {
@Override
public PublicKey calculatePublicKey() {
XECParameters params = paramSpec.getName().equals("X25519")
XECParameters params = paramSpec.getName().equalsIgnoreCase("X25519")
? XECParameters.X25519
: XECParameters.X448;
try {

63
test/jdk/com/sun/crypto/provider/DHKEM/NameSensitiveness.java Normal file
View File

@ -0,0 +1,63 @@
/*
* Copyright (c) 2023, 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 8318328
* @summary DHKEM should check XDH name in case-insensitive mode
* @library /test/lib
* @modules java.base/com.sun.crypto.provider
*/
import javax.crypto.KEM;
import java.math.BigInteger;
import java.security.KeyPairGenerator;
import java.security.interfaces.XECPublicKey;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.NamedParameterSpec;
public class NameSensitiveness {
public static void main(String[] args) throws Exception {
var g = KeyPairGenerator.getInstance("XDH");
g.initialize(NamedParameterSpec.X25519);
var pk1 = (XECPublicKey) g.generateKeyPair().getPublic();
var pk2 = new XECPublicKey() {
public BigInteger getU() {
return pk1.getU();
}
public AlgorithmParameterSpec getParams() {
return new NamedParameterSpec("x25519"); // lowercase!!!
}
public String getAlgorithm() {
return pk1.getAlgorithm();
}
public String getFormat() {
return pk1.getFormat();
}
public byte[] getEncoded() {
return pk1.getEncoded();
}
};
var kem = KEM.getInstance("DHKEM");
kem.newEncapsulator(pk2);
}
}