[karaf] branch master updated: [KARAF-6825] Upgrade to bouncycastle 1.66

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 51d0229  [KARAF-6825] Upgrade to bouncycastle 1.66
     new 3586e6d  Merge pull request #1178 from jbonofre/KARAF-6825
51d0229 is described below

commit 51d02296a2db5843989127b398f7e42acd38fd88
Author: jbonofre <jb...@apache.org>
AuthorDate: Thu Sep 3 14:11:39 2020 +0200

    [KARAF-6825] Upgrade to bouncycastle 1.66
---
 .../src/test/java/org/apache/karaf/itests/ssh/SshKeyFormatTest.java   | 4 ++--
 pom.xml                                                               | 2 +-
 .../java/org/apache/karaf/shell/ssh/keygenerator/KeyPairLoader.java   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/itests/test/src/test/java/org/apache/karaf/itests/ssh/SshKeyFormatTest.java b/itests/test/src/test/java/org/apache/karaf/itests/ssh/SshKeyFormatTest.java
index c464abe..95d54df 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/ssh/SshKeyFormatTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/ssh/SshKeyFormatTest.java
@@ -58,8 +58,8 @@ public class SshKeyFormatTest extends SshCommandTestBase {
         File keyFile = new File("src/test/resources/org/apache/karaf/itests/ssh/test.pem");
         return options(composite(super.config()),
                 editConfigurationFilePut("etc/org.apache.karaf.shell.cfg", "hostKey", keyFile.getAbsolutePath()),
-                bundle("mvn:org.bouncycastle/bcprov-jdk15on/1.62"),
-                bundle("mvn:org.bouncycastle/bcpkix-jdk15on/1.62"),
+                bundle("mvn:org.bouncycastle/bcprov-jdk15on/1.66"),
+                bundle("mvn:org.bouncycastle/bcpkix-jdk15on/1.66"),
                 bundle("mvn:com.google.guava/guava/16.0.1")
                 );
     }
diff --git a/pom.xml b/pom.xml
index 68e9af3..9adfa90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
         <asm.version>8.0.1</asm.version>
         <javax.annotation.version>1.3.1</javax.annotation.version>
         <awaitility.version>3.1.6</awaitility.version>
-        <bouncycastle.version>1.62</bouncycastle.version>
+        <bouncycastle.version>1.66</bouncycastle.version>
         <camel.version>3.4.3</camel.version>
         <cglib.bundle.version>3.2.9_1</cglib.bundle.version>
         <cxf.version>3.3.5</cxf.version>
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/keygenerator/KeyPairLoader.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/keygenerator/KeyPairLoader.java
index a576c6e..59c6d35 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/keygenerator/KeyPairLoader.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/keygenerator/KeyPairLoader.java
@@ -124,7 +124,7 @@ public final class KeyPairLoader {
             ECPrivateKey ecPrivateKey = (ECPrivateKey)privateKey;
 
             // Derive the public point by multiplying the generator by the private value
-            ECParameterSpec paramSpec = EC5Util.convertSpec(ecPrivateKey.getParams(), false);
+            ECParameterSpec paramSpec = EC5Util.convertSpec(ecPrivateKey.getParams());
             ECPoint q = paramSpec.getG().multiply(ecPrivateKey.getS());
 
             KeySpec keySpec = new ECPublicKeySpec(q, paramSpec);