SANTUARIO-625 Security warning is always logged when using ECDH with AES-KW (#456)

Author: beth-soptim

src/main/java/org/apache/xml/security/utils/KeyUtils.java

@@ -208,13 +208,9 @@ public static SecretKey aesWrapKeyWithDHGeneratedKey(KeyAgreementParameters para
             PublicKey publicKey = parameterSpec.getAgreementPublicKey();
             PrivateKey privateKey = parameterSpec.getAgreementPrivateKey();
 
-            String algorithm = publicKey.getAlgorithm();
-            if ("EC".equalsIgnoreCase(algorithm)) {
-                LOG.log(Level.WARNING, "EC keys are detected for key agreement algorithm! " +
-                        "Cryptographic algorithm may not be secure, consider using a different algorithm (and keys).");
-            }
-            algorithm = algorithm + (algorithm.equalsIgnoreCase("EC") ? "DH" : "");
-            KeyAgreement keyAgreement = KeyAgreement.getInstance(algorithm);
+            String keyAlgorithm = publicKey.getAlgorithm();
+            String keyAgreementAlgorithm = keyAlgorithm + ("EC".equalsIgnoreCase(keyAlgorithm) ? "DH" : "");
+            KeyAgreement keyAgreement = KeyAgreement.getInstance(keyAgreementAlgorithm);
             keyAgreement.init(privateKey);
             keyAgreement.doPhase(publicKey, true);
             byte[] secret = keyAgreement.generateSecret();