Check key's curve

Author: KostasTsiounis

src/test/java/ibm/jceplus/junit/base/BaseTestECKeyImport.java

@@ -238,36 +238,34 @@ public void testImportHardcoded() throws Exception {
         EncodedKeySpec privateKeySpec = new PKCS8EncodedKeySpec(HexFormat.of().parseHex(private_secp256r1));
         PrivateKey importPrivateKey = keyFactory.generatePrivate(privateKeySpec);
 
-        System.out.println("Algorithm name: " + ((PKCS8Key) importPrivateKey).getAlgorithmId().getName());
-
-        assertTrue("secp256r1".equals(((PKCS8Key) importPrivateKey).getAlgorithmId().getName()), "Curve is not what is expected.");
+        assertTrue(((PKCS8Key) importPrivateKey).getAlgorithmId().toString().contains("secp256r1"), "Curve is not what is expected.");
 
         EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(HexFormat.of().parseHex(public_secp256r1));
         PublicKey importPublicKey = keyFactory.generatePublic(publicKeySpec);
 
-        assertTrue("secp256r1".equals(((X509Key) importPublicKey).getAlgorithmId().getName()), "Curve is not what is expected.");
+        assertTrue(((X509Key) importPublicKey).getAlgorithmId().toString().contains("secp256r1"), "Curve is not what is expected.");
 
         // secp384r1
         privateKeySpec = new PKCS8EncodedKeySpec(HexFormat.of().parseHex(private_secp384r1));
         importPrivateKey = keyFactory.generatePrivate(privateKeySpec);
 
-        assertTrue("secp384r1".equals(((PKCS8Key) importPrivateKey).getAlgorithmId().getName()), "Curve is not what is expected.");
+        assertTrue(((PKCS8Key) importPrivateKey).getAlgorithmId().toString().contains("secp384r1"), "Curve is not what is expected.");
 
         publicKeySpec = new X509EncodedKeySpec(HexFormat.of().parseHex(public_secp384r1));
         importPublicKey = keyFactory.generatePublic(publicKeySpec);
 
-        assertTrue("secp384r1".equals(((X509Key) importPublicKey).getAlgorithmId().getName()), "Curve is not what is expected.");
+        assertTrue(((X509Key) importPublicKey).getAlgorithmId().toString().contains("secp384r1"), "Curve is not what is expected.");
 
         // secp521r1
         privateKeySpec = new PKCS8EncodedKeySpec(HexFormat.of().parseHex(private_secp521r1));
         importPrivateKey = keyFactory.generatePrivate(privateKeySpec);
 
-        assertTrue("secp521r1".equals(((PKCS8Key) importPrivateKey).getAlgorithmId().getName()), "Curve is not what is expected.");
+        assertTrue(((PKCS8Key) importPrivateKey).getAlgorithmId().toString().contains("secp521r1"), "Curve is not what is expected.");
 
         publicKeySpec = new X509EncodedKeySpec(HexFormat.of().parseHex(public_secp521r1));
         importPublicKey = keyFactory.generatePublic(publicKeySpec);
 
-        assertTrue("secp521r1".equals(((X509Key) importPublicKey).getAlgorithmId().getName()), "Curve is not what is expected.");
+        assertTrue(((X509Key) importPublicKey).getAlgorithmId().toString().contains("secp521r1"), "Curve is not what is expected.");
     }
 }