|
 |
edf0421 |
diff --git a/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java b/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
|
|
|
edf0421 |
--- openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
|
|
|
edf0421 |
+++ openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
|
|
|
edf0421 |
@@ -1,5 +1,6 @@
|
|
|
f3b2292 |
/*
|
|
|
2437fa0 |
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
|
|
|
f3b2292 |
+ * Copyright (c) 2014 Red Hat Inc.
|
|
|
f3b2292 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
|
f3b2292 |
*
|
|
|
f3b2292 |
* This code is free software; you can redistribute it and/or modify it
|
|
|
b1b0bd3 |
@@ -61,13 +62,13 @@
|
|
|
f3b2292 |
|
|
|
f3b2292 |
private static void checkKeySize(int keysize)
|
|
|
edf0421 |
throws InvalidParameterException {
|
|
|
b1b0bd3 |
- boolean supported = ((keysize == 2048) || (keysize == 3072) ||
|
|
|
b1b0bd3 |
+ boolean supported = ((keysize == 2048) || (keysize == 3072) || (keysize == 4096) ||
|
|
|
b1b0bd3 |
((keysize >= 512) && (keysize <= 1024) && ((keysize & 0x3F) == 0)));
|
|
|
b1b0bd3 |
|
|
|
b1b0bd3 |
if (!supported) {
|
|
|
edf0421 |
throw new InvalidParameterException(
|
|
|
edf0421 |
"DH key size must be multiple of 64 and range " +
|
|
|
b1b0bd3 |
- "from 512 to 1024 (inclusive), or 2048, 3072. " +
|
|
|
b1b0bd3 |
+ "from 512 to 1024 (inclusive), or 2048, 3072, 4096. " +
|
|
|
edf0421 |
"The specific key size " + keysize + " is not supported");
|
|
|
f3b2292 |
}
|
|
|
f3b2292 |
}
|
|
|
edf0421 |
diff --git a/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java b/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
|
|
|
edf0421 |
--- openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
|
|
|
edf0421 |
+++ openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
|
|
|
edf0421 |
@@ -1,5 +1,6 @@
|
|
|
f3b2292 |
/*
|
|
|
b1b0bd3 |
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
|
|
|
f3b2292 |
+ * Copyright (c) 2014 Red Hat Inc.
|
|
|
f3b2292 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
|
f3b2292 |
*
|
|
|
f3b2292 |
* This code is free software; you can redistribute it and/or modify it
|
|
|
edf0421 |
@@ -58,7 +59,7 @@
|
|
|
f3b2292 |
*/
|
|
|
f3b2292 |
private enum Sizes {
|
|
|
f3b2292 |
two56(256), three84(384), five12(512), seven68(768), ten24(1024),
|
|
|
f3b2292 |
- twenty48(2048);
|
|
|
f3b2292 |
+ twenty48(2048), forty96(4096);
|
|
|
f3b2292 |
|
|
|
f3b2292 |
private final int intSize;
|
|
|
f3b2292 |
private final BigInteger bigIntValue;
|
|
|
edf0421 |
@@ -130,6 +131,19 @@
|
|
|
f3b2292 |
kp = kpg.generateKeyPair();
|
|
|
f3b2292 |
checkKeyPair(kp, Sizes.twenty48, Sizes.five12);
|
|
|
f3b2292 |
|
|
|
f3b2292 |
+ kpg.initialize(Sizes.forty96.getIntSize());
|
|
|
f3b2292 |
+ kp = kpg.generateKeyPair();
|
|
|
f3b2292 |
+ checkKeyPair(kp, Sizes.forty96, Sizes.twenty48);
|
|
|
f3b2292 |
+
|
|
|
f3b2292 |
+ publicKey = (DHPublicKey)kp.getPublic();
|
|
|
f3b2292 |
+ p = publicKey.getParams().getP();
|
|
|
f3b2292 |
+ g = publicKey.getParams().getG();
|
|
|
f3b2292 |
+
|
|
|
f3b2292 |
+ // test w/ all values specified
|
|
|
f3b2292 |
+ kpg.initialize(new DHParameterSpec(p, g, Sizes.ten24.getIntSize()));
|
|
|
f3b2292 |
+ kp = kpg.generateKeyPair();
|
|
|
f3b2292 |
+ checkKeyPair(kp, Sizes.forty96, Sizes.ten24);
|
|
|
f3b2292 |
+
|
|
|
f3b2292 |
System.out.println("OK");
|
|
|
f3b2292 |
}
|
|
|
f3b2292 |
|
|
|
b1b0bd3 |
|