#1298: fix issue about EC Key Pair with java 15 or higher

Author: sbernard31

leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/util/BootstrapIntegrationTestHelper.java

@@ -140,9 +140,9 @@ public BootstrapIntegrationTestHelper() {
             ECParameterSpec parameterSpec = algoParameters.getParameterSpec(ECParameterSpec.class);
 
             // Create key specs
-            KeySpec publicKeySpec = new ECPublicKeySpec(new ECPoint(new BigInteger(publicX), new BigInteger(publicY)),
-                    parameterSpec);
-            KeySpec privateKeySpec = new ECPrivateKeySpec(new BigInteger(privateS), parameterSpec);
+            KeySpec publicKeySpec = new ECPublicKeySpec(
+                    new ECPoint(new BigInteger(1, publicX), new BigInteger(1, publicY)), parameterSpec);
+            KeySpec privateKeySpec = new ECPrivateKeySpec(new BigInteger(1, privateS), parameterSpec);
 
             // Get keys
             bootstrapServerPublicKey = KeyFactory.getInstance("EC").generatePublic(publicKeySpec);

leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/util/SecureIntegrationTestHelper.java

@@ -165,9 +165,9 @@ public SecureIntegrationTestHelper() {
             ECParameterSpec parameterSpec = algoParameters.getParameterSpec(ECParameterSpec.class);
 
             // Create key specs
-            KeySpec publicKeySpec = new ECPublicKeySpec(new ECPoint(new BigInteger(publicX), new BigInteger(publicY)),
-                    parameterSpec);
-            KeySpec privateKeySpec = new ECPrivateKeySpec(new BigInteger(privateS), parameterSpec);
+            KeySpec publicKeySpec = new ECPublicKeySpec(
+                    new ECPoint(new BigInteger(1, publicX), new BigInteger(1, publicY)), parameterSpec);
+            KeySpec privateKeySpec = new ECPrivateKeySpec(new BigInteger(1, privateS), parameterSpec);
 
             // Get keys
             clientPublicKey = KeyFactory.getInstance("EC").generatePublic(publicKeySpec);
@@ -208,9 +208,9 @@ public SecureIntegrationTestHelper() {
             ECParameterSpec parameterSpec = algoParameters.getParameterSpec(ECParameterSpec.class);
 
             // Create key specs
-            KeySpec publicKeySpec = new ECPublicKeySpec(new ECPoint(new BigInteger(publicX), new BigInteger(publicY)),
-                    parameterSpec);
-            KeySpec privateKeySpec = new ECPrivateKeySpec(new BigInteger(privateS), parameterSpec);
+            KeySpec publicKeySpec = new ECPublicKeySpec(
+                    new ECPoint(new BigInteger(1, publicX), new BigInteger(1, publicY)), parameterSpec);
+            KeySpec privateKeySpec = new ECPrivateKeySpec(new BigInteger(1, privateS), parameterSpec);
 
             // Get keys
             serverPublicKey = KeyFactory.getInstance("EC").generatePublic(publicKeySpec);

leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/LeshanServerBuilderTest.java

@@ -64,9 +64,9 @@ public LeshanServerBuilderTest() {
             ECParameterSpec parameterSpec = algoParameters.getParameterSpec(ECParameterSpec.class);
 
             // Create key specs
-            KeySpec publicKeySpec = new ECPublicKeySpec(new ECPoint(new BigInteger(publicX), new BigInteger(publicY)),
-                    parameterSpec);
-            KeySpec privateKeySpec = new ECPrivateKeySpec(new BigInteger(privateS), parameterSpec);
+            KeySpec publicKeySpec = new ECPublicKeySpec(
+                    new ECPoint(new BigInteger(1, publicX), new BigInteger(1, publicY)), parameterSpec);
+            KeySpec privateKeySpec = new ECPrivateKeySpec(new BigInteger(1, privateS), parameterSpec);
 
             // Get keys
             publicKey = KeyFactory.getInstance("EC").generatePublic(publicKeySpec);

leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServerBuilderTest.java

@@ -73,9 +73,9 @@ public LeshanBootstrapServerBuilderTest() {
             ECParameterSpec parameterSpec = algoParameters.getParameterSpec(ECParameterSpec.class);
 
             // Create key specs
-            KeySpec publicKeySpec = new ECPublicKeySpec(new ECPoint(new BigInteger(publicX), new BigInteger(publicY)),
-                    parameterSpec);
-            KeySpec privateKeySpec = new ECPrivateKeySpec(new BigInteger(privateS), parameterSpec);
+            KeySpec publicKeySpec = new ECPublicKeySpec(
+                    new ECPoint(new BigInteger(1, publicX), new BigInteger(1, publicY)), parameterSpec);
+            KeySpec privateKeySpec = new ECPrivateKeySpec(new BigInteger(1, privateS), parameterSpec);
 
             // Get keys
             publicKey = KeyFactory.getInstance("EC").generatePublic(publicKeySpec);

leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonSecurityDeserializer.java

@@ -92,7 +92,7 @@ public SecurityInfo deserialize(JsonParser p, DeserializationContext ctxt) throw
                         algoParameters.init(new ECGenParameterSpec(params));
                         ECParameterSpec parameterSpec = algoParameters.getParameterSpec(ECParameterSpec.class);
 
-                        KeySpec keySpec = new ECPublicKeySpec(new ECPoint(new BigInteger(x), new BigInteger(y)),
+                        KeySpec keySpec = new ECPublicKeySpec(new ECPoint(new BigInteger(1, x), new BigInteger(1, y)),
                                 parameterSpec);
 
                         key = KeyFactory.getInstance("EC").generatePublic(keySpec);

leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/SecurityInfoSerDes.java

@@ -106,7 +106,8 @@ public static SecurityInfo deserialize(byte[] data) {
                 algoParameters.init(new ECGenParameterSpec(params));
                 ECParameterSpec parameterSpec = algoParameters.getParameterSpec(ECParameterSpec.class);
 
-                KeySpec keySpec = new ECPublicKeySpec(new ECPoint(new BigInteger(x), new BigInteger(y)), parameterSpec);
+                KeySpec keySpec = new ECPublicKeySpec(new ECPoint(new BigInteger(1, x), new BigInteger(1, y)),
+                        parameterSpec);
 
                 key = KeyFactory.getInstance("EC").generatePublic(keySpec);
 

leshan-server-redis/src/test/java/org/eclipse/leshan/server/redis/serialization/SecurityInfoSerDesTest.java

@@ -55,7 +55,7 @@ public void security_info_rpk_ser_des_then_equal() throws Exception {
         ECParameterSpec parameterSpec = algoParameters.getParameterSpec(ECParameterSpec.class);
 
         // Create key specs
-        KeySpec publicKeySpec = new ECPublicKeySpec(new ECPoint(new BigInteger(publicX), new BigInteger(publicY)),
+        KeySpec publicKeySpec = new ECPublicKeySpec(new ECPoint(new BigInteger(1, publicX), new BigInteger(1, publicY)),
                 parameterSpec);
 
         SecurityInfo si = SecurityInfo.newRawPublicKeyInfo("myendpoint",