Merge pull request #115 from armfergom/JENKINS-35328

[JENKINS-35328] Bump BouncyCastle version
jenkinsci · Jun 7, 2016 · c7f8db2 · c7f8db2
2 parents 206f594 + f5993f0
commit c7f8db2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -167,6 +167,16 @@
       <groupId>com.github.detro.ghostdriver</groupId>
       <artifactId>phantomjsdriver</artifactId>
       <version>1.1.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcpkix-jdk15on</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- recorder -->
@@ -190,6 +200,12 @@
       <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>1.7.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcpkix-jdk15on</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- Groovy -->
@@ -339,8 +355,8 @@
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk16</artifactId>
-      <version>1.46</version>
+      <artifactId>bcpkix-jdk15on</artifactId>
+      <version>1.54</version>
     </dependency>
     <dependency>
       <groupId>org.zeroturnaround</groupId>

diff --git a/src/main/java/org/jenkinsci/test/acceptance/SshKeyPair.java b/src/main/java/org/jenkinsci/test/acceptance/SshKeyPair.java
@@ -3,7 +3,7 @@
 import com.google.inject.ProvidedBy;
 import org.apache.commons.io.FileUtils;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.PEMReader;
+import org.bouncycastle.openssl.PEMParser;
 import org.jvnet.hudson.crypto.RSAPublicKeyUtil;
 
 import javax.inject.Inject;
@@ -55,7 +55,7 @@ public String readPrivateKey() throws IOException {
     public String getFingerprint() throws IOException, GeneralSecurityException {
         Security.addProvider(new BouncyCastleProvider());
         Reader r = new BufferedReader(new StringReader(FileUtils.readFileToString(privateKey)));
-        PEMReader pem = new PEMReader(r);
+        PEMParser pem = new PEMParser(r);
 
         KeyPair pair = (KeyPair) pem.readObject();
         return RSAPublicKeyUtil.getEC2FingerPrint(pair.getPublic());

diff --git a/src/main/java/org/jenkinsci/test/acceptance/SshKeyPairGenerator.java b/src/main/java/org/jenkinsci/test/acceptance/SshKeyPairGenerator.java
@@ -1,7 +1,7 @@
 package org.jenkinsci.test.acceptance;
 
 import org.apache.xerces.impl.dv.util.Base64;
-import org.bouncycastle.openssl.PEMWriter;
+import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
 import org.jvnet.hudson.crypto.RSAPublicKeyUtil;
 
 import javax.inject.Provider;
@@ -48,7 +48,7 @@ private void generateKey(File publicKey, File privateKey) throws GeneralSecurity
         KeyPair kp = gen.generateKeyPair();
 
         // write out the private key
-        try (PEMWriter w = new PEMWriter(new FileWriter(privateKey), "SunJCE")) {
+        try (JcaPEMWriter w = new JcaPEMWriter(new FileWriter(privateKey))) {
             w.writeObject(kp);
         }
         // private key needs to be access restricted