undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
237
test/jdk/java/security/KeyAgreement/KeySizeTest.java
Normal file
237
test/jdk/java/security/KeyAgreement/KeySizeTest.java
Normal file
|
|
@ -0,0 +1,237 @@
|
|||
/*
|
||||
* Copyright (c) 2018, 2024, 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 8184359
|
||||
* @summary KeyLength support test for DiffieHellman, EC, XDH.
|
||||
* Arguments order <KeyExchangeAlgorithm> <Provider> <KeyGenAlgorithm> <keyLen>
|
||||
* @library /test/lib
|
||||
* @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 512
|
||||
* @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 768
|
||||
* @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 832
|
||||
* @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 1024
|
||||
* @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 2048
|
||||
* @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 3072
|
||||
* @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 4096
|
||||
* @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 6144
|
||||
* @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 8192
|
||||
* @run main/othervm KeySizeTest ECDH SunEC EC 256
|
||||
* @run main/othervm KeySizeTest ECDH SunEC EC 384
|
||||
* @run main/othervm KeySizeTest ECDH SunEC EC 521
|
||||
* @run main KeySizeTest XDH SunEC XDH 255
|
||||
* @run main KeySizeTest XDH SunEC XDH 448
|
||||
*/
|
||||
import java.math.BigInteger;
|
||||
import java.security.KeyFactory;
|
||||
import java.security.KeyPair;
|
||||
import java.security.KeyPairGenerator;
|
||||
import java.security.interfaces.ECPrivateKey;
|
||||
import java.security.interfaces.ECPublicKey;
|
||||
import java.security.interfaces.XECPrivateKey;
|
||||
import java.security.interfaces.XECPublicKey;
|
||||
import java.security.spec.PKCS8EncodedKeySpec;
|
||||
import java.security.spec.X509EncodedKeySpec;
|
||||
import java.security.spec.NamedParameterSpec;
|
||||
import java.util.Arrays;
|
||||
import java.util.HexFormat;
|
||||
import javax.crypto.KeyAgreement;
|
||||
import javax.crypto.interfaces.DHPrivateKey;
|
||||
import javax.crypto.interfaces.DHPublicKey;
|
||||
|
||||
public class KeySizeTest {
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
|
||||
String kaAlgo = args[0];
|
||||
String provider = System.getProperty("test.provider.name", args[1]);
|
||||
String kpgAlgo = args[2];
|
||||
int keySize = Integer.parseInt(args[3]);
|
||||
testKeyAgreement(provider, kaAlgo, kpgAlgo, keySize);
|
||||
}
|
||||
|
||||
/**
|
||||
* Perform KeyAgreement operation.
|
||||
*/
|
||||
private static void testKeyAgreement(String provider, String kaAlgo,
|
||||
String kpgAlgo, int keySize) throws Exception {
|
||||
|
||||
KeyPairGenerator kpg = KeyPairGenerator.getInstance(kpgAlgo, provider);
|
||||
kpg.initialize(keySize);
|
||||
KeyPair kp = kpg.generateKeyPair();
|
||||
// Test standard Key attributes.
|
||||
testKeyAttributes(provider, kpgAlgo, kp, keySize);
|
||||
// Test KeyAgreement.
|
||||
KeyAgreement ka = KeyAgreement.getInstance(kaAlgo, provider);
|
||||
ka.init(kp.getPrivate());
|
||||
ka.doPhase(kp.getPublic(), true);
|
||||
ka.generateSecret();
|
||||
}
|
||||
|
||||
/**
|
||||
* Test standard Key attributes.
|
||||
*/
|
||||
private static void testKeyAttributes(String provider, String kpgAlgo,
|
||||
KeyPair kp, int keySize) throws Exception {
|
||||
|
||||
KeyFactory kf = KeyFactory.getInstance(kpgAlgo, provider);
|
||||
switch (kpgAlgo) {
|
||||
case "DiffieHellman":
|
||||
// Verify PrivateKey attributes.
|
||||
DHPrivateKey dhPri = (DHPrivateKey) kp.getPrivate();
|
||||
BigInteger p = dhPri.getParams().getP();
|
||||
if (p.bitLength() != keySize) {
|
||||
throw new Exception(String.format("Invalid modulus size: "
|
||||
+ "%s/%s", p.bitLength(), keySize));
|
||||
}
|
||||
if (!p.isProbablePrime(128)) {
|
||||
throw new Exception("The modulus is composite!");
|
||||
}
|
||||
PKCS8EncodedKeySpec dhPriSpec
|
||||
= new PKCS8EncodedKeySpec(dhPri.getEncoded());
|
||||
DHPrivateKey dhPriDecod
|
||||
= (DHPrivateKey) kf.generatePrivate(dhPriSpec);
|
||||
equals(dhPri.getX(), dhPriDecod.getX());
|
||||
equals(dhPri.getFormat(), dhPriDecod.getFormat());
|
||||
equals(dhPri.getEncoded(), dhPriDecod.getEncoded());
|
||||
equals(dhPri.getParams().getG(), dhPriDecod.getParams().getG());
|
||||
equals(dhPri.getParams().getL(), dhPriDecod.getParams().getL());
|
||||
equals(dhPri.getParams().getP(), dhPriDecod.getParams().getP());
|
||||
|
||||
// Verify PublicKey attributes.
|
||||
DHPublicKey dhPub = (DHPublicKey) kp.getPublic();
|
||||
p = dhPub.getParams().getP();
|
||||
if (p.bitLength() != keySize) {
|
||||
throw new Exception(String.format("Invalid modulus size: "
|
||||
+ "%s/%s", p.bitLength(), keySize));
|
||||
}
|
||||
X509EncodedKeySpec dhPubSpec
|
||||
= new X509EncodedKeySpec(dhPub.getEncoded());
|
||||
DHPublicKey dhPubDecod
|
||||
= (DHPublicKey) kf.generatePublic(dhPubSpec);
|
||||
equals(dhPub.getY(), dhPubDecod.getY());
|
||||
equals(dhPub.getFormat(), dhPubDecod.getFormat());
|
||||
equals(dhPub.getEncoded(), dhPubDecod.getEncoded());
|
||||
equals(dhPub.getParams().getG(), dhPubDecod.getParams().getG());
|
||||
equals(dhPub.getParams().getL(), dhPubDecod.getParams().getL());
|
||||
equals(dhPub.getParams().getP(), dhPubDecod.getParams().getP());
|
||||
|
||||
BigInteger left = BigInteger.ONE;
|
||||
BigInteger right = p.subtract(BigInteger.ONE);
|
||||
BigInteger x = dhPri.getX();
|
||||
if ((x.compareTo(left) <= 0) || (x.compareTo(right) >= 0)) {
|
||||
throw new Exception(
|
||||
"X outside range [2, p - 2]: x: " + x + " p: " + p);
|
||||
}
|
||||
BigInteger y = dhPub.getY();
|
||||
if ((y.compareTo(left) <= 0) || (y.compareTo(right) >= 0)) {
|
||||
throw new Exception(
|
||||
"Y outside range [2, p - 2]: x: " + x + " p: " + p);
|
||||
}
|
||||
break;
|
||||
case "EC":
|
||||
// Verify PrivateKey attributes.
|
||||
ECPrivateKey ecPriv = (ECPrivateKey) kp.getPrivate();
|
||||
PKCS8EncodedKeySpec ecPriSpec
|
||||
= new PKCS8EncodedKeySpec(ecPriv.getEncoded());
|
||||
ECPrivateKey ecPriDecod
|
||||
= (ECPrivateKey) kf.generatePrivate(ecPriSpec);
|
||||
equals(ecPriv.getS(), ecPriDecod.getS());
|
||||
equals(ecPriv.getFormat(), ecPriDecod.getFormat());
|
||||
equals(ecPriv.getEncoded(), ecPriDecod.getEncoded());
|
||||
equals(ecPriv.getParams().getCofactor(),
|
||||
ecPriDecod.getParams().getCofactor());
|
||||
equals(ecPriv.getParams().getCurve(),
|
||||
ecPriDecod.getParams().getCurve());
|
||||
equals(ecPriv.getParams().getGenerator(),
|
||||
ecPriDecod.getParams().getGenerator());
|
||||
equals(ecPriv.getParams().getOrder(),
|
||||
ecPriDecod.getParams().getOrder());
|
||||
|
||||
// Verify PublicKey attributes.
|
||||
ECPublicKey ecPub = (ECPublicKey) kp.getPublic();
|
||||
X509EncodedKeySpec ecPubSpec
|
||||
= new X509EncodedKeySpec(ecPub.getEncoded());
|
||||
ECPublicKey ecPubDecod
|
||||
= (ECPublicKey) kf.generatePublic(ecPubSpec);
|
||||
equals(ecPub.getW(), ecPubDecod.getW());
|
||||
equals(ecPub.getFormat(), ecPubDecod.getFormat());
|
||||
equals(ecPub.getEncoded(), ecPubDecod.getEncoded());
|
||||
equals(ecPub.getParams().getCofactor(),
|
||||
ecPubDecod.getParams().getCofactor());
|
||||
equals(ecPub.getParams().getCurve(),
|
||||
ecPubDecod.getParams().getCurve());
|
||||
equals(ecPub.getParams().getGenerator(),
|
||||
ecPubDecod.getParams().getGenerator());
|
||||
equals(ecPub.getParams().getOrder(),
|
||||
ecPubDecod.getParams().getOrder());
|
||||
break;
|
||||
case "XDH":
|
||||
// Verify PrivateKey attributes.
|
||||
XECPrivateKey xdhPri = (XECPrivateKey) kp.getPrivate();
|
||||
PKCS8EncodedKeySpec xdhPriSpec
|
||||
= new PKCS8EncodedKeySpec(xdhPri.getEncoded());
|
||||
XECPrivateKey xdhPriDec
|
||||
= (XECPrivateKey) kf.generatePrivate(xdhPriSpec);
|
||||
equals(xdhPri.getScalar().get(), xdhPriDec.getScalar().get());
|
||||
equals(xdhPri.getFormat(), xdhPriDec.getFormat());
|
||||
equals(xdhPri.getEncoded(), xdhPriDec.getEncoded());
|
||||
equals(((NamedParameterSpec) xdhPri.getParams()).getName(),
|
||||
((NamedParameterSpec) xdhPriDec.getParams()).getName());
|
||||
|
||||
// Verify PublicKey attributes.
|
||||
XECPublicKey xdhPub = (XECPublicKey) kp.getPublic();
|
||||
X509EncodedKeySpec xdhPubSpec
|
||||
= new X509EncodedKeySpec(xdhPub.getEncoded());
|
||||
XECPublicKey xdhPubDec
|
||||
= (XECPublicKey) kf.generatePublic(xdhPubSpec);
|
||||
equals(xdhPub.getU(), xdhPubDec.getU());
|
||||
equals(xdhPub.getFormat(), xdhPubDec.getFormat());
|
||||
equals(xdhPub.getEncoded(), xdhPubDec.getEncoded());
|
||||
equals(((NamedParameterSpec) xdhPub.getParams()).getName(),
|
||||
((NamedParameterSpec) xdhPubDec.getParams()).getName());
|
||||
break;
|
||||
default:
|
||||
throw new RuntimeException("Invalid Algo name " + kpgAlgo);
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean equals(Object actual, Object expected) {
|
||||
boolean equals = actual.equals(expected);
|
||||
if (!equals) {
|
||||
throw new RuntimeException(String.format("Actual: %s, Expected: %s",
|
||||
actual, expected));
|
||||
}
|
||||
return equals;
|
||||
}
|
||||
|
||||
private static boolean equals(byte[] actual, byte[] expected) {
|
||||
boolean equals = Arrays.equals(actual, expected);
|
||||
if (!equals) {
|
||||
throw new RuntimeException(String.format("Actual array: %s, Expected array:%s",
|
||||
HexFormat.of().withUpperCase().formatHex(actual),
|
||||
HexFormat.of().withUpperCase().formatHex(expected)));
|
||||
}
|
||||
return equals;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue