Blame SOURCES/rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch

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