(ws-wss4j) branch 3_0_x-fixes updated: Update test EncryptionTest.testEncryptionDecryptionECDSA_ES to pass with JDK 11 (#269)

[coheigea]

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

coheigea pushed a commit to branch 3_0_x-fixes
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git


The following commit(s) were added to refs/heads/3_0_x-fixes by this push:
     new d0fdf95ca Update test EncryptionTest.testEncryptionDecryptionECDSA_ES 
to pass with JDK 11 (#269)
d0fdf95ca is described below

commit d0fdf95cadb7b5438438bddfe23045023e198c33
Author: jrihtarsic <jrihtars...@gmail.com>
AuthorDate: Fri Jan 26 07:55:46 2024 +0100

    Update test EncryptionTest.testEncryptionDecryptionECDSA_ES to pass with 
JDK 11 (#269)
    
    Co-authored-by: RIHTARSIC Joze <joze.rihtar...@ext.ec.europa.eu>
---
 .../java/org/apache/wss4j/dom/message/EncryptionTest.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git 
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
 
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
index 2c65b2116..9779d3a1b 100644
--- 
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
+++ 
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
@@ -54,6 +54,7 @@ import org.apache.wss4j.dom.str.STRParser.REFERENCE_TYPE;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
 
 import org.apache.xml.security.utils.EncryptionConstants;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -104,6 +105,11 @@ public class EncryptionTest {
         secEngine.setWssConfig(WSSConfig.getNewInstance());
     }
 
+    @AfterEach
+    public void cleanup(){
+        JDKTestUtils.unregisterAuxiliaryProvider();
+    }
+
     /**
      * Test that encrypt and decrypt a WS-Security envelope.
      * This test uses the RSA_15 algorithm to transport (wrap) the symmetric
@@ -334,6 +340,11 @@ public class EncryptionTest {
             if (!JDKTestUtils.isAlgorithmSupportedByJDK(algorithm)) {
                 LOG.info("Add AuxiliaryProvider to execute test with algorithm 
[{}] and cert alias [{}]", algorithm,  certAlias);
                 Security.addProvider(JDKTestUtils.getAuxiliaryProvider());
+            } else if (JDKTestUtils.getJDKVersion() == 11 && 
algorithm.equals("xdh") ) {
+                // workaround for jdk11 and xdh keys
+                // https://bugs.openjdk.java.net/browse/JDK-8219381 or 
https://bugs.openjdk.org/browse/JDK-8213363
+                // set the auxiliary provider as first provider to parse the 
xdh private key
+                Security.insertProviderAt(JDKTestUtils.getAuxiliaryProvider(), 
1 );
             }
             Crypto encCrypto = 
CryptoFactory.getInstance("wss-ecdh.properties");