Reverting my previous revert and moving to bouncycastle 1.48. Fixing …

…issue SeleniumHQ#3498!
kuahyeow · Feb 13, 2013 · 5f7d034 · 5f7d034
1 parent db5df1e
commit 5f7d034
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 29 deletions.
diff --git a/.idea/libraries/bouncycastle.xml b/.idea/libraries/bouncycastle.xml
diff --git a/java/server/server.eml b/java/server/server.eml
@@ -23,8 +23,8 @@
 	<lib name="testng-6.8.jar" scope="COMPILE">
 		<srcroot url="file:///third-party/java/testng/testng-6.8-sources.jar"/>
 	</lib>
-	<lib name="bcprov-jdk15on-147.jar" scope="COMPILE">
-		<srcroot url="file:///third-party/java/bouncycastle/bcprov-jdk15on-147-src.jar"/>
+	<lib name="bcprov-jdk15on-1.48.jar" scope="COMPILE">
+		<srcroot url="file:///third-party/java/bouncycastle/bcprov-jdk15on-1.48-sources.jar"/>
 	</lib>
 	<lib name="jetty-repacked-7.6.1.jar" scope="COMPILE">
 		<srcroot url="file:///third-party/java/jetty/jetty-repacked-7.6.1-sources.jar"/>

diff --git a/java/server/src/cybervillains/ca/Generator.java b/java/server/src/cybervillains/ca/Generator.java
@@ -29,7 +29,7 @@
  * <pre>
  * $> cd SELENIUM_SOURCE_DIRECTORY_ROOT
  * $> ./go //java/server/src/cybervillains:cybervillains
- * $> java -cp build/java/server/src/cybervillains/cybervillains.jar:third_party/java/bouncycastle/bcprov-jdk15-146.jar cybervillains.ca.Generator
+ * $> java -cp build/java/server/src/cybervillains/cybervillains.jar:third_party/java/bouncycastle/bcprov-jdk15on-1.48.jar cybervillains.ca.Generator
  * $> cp -r new_certs/* java/server/src/org/openqa/selenium/server/sslSupport/
  * $> rm -r new_certs
  * $> COMMIT TO SELENIUM REPO

diff --git a/java/server/src/cybervillains/ca/KeyStoreManager.java b/java/server/src/cybervillains/ca/KeyStoreManager.java
@@ -105,20 +105,42 @@ public KeyStoreManager(File root, String certificateRevocationList) {
     this.certificateRevocationList = certificateRevocationList;
 
     ConfigurableProvider bcProv = new BouncyCastleProvider();
-    DHParameterSpec  dhSpec = new DHParameterSpec(
-            new BigInteger("f7e1a085d69b3ddecbbcab5c36b857b97994afbbfa3aea82f95"
-                + "74c0b3d0782675159578ebad4594fe67107108180b449167123e84c28161"
-                + "3b7cf09328cc8a6e13c167a8b547c8d28e0a3ae1e2bb3a675916ea37f0bf"
-                + "a213562f1fb627a01243bcca4f1bea8519089a883dfe15ae59f06928b665"
-                + "e807b552564014c3bfecf492a", 16),
-            new BigInteger("fd7f53811d75122952df4a9c2eece4e7f611b7523cef4400c31"
-                + "e3f80b6512669455d402251fb593d8d58fabfc5f5ba30f6cb9b556cd7813"
-                + "b801d346ff26660b76b9950a5a49f9fe8047b1022c24fbba9d7feb7c61bf"
-                + "83b57e7c6a8a6150f04fb83f6d3c51ec3023554135a169132f675f3ae2b6"
-                + "1d72aeff22203199dd14801c7", 16),
-            512);
-
-    bcProv.setParameter(ConfigurableProvider.DH_DEFAULT_PARAMS, dhSpec);
+
+    DHParameterSpec dhSpec512 = new DHParameterSpec(
+        new BigInteger("fca682ce8e12caba26efccf7110e526db078b05edecbcd1eb4a208f"
+            + "3ae1617ae01f35b91a47e6df63413c5e12ed0899bcd132acd50d99151bdc43ee"
+            + "737592e17", 16),
+        new BigInteger("678471b27a9cf44ee91a49c5147db1a9aaf244f05a434d6486931d2"
+            + "d14271b9e35030b71fd73da179069b32e2935630e1c2062354d0da20a6c416e5"
+            + "0be794ca4", 16),
+        384);
+
+    DHParameterSpec dhSpec768 = new DHParameterSpec(
+        new BigInteger("e9e642599d355f37c97ffd3567120b8e25c9cd43e927b3a9670fbec"
+            + "5d890141922d2c3b3ad2480093799869d1e846aab49fab0ad26d2ce6a22219d4"
+            + "70bce7d777d4a21fbe9c270b57f607002f3cef8393694cf45ee3688c11a8c56a"
+            + "b127a3daf", 16),
+        new BigInteger("30470ad5a005fb14ce2d9dcd87e38bc7d1b1c5facbaecbe95f190aa"
+            + "7a31d23c4dbbcbe06174544401a5b2c020965d8c2bd2171d3668445771f74ba0"
+            + "84d2029d83c1c158547f3a9f1a2715be23d51ae4d3e5a1f6a7064f316933a346"
+            + "d3f529252", 16),
+        384);
+
+    DHParameterSpec dhSpec1024 = new DHParameterSpec(
+        new BigInteger("f7e1a085d69b3ddecbbcab5c36b857b97994afbbfa3aea82f9574c0"
+            + "b3d0782675159578ebad4594fe67107108180b449167123e84c281613b7cf093"
+            + "28cc8a6e13c167a8b547c8d28e0a3ae1e2bb3a675916ea37f0bfa213562f1fb6"
+            + "27a01243bcca4f1bea8519089a883dfe15ae59f06928b665e807b552564014c3"
+            + "bfecf492a", 16),
+        new BigInteger("fd7f53811d75122952df4a9c2eece4e7f611b7523cef4400c31e3f8"
+            + "0b6512669455d402251fb593d8d58fabfc5f5ba30f6cb9b556cd7813b801d346"
+            + "ff26660b76b9950a5a49f9fe8047b1022c24fbba9d7feb7c61bf83b57e7c6a8a"
+            + "6150f04fb83f6d3c51ec3023554135a169132f675f3ae2b61d72aeff22203199"
+            + "dd14801c7", 16),
+        512);
+
+    bcProv.setParameter(ConfigurableProvider.DH_DEFAULT_PARAMS,
+        new DHParameterSpec[] { dhSpec512, dhSpec768, dhSpec1024 });
 
     Security.insertProviderAt((Provider) bcProv, 2);
 

diff --git a/maven/server/pom.xml b/maven/server/pom.xml
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.47</version>
+            <version>1.48</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.47</version>
+            <version>1.48</version>
         </dependency>
         <dependency>
             <groupId>mx4j</groupId>

diff --git a/selenium.eml b/selenium.eml
@@ -40,9 +40,9 @@
 		<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/htmlunit/htmlunit-core-js-2.11.jar!/"/>
 	</lib>
 	<lib name="bcprov-jdk15-146.jar" scope="COMPILE">
-		<srcroot url="jar://$MODULE_DIR$/third_party/java/bouncycastle/bcprov-jdk15-146-src.jar!/"/>
-		<relative-module-src project-related="jar://$PROJECT_DIR$/third_party/java/bouncycastle/bcprov-jdk15-146-src.jar!/"/>
-		<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/bouncycastle/bcprov-jdk15-146.jar!/"/>
+		<srcroot url="jar://$MODULE_DIR$/third_party/java/bouncycastle/bcprov-jdk15on-1.48.jar!/"/>
+		<relative-module-src project-related="jar://$PROJECT_DIR$/third_party/java/bouncycastle/bcprov-jdk15on-1.48-sources.jar!/"/>
+		<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/bouncycastle/bcprov-jdk15on-1.48.jar!/"/>
 	</lib>
 	<lib name="jetty-repacked-7.6.1.jar" scope="COMPILE">
 		<srcroot url="jar://$MODULE_DIR$/third_party/java/jetty/jetty-repacked-7.6.1-sources.jar!/"/>

diff --git a/third_party/java/bouncycastle/bcpkix-jdk15on-1.47-sources.jar b/third_party/java/bouncycastle/bcpkix-jdk15on-1.47-sources.jar
diff --git a/third_party/java/bouncycastle/bcpkix-jdk15on-1.47.jar b/third_party/java/bouncycastle/bcpkix-jdk15on-1.47.jar
diff --git a/third_party/java/bouncycastle/bcpkix-jdk15on-1.48-sources.jar b/third_party/java/bouncycastle/bcpkix-jdk15on-1.48-sources.jar
diff --git a/third_party/java/bouncycastle/bcpkix-jdk15on-1.48.jar b/third_party/java/bouncycastle/bcpkix-jdk15on-1.48.jar
diff --git a/third_party/java/bouncycastle/bcprov-jdk15on-1.48-sources.jar b/third_party/java/bouncycastle/bcprov-jdk15on-1.48-sources.jar
diff --git a/.../java/bouncycastle/bcprov-jdk15on-147.jar → ...java/bouncycastle/bcprov-jdk15on-1.48.jar b/.../java/bouncycastle/bcprov-jdk15on-147.jar → ...java/bouncycastle/bcprov-jdk15on-1.48.jar
diff --git a/third_party/java/bouncycastle/bcprov-jdk15on-147-src.jar b/third_party/java/bouncycastle/bcprov-jdk15on-147-src.jar
diff --git a/third_party/java/bouncycastle/build.desc b/third_party/java/bouncycastle/build.desc
@@ -1,5 +1,5 @@
 java_library(name = "bouncycastle",
   deps = [ 
-    "bcpkix-jdk15on-1.47.jar",
-    "bcprov-jdk15on-147.jar" 
+    "bcpkix-jdk15on-1.48.jar",
+    "bcprov-jdk15on-1.48.jar" 
   ])