ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1858106 - in /webservices/wss4j/branches/2_2_x-fixes: ws-security-common/src/test/java/org/apache/wss4j/common/crypto/ ws-security-common/src/test/resources/ ws-security-common/src/test/resources/keys/ ws-security-common/src/test/resources...
Date Thu, 25 Apr 2019 10:14:34 GMT
Author: coheigea
Date: Thu Apr 25 10:14:34 2019
New Revision: 1858106

URL: http://svn.apache.org/viewvc?rev=1858106&view=rev
Log:
WSS-647 - Updating most of the certs

Added:
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/README.txt
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/20.pem
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/21.pem
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/22.pem
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/23.pem
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.cer
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.crt
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.jks
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.pem
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.cer
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.crt
Removed:
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/client_keystore.jks
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa2048.jks
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/server_keystore.jks
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/wss40_server.properties
Modified:
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.config
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.index
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.index.old
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.serial
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.serial.old
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.jks
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.pem
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.crt
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.jks
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.pem
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CAKey.pem
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.cer
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.crt
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.jks
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.pem
    webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
    webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java Thu Apr 25 10:14:34 2019
@@ -43,18 +43,18 @@ public class SKITest extends org.junit.A
         Crypto crypto = new Merlin();
         KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
         ClassLoader loader = Loader.getClassLoader(SKITest.class);
-        InputStream input = Merlin.loadInputStream(loader, "keys/wss40_server.jks");
+        InputStream input = Merlin.loadInputStream(loader, "keys/rsa1024.jks");
         keyStore.load(input, "security".toCharArray());
         input.close();
         ((Merlin)crypto).setKeyStore(keyStore);
 
         CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
-        cryptoType.setAlias("wss40_server");
+        cryptoType.setAlias("wss40");
         X509Certificate[] certs = crypto.getX509Certificates(cryptoType);
         assertTrue(certs != null && certs.length > 0);
 
         byte[] skiBytes = crypto.getSKIBytesFromCert(certs[0]);
-        String knownBase64Encoding = "VPWiTCLlm0OwNWTwrnRTUF3qcIk=";
+        String knownBase64Encoding = "H7dt0lv9M8uYOy4SedV0kPOs22A=";
         assertTrue(knownBase64Encoding.equals(org.apache.xml.security.utils.XMLUtils.encodeToString(skiBytes)));
     }
 
@@ -64,18 +64,18 @@ public class SKITest extends org.junit.A
         Crypto crypto = new Merlin();
         KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
         ClassLoader loader = Loader.getClassLoader(SKITest.class);
-        InputStream input = Merlin.loadInputStream(loader, "keys/rsa2048.jks");
-        keyStore.load(input, "password".toCharArray());
+        InputStream input = Merlin.loadInputStream(loader, "keys/wss40_server.jks");
+        keyStore.load(input, "security".toCharArray());
         input.close();
         ((Merlin)crypto).setKeyStore(keyStore);
 
         CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
-        cryptoType.setAlias("test");
+        cryptoType.setAlias("wss40_server");
         X509Certificate[] certs = crypto.getX509Certificates(cryptoType);
         assertTrue(certs != null && certs.length > 0);
 
         byte[] skiBytes = crypto.getSKIBytesFromCert(certs[0]);
-        String knownBase64Encoding = "tgkZUMZ461ZSA1nZkBu6E5GDxLM=";
+        String knownBase64Encoding = "5LsTsLDSb7XxlaCffjNBHM5n+1A=";
         assertTrue(knownBase64Encoding.equals(org.apache.xml.security.utils.XMLUtils.encodeToString(skiBytes)));
     }
 

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/README.txt
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/README.txt?rev=1858106&view=auto
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/README.txt (added)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/README.txt Thu Apr 25 10:14:34 2019
@@ -0,0 +1,60 @@
+Keys generated with:
+
+CA:
+
+openssl req -x509 -newkey rsa:2048 -keyout wss40CAKey.pem -out wss40CA.pem -config ca.config -days 3650
+openssl x509 -outform DER -in wss40CA.pem -out wss40CA.crt
+keytool -import -file wss40CA.crt -alias wss40CA -keystore wss40CA.jks
+
+=====
+
+Generate the client keypair, make a csr, sign it with the CA key:
+
+keytool -genkey -validity 3650 -alias wss40 -keyalg RSA -keystore wss40.jks
+-dname "CN=Colm,OU=WSS4J,O=Apache,L=Dublin,ST=Leinster,C=IE"
+keytool -certreq -alias wss40 -keystore wss40.jks -file wss40.cer
+openssl ca -config ca.config -policy policy_anything -days 3650 -out wss40.pem -infiles wss40.cer
+openssl x509 -outform DER -in wss40.pem -out wss40.crt
+
+Import the CA cert into wss40.jks and import the new signed certificate:
+
+keytool -import -file wss40CA.crt -alias wss40CA -keystore wss40.jks
+keytool -import -file wss40.crt -alias wss40 -keystore wss40.jks
+
+=====
+
+Generate the client DSA keypair, make a csr, sign it with the CA key + import
+it:
+
+keytool -genkey -validity 3650 -alias wss40DSA -keyalg DSA -keysize 1024 -keystore wss40.jks -dname "CN=Colm,OU=WSS4J,O=Apache,L=Dublin,ST=Leinster,C=IE"
+keytool -certreq -alias wss40DSA -keystore wss40.jks -file wss40.cer
+openssl ca -config ca.config -policy policy_anything -days 3650 -out wss40.pem -infiles wss40.cer
+openssl x509 -outform DER -in wss40.pem -out wss40.crt
+keytool -import -file wss40.crt -alias wss40DSA -keystore wss40.jks
+
+=====
+
+Generate the server keypair, make a csr, sign it with the CA key:
+
+keytool -genkey -validity 3650 -alias wss40_server -keyalg RSA -keystore wss40_server.jks -dname "CN=Server,OU=WSS4J,O=Apache,L=Dublin,ST=Leinster,C=IE"
+keytool -certreq -alias wss40_server -keystore wss40_server.jks -file wss40_server.cer
+openssl ca -config ca.config -policy policy_anything -days 3650 -out wss40_server.pem -infiles wss40_server.cer
+openssl x509 -outform DER -in wss40_server.pem -out wss40_server.crt
+
+Import the CA cert into wss40.jks and import the new signed certificate:
+
+keytool -import -file wss40CA.crt -alias wss40CA -keystore wss40_server.jks
+keytool -import -file wss40_server.crt -alias wss40_server -keystore wss40_server.jks
+
+=====
+
+1024-bit RSA cert:
+
+keytool -genkey -validity 3650 -alias wss40 -keyalg RSA -keysize 1024 -keystore rsa1024.jks -dname "CN=Colm,OU=WSS4J,O=Apache,L=Dublin,ST=Leinster,C=IE"
+keytool -certreq -alias wss40 -keystore rsa1024.jks -file rsa1024.cer
+openssl ca -config ca.config -policy policy_anything -days 3650 -out rsa1024.pem -infiles rsa1024.cer
+openssl x509 -outform DER -in rsa1024.pem -out rsa1024.crt
+keytool -import -file wss40CA.crt -alias wss40CA -keystore rsa1024.jks
+keytool -import -file rsa1024.crt -alias wss40 -keystore rsa1024.jks
+
+=====

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.config
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.config?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.config (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.config Thu Apr 25 10:14:34 2019
@@ -24,7 +24,7 @@ nsComment               = "OpenSSL Gener
 subjectKeyIdentifier    = hash
 authorityKeyIdentifier  = keyid,issuer:always
 [ req ]
-default_bits            = 1024
+default_bits            = 2048
 distinguished_name      = req_distinguished_name
 x509_extensions         = v3_ca
 policy                  = policy_anything

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/20.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/20.pem?rev=1858106&view=auto
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/20.pem (added)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/20.pem Thu Apr 25 10:14:34 2019
@@ -0,0 +1,86 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 32 (0x20)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=DE, ST=Bayern, L=Munich, O=Home, OU=Apache WSS4J, CN=Werner
+        Validity
+            Not Before: Apr 23 09:30:40 2019 GMT
+            Not After : Apr 20 09:30:40 2029 GMT
+        Subject: C=IE, ST=Leinster, L=Dublin, O=Apache, OU=WSS4J, CN=Colm
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:ca:a6:82:7f:b2:e3:16:a0:ef:93:bd:e4:f7:eb:
+                    05:e2:5d:d7:b2:a9:9d:3a:8c:7e:0a:c8:f1:64:bc:
+                    91:11:ea:c6:d2:a2:ef:92:01:da:34:b5:c6:df:70:
+                    3a:64:79:4e:47:f0:b1:2d:22:da:3d:3e:56:67:2a:
+                    1f:4e:9a:8d:c4:02:6b:57:c6:15:5d:e7:72:03:7b:
+                    fe:04:e5:e6:ed:93:4a:35:50:08:ed:47:c8:d6:d8:
+                    82:cc:e6:fa:b3:74:34:4a:72:e1:f7:52:b4:ec:03:
+                    30:ef:c9:85:f3:b9:6f:b4:a8:64:9b:39:46:67:80:
+                    29:1d:10:02:3d:c9:f9:06:a7:ea:47:12:a1:ef:64:
+                    5e:ad:d0:a3:43:db:df:fa:36:af:1d:17:41:29:e5:
+                    c1:2f:47:2e:f0:c8:1b:cf:d7:aa:8c:f1:bb:98:ef:
+                    79:71:dd:e7:fc:87:34:65:ac:a9:98:cf:4f:4c:97:
+                    15:d6:0b:d7:16:00:bd:9e:c0:aa:98:06:fe:e4:8d:
+                    fc:23:5d:98:f4:65:9d:ac:1e:58:63:19:5a:52:2f:
+                    04:d0:4a:70:2f:3d:c0:08:c2:5e:dd:7d:12:e7:09:
+                    e0:59:9b:d7:ec:b5:8f:85:f9:9f:06:87:94:7f:65:
+                    17:05:47:c6:d7:88:c9:a8:f7:cb:20:83:8b:4f:78:
+                    04:13
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                A8:16:D5:03:BC:89:86:CA:4C:CE:24:1E:72:53:45:8C:9A:B2:49:EA
+            X509v3 Authority Key Identifier: 
+                keyid:75:E8:B1:5D:FD:14:00:8C:C7:5F:C7:0E:D6:02:8B:56:48:20:12:84
+                DirName:/C=DE/ST=Bayern/L=Munich/O=Home/OU=Apache WSS4J/CN=Werner
+                serial:11:8E:29:58:04:58:67:B0:43:BE:B3:3E:B4:34:95:F5:E6:7E:BC:8A
+
+    Signature Algorithm: sha256WithRSAEncryption
+         11:b6:3e:9f:24:8c:55:c0:9e:1d:3c:c4:bc:32:6e:0c:2d:9a:
+         84:ab:27:e2:6b:10:16:91:34:10:36:85:79:69:ed:f9:5a:c9:
+         b9:e2:3f:66:89:3d:34:7b:da:4f:b8:ad:33:bb:6a:66:26:16:
+         11:d8:3b:d8:d9:a4:03:43:cc:ff:4e:09:fc:07:03:49:66:83:
+         b1:55:a6:4d:ad:3b:53:f4:fd:ca:78:90:23:8e:ad:e9:9a:90:
+         60:b3:47:77:b4:17:ff:fe:79:98:5f:79:1f:cc:86:7d:c3:14:
+         6c:96:8f:be:55:62:c9:b6:d4:bd:22:a2:63:88:f2:74:e1:9e:
+         31:29:42:0f:e8:03:02:0a:da:07:e3:3a:f0:8a:bc:10:14:ba:
+         c8:c7:02:2b:f0:42:0b:53:e6:8f:4c:39:ad:a4:cc:33:e1:d7:
+         59:81:0a:50:23:55:77:4b:73:a0:b5:53:07:10:75:53:73:14:
+         ae:a8:17:a9:3a:35:a5:0d:c5:e1:e5:7c:fb:2c:3e:93:09:9f:
+         f1:38:a4:c3:d9:47:34:09:4e:19:4c:d9:76:c3:57:68:bc:b2:
+         e7:1b:36:7a:1c:c5:4d:6e:21:f4:39:92:2b:9b:9b:89:6f:43:
+         c0:b2:71:cc:9f:50:b9:a4:2e:a4:03:ea:99:ab:63:ff:94:db:
+         ee:a1:f2:b8
+-----BEGIN CERTIFICATE-----
+MIIERTCCAy2gAwIBAgIBIDANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJERTEP
+MA0GA1UECAwGQmF5ZXJuMQ8wDQYDVQQHDAZNdW5pY2gxDTALBgNVBAoMBEhvbWUx
+FTATBgNVBAsMDEFwYWNoZSBXU1M0SjEPMA0GA1UEAwwGV2VybmVyMB4XDTE5MDQy
+MzA5MzA0MFoXDTI5MDQyMDA5MzA0MFowYTELMAkGA1UEBhMCSUUxETAPBgNVBAgT
+CExlaW5zdGVyMQ8wDQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwG
+A1UECxMFV1NTNEoxDTALBgNVBAMTBENvbG0wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDKpoJ/suMWoO+TveT36wXiXdeyqZ06jH4KyPFkvJER6sbSou+S
+Ado0tcbfcDpkeU5H8LEtIto9PlZnKh9Omo3EAmtXxhVd53IDe/4E5ebtk0o1UAjt
+R8jW2ILM5vqzdDRKcuH3UrTsAzDvyYXzuW+0qGSbOUZngCkdEAI9yfkGp+pHEqHv
+ZF6t0KND29/6Nq8dF0Ep5cEvRy7wyBvP16qM8buY73lx3ef8hzRlrKmYz09MlxXW
+C9cWAL2ewKqYBv7kjfwjXZj0ZZ2sHlhjGVpSLwTQSnAvPcAIwl7dfRLnCeBZm9fs
+tY+F+Z8Gh5R/ZRcFR8bXiMmo98sgg4tPeAQTAgMBAAGjggEBMIH+MAkGA1UdEwQC
+MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+MB0GA1UdDgQWBBSoFtUDvImGykzOJB5yU0WMmrJJ6jCBowYDVR0jBIGbMIGYgBR1
+6LFd/RQAjMdfxw7WAotWSCAShKFqpGgwZjELMAkGA1UEBhMCREUxDzANBgNVBAgM
+BkJheWVybjEPMA0GA1UEBwwGTXVuaWNoMQ0wCwYDVQQKDARIb21lMRUwEwYDVQQL
+DAxBcGFjaGUgV1NTNEoxDzANBgNVBAMMBldlcm5lcoIUEY4pWARYZ7BDvrM+tDSV
+9eZ+vIowDQYJKoZIhvcNAQELBQADggEBABG2Pp8kjFXAnh08xLwybgwtmoSrJ+Jr
+EBaRNBA2hXlp7flaybniP2aJPTR72k+4rTO7amYmFhHYO9jZpANDzP9OCfwHA0lm
+g7FVpk2tO1P0/cp4kCOOremakGCzR3e0F//+eZhfeR/Mhn3DFGyWj75VYsm21L0i
+omOI8nThnjEpQg/oAwIK2gfjOvCKvBAUusjHAivwQgtT5o9MOa2kzDPh11mBClAj
+VXdLc6C1UwcQdVNzFK6oF6k6NaUNxeHlfPssPpMJn/E4pMPZRzQJThlM2XbDV2i8
+sucbNnocxU1uIfQ5kiubm4lvQ8CyccyfULmkLqQD6pmrY/+U2+6h8rg=
+-----END CERTIFICATE-----

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/21.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/21.pem?rev=1858106&view=auto
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/21.pem (added)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/21.pem Thu Apr 25 10:14:34 2019
@@ -0,0 +1,101 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 33 (0x21)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=DE, ST=Bayern, L=Munich, O=Home, OU=Apache WSS4J, CN=Werner
+        Validity
+            Not Before: Apr 23 09:34:36 2019 GMT
+            Not After : Apr 20 09:34:36 2029 GMT
+        Subject: C=IE, ST=Leinster, L=Dublin, O=Apache, OU=WSS4J, CN=Colm
+        Subject Public Key Info:
+            Public Key Algorithm: dsaEncryption
+                pub: 
+                    5e:94:7b:e9:45:cd:ed:31:41:42:c7:9e:f6:d0:50:
+                    c7:97:ba:6e:eb:5d:d3:c3:ce:e1:f3:79:df:0c:b1:
+                    42:98:14:bc:fb:f2:43:6a:e2:c2:fd:3b:c1:ca:45:
+                    64:a6:ea:12:08:62:23:e6:d4:36:49:97:ec:7d:fe:
+                    3e:da:66:14:00:7c:f2:b8:d4:71:c2:fe:3f:71:34:
+                    a3:0f:a0:12:c0:3a:cf:a4:46:d7:69:b0:67:2b:f2:
+                    ee:21:07:8b:66:e4:59:9b:9e:11:a1:74:dd:60:4e:
+                    14:70:77:d8:e5:02:11:e7:d2:37:fb:f8:c1:f4:c7:
+                    75:7f:c5:2c:00:4a:6d:d3
+                P:   
+                    00:fd:7f:53:81:1d:75:12:29:52:df:4a:9c:2e:ec:
+                    e4:e7:f6:11:b7:52:3c:ef:44:00:c3:1e:3f:80:b6:
+                    51:26:69:45:5d:40:22:51:fb:59:3d:8d:58:fa:bf:
+                    c5:f5:ba:30:f6:cb:9b:55:6c:d7:81:3b:80:1d:34:
+                    6f:f2:66:60:b7:6b:99:50:a5:a4:9f:9f:e8:04:7b:
+                    10:22:c2:4f:bb:a9:d7:fe:b7:c6:1b:f8:3b:57:e7:
+                    c6:a8:a6:15:0f:04:fb:83:f6:d3:c5:1e:c3:02:35:
+                    54:13:5a:16:91:32:f6:75:f3:ae:2b:61:d7:2a:ef:
+                    f2:22:03:19:9d:d1:48:01:c7
+                Q:   
+                    00:97:60:50:8f:15:23:0b:cc:b2:92:b9:82:a2:eb:
+                    84:0b:f0:58:1c:f5
+                G:   
+                    00:f7:e1:a0:85:d6:9b:3d:de:cb:bc:ab:5c:36:b8:
+                    57:b9:79:94:af:bb:fa:3a:ea:82:f9:57:4c:0b:3d:
+                    07:82:67:51:59:57:8e:ba:d4:59:4f:e6:71:07:10:
+                    81:80:b4:49:16:71:23:e8:4c:28:16:13:b7:cf:09:
+                    32:8c:c8:a6:e1:3c:16:7a:8b:54:7c:8d:28:e0:a3:
+                    ae:1e:2b:b3:a6:75:91:6e:a3:7f:0b:fa:21:35:62:
+                    f1:fb:62:7a:01:24:3b:cc:a4:f1:be:a8:51:90:89:
+                    a8:83:df:e1:5a:e5:9f:06:92:8b:66:5e:80:7b:55:
+                    25:64:01:4c:3b:fe:cf:49:2a
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                C0:B3:BA:34:B8:23:F7:47:7A:22:DE:7B:B9:A8:57:B8:3E:BA:61:70
+            X509v3 Authority Key Identifier: 
+                keyid:75:E8:B1:5D:FD:14:00:8C:C7:5F:C7:0E:D6:02:8B:56:48:20:12:84
+                DirName:/C=DE/ST=Bayern/L=Munich/O=Home/OU=Apache WSS4J/CN=Werner
+                serial:11:8E:29:58:04:58:67:B0:43:BE:B3:3E:B4:34:95:F5:E6:7E:BC:8A
+
+    Signature Algorithm: sha256WithRSAEncryption
+         8d:90:a4:f4:a8:c9:6b:81:89:ff:86:eb:45:2f:88:65:b2:cc:
+         ba:2f:5c:68:05:ce:c7:eb:cd:5b:b9:e1:ad:b0:91:5b:cd:3d:
+         89:0c:b7:1f:41:18:55:24:e4:00:41:83:db:67:ba:a2:4b:80:
+         14:00:11:6b:b0:74:c3:e4:52:10:a5:02:7f:dd:c3:fa:8a:ad:
+         23:f0:cf:9e:a7:51:02:53:5a:28:ba:c4:2b:88:b5:0e:a7:6f:
+         3e:cc:dc:50:9c:fb:a4:a6:eb:a5:bc:aa:94:14:20:a1:a2:82:
+         c9:d4:86:0e:44:ed:f9:cd:c8:a1:f1:db:4a:7b:5e:69:06:02:
+         bd:9a:73:0f:5f:0b:6e:5e:e5:65:e7:ba:71:cb:81:fd:56:ba:
+         81:93:9c:3a:f5:cb:bd:4d:04:ef:6d:b3:a5:ea:00:bb:32:d7:
+         83:0b:a7:6f:80:04:c4:25:22:82:fc:36:2e:85:97:c1:80:8c:
+         7d:dc:00:c6:dc:fe:06:76:46:48:cd:23:3c:69:01:4e:02:b8:
+         25:cf:db:f6:b4:67:21:72:59:eb:ba:3c:88:16:4f:cd:7c:83:
+         74:1b:28:ff:a8:45:9d:01:0d:92:4c:f8:80:07:4f:da:f3:f2:
+         af:bd:56:a1:33:70:51:ea:4e:a2:4e:a7:c1:43:a5:7f:7a:5b:
+         90:f9:97:a3
+-----BEGIN CERTIFICATE-----
+MIIE2jCCA8KgAwIBAgIBITANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJERTEP
+MA0GA1UECAwGQmF5ZXJuMQ8wDQYDVQQHDAZNdW5pY2gxDTALBgNVBAoMBEhvbWUx
+FTATBgNVBAsMDEFwYWNoZSBXU1M0SjEPMA0GA1UEAwwGV2VybmVyMB4XDTE5MDQy
+MzA5MzQzNloXDTI5MDQyMDA5MzQzNlowYTELMAkGA1UEBhMCSUUxETAPBgNVBAgT
+CExlaW5zdGVyMQ8wDQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwG
+A1UECxMFV1NTNEoxDTALBgNVBAMTBENvbG0wggG3MIIBLAYHKoZIzjgEATCCAR8C
+gYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZPY1Y+r/F
+9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYV
+DwT7g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKS
+uYKi64QL8Fgc9QKBgQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZ
+V4661FlP5nEHEIGAtEkWcSPoTCgWE7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFu
+o38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8GkotmXoB7VSVkAUw7/s9JKgOB
+hAACgYBelHvpRc3tMUFCx5720FDHl7pu613Tw87h83nfDLFCmBS8+/JDauLC/TvB
+ykVkpuoSCGIj5tQ2SZfsff4+2mYUAHzyuNRxwv4/cTSjD6ASwDrPpEbXabBnK/Lu
+IQeLZuRZm54RoXTdYE4UcHfY5QIR59I3+/jB9Md1f8UsAEpt06OCAQEwgf4wCQYD
+VR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlm
+aWNhdGUwHQYDVR0OBBYEFMCzujS4I/dHeiLee7moV7g+umFwMIGjBgNVHSMEgZsw
+gZiAFHXosV39FACMx1/HDtYCi1ZIIBKEoWqkaDBmMQswCQYDVQQGEwJERTEPMA0G
+A1UECAwGQmF5ZXJuMQ8wDQYDVQQHDAZNdW5pY2gxDTALBgNVBAoMBEhvbWUxFTAT
+BgNVBAsMDEFwYWNoZSBXU1M0SjEPMA0GA1UEAwwGV2VybmVyghQRjilYBFhnsEO+
+sz60NJX15n68ijANBgkqhkiG9w0BAQsFAAOCAQEAjZCk9KjJa4GJ/4brRS+IZbLM
+ui9caAXOx+vNW7nhrbCRW809iQy3H0EYVSTkAEGD22e6okuAFAARa7B0w+RSEKUC
+f93D+oqtI/DPnqdRAlNaKLrEK4i1DqdvPszcUJz7pKbrpbyqlBQgoaKCydSGDkTt
++c3IofHbSnteaQYCvZpzD18Lbl7lZee6ccuB/Va6gZOcOvXLvU0E722zpeoAuzLX
+gwunb4AExCUigvw2LoWXwYCMfdwAxtz+BnZGSM0jPGkBTgK4Jc/b9rRnIXJZ67o8
+iBZPzXyDdBso/6hFnQENkkz4gAdP2vPyr71WoTNwUepOok6nwUOlf3pbkPmXow==
+-----END CERTIFICATE-----

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/22.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/22.pem?rev=1858106&view=auto
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/22.pem (added)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/22.pem Thu Apr 25 10:14:34 2019
@@ -0,0 +1,86 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 34 (0x22)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=DE, ST=Bayern, L=Munich, O=Home, OU=Apache WSS4J, CN=Werner
+        Validity
+            Not Before: Apr 23 09:37:53 2019 GMT
+            Not After : Apr 20 09:37:53 2029 GMT
+        Subject: C=IE, ST=Leinster, L=Dublin, O=Apache, OU=WSS4J, CN=Server
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:88:19:ab:97:a9:54:64:69:e3:5c:e6:d5:75:d4:
+                    48:79:75:a5:b2:d4:3a:01:bb:0a:24:1d:5b:77:29:
+                    2c:9c:13:4f:e8:1f:84:7e:83:c2:ed:e0:63:f7:8f:
+                    a0:93:9f:6a:9c:4a:d0:0f:ca:e3:c9:d8:3f:22:70:
+                    68:0b:93:89:21:01:5b:87:3d:6c:2d:49:d3:14:b5:
+                    e0:ec:5d:11:f1:02:89:9f:9f:06:b5:b2:6e:5d:5b:
+                    cb:8d:17:eb:b5:dd:27:29:11:96:f7:1f:14:a8:a3:
+                    6c:e9:ca:2f:11:8b:a6:42:a6:49:a0:f4:77:db:35:
+                    2a:2a:18:d7:95:2b:42:a4:02:04:d9:62:75:e1:e4:
+                    1b:4d:7d:5e:3a:8b:7d:38:ea:02:e6:6d:b0:62:9e:
+                    34:ac:6b:2c:63:fc:f0:e6:f2:a9:f4:f6:99:ef:08:
+                    40:0e:bf:8d:0c:62:40:19:e5:7e:cc:a6:02:a7:44:
+                    74:70:8f:0c:50:91:90:83:d6:53:2b:f2:19:ef:a4:
+                    ff:d2:40:95:c7:0e:31:e0:9b:5a:23:c4:dc:c3:04:
+                    cc:65:23:66:80:97:c8:b3:8a:d6:6d:94:3f:ac:76:
+                    6e:e5:e7:74:f9:49:a6:db:41:52:44:cb:50:cd:4d:
+                    01:11:b0:dc:42:a7:25:c8:ef:c0:85:7b:13:bf:07:
+                    68:15
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                E4:BB:13:B0:B0:D2:6F:B5:F1:95:A0:9F:7E:33:41:1C:CE:67:FB:50
+            X509v3 Authority Key Identifier: 
+                keyid:75:E8:B1:5D:FD:14:00:8C:C7:5F:C7:0E:D6:02:8B:56:48:20:12:84
+                DirName:/C=DE/ST=Bayern/L=Munich/O=Home/OU=Apache WSS4J/CN=Werner
+                serial:11:8E:29:58:04:58:67:B0:43:BE:B3:3E:B4:34:95:F5:E6:7E:BC:8A
+
+    Signature Algorithm: sha256WithRSAEncryption
+         6f:86:64:ff:6f:0e:89:6c:b4:f7:c3:e8:6f:59:0d:67:2e:91:
+         08:49:df:1b:56:c6:19:cf:49:ad:dd:7e:2b:ab:5d:b9:80:6e:
+         1b:5f:fa:49:86:4a:7e:87:e1:49:65:d4:ea:42:25:76:9f:9a:
+         02:2a:7b:0e:a8:c3:a0:19:d5:2a:eb:72:64:4a:de:14:1f:46:
+         de:09:78:e2:69:59:1a:57:4f:3e:28:3f:c4:8d:ff:c9:a6:4c:
+         19:c9:5e:80:91:d3:5b:0a:cc:8f:78:c0:4e:66:5c:03:75:b8:
+         b9:38:74:0b:e9:6e:3a:ec:ce:f6:03:b5:25:21:4e:a9:af:fc:
+         fa:47:93:d3:3e:cb:83:ec:d1:30:dd:09:ac:33:e6:96:f6:e1:
+         63:ac:3a:68:55:34:c7:97:9d:4b:79:5e:66:ef:e4:60:fe:56:
+         5e:99:5a:50:35:d5:11:6e:ec:ec:57:6b:75:94:59:4c:06:6a:
+         5e:34:26:6b:8a:54:a3:0f:55:41:ad:9a:6d:79:c4:a4:76:b9:
+         da:33:8f:8a:da:df:15:64:7f:1d:b5:ce:37:62:e1:86:50:ff:
+         c4:70:35:58:61:75:d7:e5:54:c8:e3:e9:d0:dd:d3:b6:d8:31:
+         d0:a6:2f:1a:ad:9b:30:fa:f6:21:b1:03:eb:89:41:21:1a:88:
+         ea:01:05:1c
+-----BEGIN CERTIFICATE-----
+MIIERzCCAy+gAwIBAgIBIjANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJERTEP
+MA0GA1UECAwGQmF5ZXJuMQ8wDQYDVQQHDAZNdW5pY2gxDTALBgNVBAoMBEhvbWUx
+FTATBgNVBAsMDEFwYWNoZSBXU1M0SjEPMA0GA1UEAwwGV2VybmVyMB4XDTE5MDQy
+MzA5Mzc1M1oXDTI5MDQyMDA5Mzc1M1owYzELMAkGA1UEBhMCSUUxETAPBgNVBAgT
+CExlaW5zdGVyMQ8wDQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwG
+A1UECxMFV1NTNEoxDzANBgNVBAMTBlNlcnZlcjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAIgZq5epVGRp41zm1XXUSHl1pbLUOgG7CiQdW3cpLJwTT+gf
+hH6Dwu3gY/ePoJOfapxK0A/K48nYPyJwaAuTiSEBW4c9bC1J0xS14OxdEfECiZ+f
+BrWybl1by40X67XdJykRlvcfFKijbOnKLxGLpkKmSaD0d9s1KioY15UrQqQCBNli
+deHkG019XjqLfTjqAuZtsGKeNKxrLGP88ObyqfT2me8IQA6/jQxiQBnlfsymAqdE
+dHCPDFCRkIPWUyvyGe+k/9JAlccOMeCbWiPE3MMEzGUjZoCXyLOK1m2UP6x2buXn
+dPlJpttBUkTLUM1NARGw3EKnJcjvwIV7E78HaBUCAwEAAaOCAQEwgf4wCQYDVR0T
+BAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNh
+dGUwHQYDVR0OBBYEFOS7E7Cw0m+18ZWgn34zQRzOZ/tQMIGjBgNVHSMEgZswgZiA
+FHXosV39FACMx1/HDtYCi1ZIIBKEoWqkaDBmMQswCQYDVQQGEwJERTEPMA0GA1UE
+CAwGQmF5ZXJuMQ8wDQYDVQQHDAZNdW5pY2gxDTALBgNVBAoMBEhvbWUxFTATBgNV
+BAsMDEFwYWNoZSBXU1M0SjEPMA0GA1UEAwwGV2VybmVyghQRjilYBFhnsEO+sz60
+NJX15n68ijANBgkqhkiG9w0BAQsFAAOCAQEAb4Zk/28OiWy098Pob1kNZy6RCEnf
+G1bGGc9Jrd1+K6tduYBuG1/6SYZKfofhSWXU6kIldp+aAip7DqjDoBnVKutyZEre
+FB9G3gl44mlZGldPPig/xI3/yaZMGclegJHTWwrMj3jATmZcA3W4uTh0C+luOuzO
+9gO1JSFOqa/8+keT0z7Lg+zRMN0JrDPmlvbhY6w6aFU0x5edS3leZu/kYP5WXpla
+UDXVEW7s7FdrdZRZTAZqXjQma4pUow9VQa2abXnEpHa52jOPitrfFWR/HbXON2Lh
+hlD/xHA1WGF11+VUyOPp0N3Tttgx0KYvGq2bMPr2IbED64lBIRqI6gEFHA==
+-----END CERTIFICATE-----

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/23.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/23.pem?rev=1858106&view=auto
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/23.pem (added)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/23.pem Thu Apr 25 10:14:34 2019
@@ -0,0 +1,75 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 35 (0x23)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=DE, ST=Bayern, L=Munich, O=Home, OU=Apache WSS4J, CN=Werner
+        Validity
+            Not Before: Apr 23 10:15:43 2019 GMT
+            Not After : Apr 20 10:15:43 2029 GMT
+        Subject: C=IE, ST=Leinster, L=Dublin, O=Apache, OU=WSS4J, CN=Colm
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (1024 bit)
+                Modulus:
+                    00:9d:5e:8d:c8:f0:72:6d:d0:d5:7a:16:20:19:be:
+                    e3:3f:f3:99:97:68:d3:8c:19:63:79:89:27:fe:12:
+                    1c:bf:b4:46:ab:11:06:47:f9:23:b8:ee:26:fd:2d:
+                    f9:e2:2f:61:43:fe:92:b4:6f:77:9d:94:da:b3:a5:
+                    59:81:b0:54:54:04:26:de:da:33:44:08:ef:6a:c8:
+                    b4:d2:0a:4b:c7:0b:c6:4c:d7:ba:89:92:2a:6b:d3:
+                    3a:08:de:e4:b2:95:c0:ad:4c:5c:f1:65:aa:15:7a:
+                    50:9a:03:f9:50:38:c3:7c:0c:1a:55:67:35:d3:6f:
+                    fc:dd:d5:56:ce:9b:d1:6b:bb
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                1F:B7:6D:D2:5B:FD:33:CB:98:3B:2E:12:79:D5:74:90:F3:AC:DB:60
+            X509v3 Authority Key Identifier: 
+                keyid:75:E8:B1:5D:FD:14:00:8C:C7:5F:C7:0E:D6:02:8B:56:48:20:12:84
+                DirName:/C=DE/ST=Bayern/L=Munich/O=Home/OU=Apache WSS4J/CN=Werner
+                serial:11:8E:29:58:04:58:67:B0:43:BE:B3:3E:B4:34:95:F5:E6:7E:BC:8A
+
+    Signature Algorithm: sha256WithRSAEncryption
+         15:cf:d2:9b:17:91:13:12:4b:32:ca:0f:ac:4e:b4:98:2b:11:
+         8b:1f:59:92:ca:42:3f:2a:1d:f9:2c:63:1c:a7:6b:44:5b:9e:
+         27:65:6c:0c:ed:34:6c:31:1c:dc:f1:8d:df:1a:db:0e:fa:d2:
+         14:d9:b4:17:7b:3a:86:93:7c:2f:05:c9:9c:15:c2:32:0a:42:
+         12:18:e6:4e:c0:3a:a5:8d:c4:fb:65:55:12:0b:8d:db:d6:de:
+         46:7a:4c:ae:bc:62:8c:26:f1:d5:31:ec:83:c5:8f:ee:bc:69:
+         01:3d:4b:10:94:a9:9b:d1:05:aa:db:eb:0b:71:93:6d:9a:ac:
+         45:95:79:7d:e7:ee:1c:3d:78:f4:c6:58:97:c4:82:02:c5:c0:
+         cf:33:ae:ff:ac:81:16:4e:e4:40:83:eb:0b:de:b9:df:6b:00:
+         8a:aa:7b:d1:f5:ed:94:a3:e3:3c:d9:1c:32:1c:ce:4c:d0:50:
+         af:64:45:38:c7:07:dd:5b:f6:cd:9a:b2:ff:3a:af:de:9d:e5:
+         fb:6a:65:f4:f4:d1:24:8f:90:c3:84:57:1f:f3:f1:2e:bf:dc:
+         45:ad:54:77:82:95:46:d3:cf:dc:6d:3c:79:d3:3c:40:66:94:
+         52:5a:25:35:28:c9:8a:30:de:85:eb:d8:6a:30:5f:c8:46:e0:
+         a2:be:9b:5f
+-----BEGIN CERTIFICATE-----
+MIIDwTCCAqmgAwIBAgIBIzANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJERTEP
+MA0GA1UECAwGQmF5ZXJuMQ8wDQYDVQQHDAZNdW5pY2gxDTALBgNVBAoMBEhvbWUx
+FTATBgNVBAsMDEFwYWNoZSBXU1M0SjEPMA0GA1UEAwwGV2VybmVyMB4XDTE5MDQy
+MzEwMTU0M1oXDTI5MDQyMDEwMTU0M1owYTELMAkGA1UEBhMCSUUxETAPBgNVBAgT
+CExlaW5zdGVyMQ8wDQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwG
+A1UECxMFV1NTNEoxDTALBgNVBAMTBENvbG0wgZ8wDQYJKoZIhvcNAQEBBQADgY0A
+MIGJAoGBAJ1ejcjwcm3Q1XoWIBm+4z/zmZdo04wZY3mJJ/4SHL+0RqsRBkf5I7ju
+Jv0t+eIvYUP+krRvd52U2rOlWYGwVFQEJt7aM0QI72rItNIKS8cLxkzXuomSKmvT
+Ogje5LKVwK1MXPFlqhV6UJoD+VA4w3wMGlVnNdNv/N3VVs6b0Wu7AgMBAAGjggEB
+MIH+MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
+IENlcnRpZmljYXRlMB0GA1UdDgQWBBQft23SW/0zy5g7LhJ51XSQ86zbYDCBowYD
+VR0jBIGbMIGYgBR16LFd/RQAjMdfxw7WAotWSCAShKFqpGgwZjELMAkGA1UEBhMC
+REUxDzANBgNVBAgMBkJheWVybjEPMA0GA1UEBwwGTXVuaWNoMQ0wCwYDVQQKDARI
+b21lMRUwEwYDVQQLDAxBcGFjaGUgV1NTNEoxDzANBgNVBAMMBldlcm5lcoIUEY4p
+WARYZ7BDvrM+tDSV9eZ+vIowDQYJKoZIhvcNAQELBQADggEBABXP0psXkRMSSzLK
+D6xOtJgrEYsfWZLKQj8qHfksYxyna0RbnidlbAztNGwxHNzxjd8a2w760hTZtBd7
+OoaTfC8FyZwVwjIKQhIY5k7AOqWNxPtlVRILjdvW3kZ6TK68Yowm8dUx7IPFj+68
+aQE9SxCUqZvRBarb6wtxk22arEWVeX3n7hw9ePTGWJfEggLFwM8zrv+sgRZO5ECD
+6wveud9rAIqqe9H17ZSj4zzZHDIczkzQUK9kRTjHB91b9s2asv86r96d5ftqZfT0
+0SSPkMOEVx/z8S6/3EWtVHeClUbTz9xtPHnTPEBmlFJaJTUoyYow3oXr2GowX8hG
+4KK+m18=
+-----END CERTIFICATE-----

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.index
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.index?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.index (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.index Thu Apr 25 10:14:34 2019
@@ -29,3 +29,7 @@ V	250906141808Z		1C	unknown	/C=IE/ST=Lei
 V	250906145016Z		1D	unknown	/C=IE/ST=Leinster/L=Dublin/O=Apache/OU=WSS4J/CN=Colm DSA
 R	250906151732Z	150909151849Z	1E	unknown	/C=IE/ST=Leinster/L=Dublin/O=Apache/OU=WSS4J/CN=Colm
 V	150911154818Z		1F	unknown	/C=IE/ST=Leinster/L=Dublin/O=Apache/OU=WSS4J/CN=Colm
+V	290420093040Z		20	unknown	/C=IE/ST=Leinster/L=Dublin/O=Apache/OU=WSS4J/CN=Colm
+V	290420093436Z		21	unknown	/C=IE/ST=Leinster/L=Dublin/O=Apache/OU=WSS4J/CN=Colm
+V	290420093753Z		22	unknown	/C=IE/ST=Leinster/L=Dublin/O=Apache/OU=WSS4J/CN=Server
+V	290420101543Z		23	unknown	/C=IE/ST=Leinster/L=Dublin/O=Apache/OU=WSS4J/CN=Colm

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.index.old
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.index.old?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
Binary files - no diff available.

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.serial
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.serial?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.serial (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.serial Thu Apr 25 10:14:34 2019
@@ -1 +1 @@
-20
+24

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.serial.old
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.serial.old?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
Binary files - no diff available.

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.cer
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.cer?rev=1858106&view=auto
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.cer (added)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.cer Thu Apr 25 10:14:34 2019
@@ -0,0 +1,12 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIIB0TCCAToCAQAwYTELMAkGA1UEBhMCSUUxETAPBgNVBAgTCExlaW5zdGVyMQ8w
+DQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwGA1UECxMFV1NTNEox
+DTALBgNVBAMTBENvbG0wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJ1ejcjw
+cm3Q1XoWIBm+4z/zmZdo04wZY3mJJ/4SHL+0RqsRBkf5I7juJv0t+eIvYUP+krRv
+d52U2rOlWYGwVFQEJt7aM0QI72rItNIKS8cLxkzXuomSKmvTOgje5LKVwK1MXPFl
+qhV6UJoD+VA4w3wMGlVnNdNv/N3VVs6b0Wu7AgMBAAGgMDAuBgkqhkiG9w0BCQ4x
+ITAfMB0GA1UdDgQWBBQft23SW/0zy5g7LhJ51XSQ86zbYDANBgkqhkiG9w0BAQsF
+AAOBgQB6ggdA0pWZrVfQWLBFjak9sZaHcQ9Is5E1Omu/Hv1CdnRnlIV7R6DeFfXm
+5tVJpws3WNOY5W/FuxWHBXLXfobn1aji5FUldnfrGO0vKDUmBZG+w9uIxGFVRiAz
+iHmJSn6PboKjmXMmRc6vMrM59njvorVspucj45n4j2nbCWR3Ow==
+-----END NEW CERTIFICATE REQUEST-----

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.crt
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.crt?rev=1858106&view=auto
==============================================================================
Binary files webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.crt (added) and webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.crt Thu Apr 25 10:14:34 2019 differ

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.jks
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.jks?rev=1858106&view=auto
==============================================================================
Binary files webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.jks (added) and webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.jks Thu Apr 25 10:14:34 2019 differ

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.pem?rev=1858106&view=auto
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.pem (added)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/rsa1024.pem Thu Apr 25 10:14:34 2019
@@ -0,0 +1,75 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 35 (0x23)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=DE, ST=Bayern, L=Munich, O=Home, OU=Apache WSS4J, CN=Werner
+        Validity
+            Not Before: Apr 23 10:15:43 2019 GMT
+            Not After : Apr 20 10:15:43 2029 GMT
+        Subject: C=IE, ST=Leinster, L=Dublin, O=Apache, OU=WSS4J, CN=Colm
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (1024 bit)
+                Modulus:
+                    00:9d:5e:8d:c8:f0:72:6d:d0:d5:7a:16:20:19:be:
+                    e3:3f:f3:99:97:68:d3:8c:19:63:79:89:27:fe:12:
+                    1c:bf:b4:46:ab:11:06:47:f9:23:b8:ee:26:fd:2d:
+                    f9:e2:2f:61:43:fe:92:b4:6f:77:9d:94:da:b3:a5:
+                    59:81:b0:54:54:04:26:de:da:33:44:08:ef:6a:c8:
+                    b4:d2:0a:4b:c7:0b:c6:4c:d7:ba:89:92:2a:6b:d3:
+                    3a:08:de:e4:b2:95:c0:ad:4c:5c:f1:65:aa:15:7a:
+                    50:9a:03:f9:50:38:c3:7c:0c:1a:55:67:35:d3:6f:
+                    fc:dd:d5:56:ce:9b:d1:6b:bb
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                1F:B7:6D:D2:5B:FD:33:CB:98:3B:2E:12:79:D5:74:90:F3:AC:DB:60
+            X509v3 Authority Key Identifier: 
+                keyid:75:E8:B1:5D:FD:14:00:8C:C7:5F:C7:0E:D6:02:8B:56:48:20:12:84
+                DirName:/C=DE/ST=Bayern/L=Munich/O=Home/OU=Apache WSS4J/CN=Werner
+                serial:11:8E:29:58:04:58:67:B0:43:BE:B3:3E:B4:34:95:F5:E6:7E:BC:8A
+
+    Signature Algorithm: sha256WithRSAEncryption
+         15:cf:d2:9b:17:91:13:12:4b:32:ca:0f:ac:4e:b4:98:2b:11:
+         8b:1f:59:92:ca:42:3f:2a:1d:f9:2c:63:1c:a7:6b:44:5b:9e:
+         27:65:6c:0c:ed:34:6c:31:1c:dc:f1:8d:df:1a:db:0e:fa:d2:
+         14:d9:b4:17:7b:3a:86:93:7c:2f:05:c9:9c:15:c2:32:0a:42:
+         12:18:e6:4e:c0:3a:a5:8d:c4:fb:65:55:12:0b:8d:db:d6:de:
+         46:7a:4c:ae:bc:62:8c:26:f1:d5:31:ec:83:c5:8f:ee:bc:69:
+         01:3d:4b:10:94:a9:9b:d1:05:aa:db:eb:0b:71:93:6d:9a:ac:
+         45:95:79:7d:e7:ee:1c:3d:78:f4:c6:58:97:c4:82:02:c5:c0:
+         cf:33:ae:ff:ac:81:16:4e:e4:40:83:eb:0b:de:b9:df:6b:00:
+         8a:aa:7b:d1:f5:ed:94:a3:e3:3c:d9:1c:32:1c:ce:4c:d0:50:
+         af:64:45:38:c7:07:dd:5b:f6:cd:9a:b2:ff:3a:af:de:9d:e5:
+         fb:6a:65:f4:f4:d1:24:8f:90:c3:84:57:1f:f3:f1:2e:bf:dc:
+         45:ad:54:77:82:95:46:d3:cf:dc:6d:3c:79:d3:3c:40:66:94:
+         52:5a:25:35:28:c9:8a:30:de:85:eb:d8:6a:30:5f:c8:46:e0:
+         a2:be:9b:5f
+-----BEGIN CERTIFICATE-----
+MIIDwTCCAqmgAwIBAgIBIzANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJERTEP
+MA0GA1UECAwGQmF5ZXJuMQ8wDQYDVQQHDAZNdW5pY2gxDTALBgNVBAoMBEhvbWUx
+FTATBgNVBAsMDEFwYWNoZSBXU1M0SjEPMA0GA1UEAwwGV2VybmVyMB4XDTE5MDQy
+MzEwMTU0M1oXDTI5MDQyMDEwMTU0M1owYTELMAkGA1UEBhMCSUUxETAPBgNVBAgT
+CExlaW5zdGVyMQ8wDQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwG
+A1UECxMFV1NTNEoxDTALBgNVBAMTBENvbG0wgZ8wDQYJKoZIhvcNAQEBBQADgY0A
+MIGJAoGBAJ1ejcjwcm3Q1XoWIBm+4z/zmZdo04wZY3mJJ/4SHL+0RqsRBkf5I7ju
+Jv0t+eIvYUP+krRvd52U2rOlWYGwVFQEJt7aM0QI72rItNIKS8cLxkzXuomSKmvT
+Ogje5LKVwK1MXPFlqhV6UJoD+VA4w3wMGlVnNdNv/N3VVs6b0Wu7AgMBAAGjggEB
+MIH+MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
+IENlcnRpZmljYXRlMB0GA1UdDgQWBBQft23SW/0zy5g7LhJ51XSQ86zbYDCBowYD
+VR0jBIGbMIGYgBR16LFd/RQAjMdfxw7WAotWSCAShKFqpGgwZjELMAkGA1UEBhMC
+REUxDzANBgNVBAgMBkJheWVybjEPMA0GA1UEBwwGTXVuaWNoMQ0wCwYDVQQKDARI
+b21lMRUwEwYDVQQLDAxBcGFjaGUgV1NTNEoxDzANBgNVBAMMBldlcm5lcoIUEY4p
+WARYZ7BDvrM+tDSV9eZ+vIowDQYJKoZIhvcNAQELBQADggEBABXP0psXkRMSSzLK
+D6xOtJgrEYsfWZLKQj8qHfksYxyna0RbnidlbAztNGwxHNzxjd8a2w760hTZtBd7
+OoaTfC8FyZwVwjIKQhIY5k7AOqWNxPtlVRILjdvW3kZ6TK68Yowm8dUx7IPFj+68
+aQE9SxCUqZvRBarb6wtxk22arEWVeX3n7hw9ePTGWJfEggLFwM8zrv+sgRZO5ECD
+6wveud9rAIqqe9H17ZSj4zzZHDIczkzQUK9kRTjHB91b9s2asv86r96d5ftqZfT0
+0SSPkMOEVx/z8S6/3EWtVHeClUbTz9xtPHnTPEBmlFJaJTUoyYow3oXr2GowX8hG
+4KK+m18=
+-----END CERTIFICATE-----

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.cer
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.cer?rev=1858106&view=auto
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.cer (added)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.cer Thu Apr 25 10:14:34 2019
@@ -0,0 +1,16 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICmDCCAlMCAQAwYTELMAkGA1UEBhMCSUUxETAPBgNVBAgTCExlaW5zdGVyMQ8w
+DQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwGA1UECxMFV1NTNEox
+DTALBgNVBAMTBENvbG0wggG3MIIBLAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS
+30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZPY1Y+r/F9bow9subVWzXgTuA
+HTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7g/bTxR7DAjVU
+E1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKB
+gQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGA
+tEkWcSPoTCgWE7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoB
+JDvMpPG+qFGQiaiD3+Fa5Z8GkotmXoB7VSVkAUw7/s9JKgOBhAACgYBelHvpRc3t
+MUFCx5720FDHl7pu613Tw87h83nfDLFCmBS8+/JDauLC/TvBykVkpuoSCGIj5tQ2
+SZfsff4+2mYUAHzyuNRxwv4/cTSjD6ASwDrPpEbXabBnK/LuIQeLZuRZm54RoXTd
+YE4UcHfY5QIR59I3+/jB9Md1f8UsAEpt06AwMC4GCSqGSIb3DQEJDjEhMB8wHQYD
+VR0OBBYEFMCzujS4I/dHeiLee7moV7g+umFwMA0GCWCGSAFlAwQDAgUAAzAAMC0C
+FQCLYnlXJKmt4Juwj/7UnCTX+L0wQAIUL3C+wLqP8UnBRpIKKSEf5KFVIL0=
+-----END NEW CERTIFICATE REQUEST-----

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.crt
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.crt?rev=1858106&view=auto
==============================================================================
Binary files webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.crt (added) and webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.crt Thu Apr 25 10:14:34 2019 differ

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.jks
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.jks?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
Binary files webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.jks (original) and webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.jks Thu Apr 25 10:14:34 2019 differ

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.pem?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.pem (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40.pem Thu Apr 25 10:14:34 2019
@@ -1,76 +1,101 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 27 (0x1b)
-    Signature Algorithm: sha256WithRSAEncryption
+        Serial Number: 33 (0x21)
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=DE, ST=Bayern, L=Munich, O=Home, OU=Apache WSS4J, CN=Werner
         Validity
-            Not Before: Sep  9 14:08:43 2015 GMT
-            Not After : Sep  6 14:08:43 2025 GMT
+            Not Before: Apr 23 09:34:36 2019 GMT
+            Not After : Apr 20 09:34:36 2029 GMT
         Subject: C=IE, ST=Leinster, L=Dublin, O=Apache, OU=WSS4J, CN=Colm
         Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:92:4e:fa:e2:25:a5:6f:3f:78:16:88:81:3f:c0:
-                    e8:78:39:ae:58:fc:57:b1:50:95:40:e9:ae:c2:a6:
-                    7a:e5:61:5a:f4:af:2b:18:20:7c:e3:4c:e5:a7:17:
-                    8f:74:1a:d6:3c:9a:89:94:1f:40:c4:0f:af:e6:95:
-                    14:19:10:d0:3e:75:83:c8:10:32:07:89:53:af:73:
-                    de:cd:f7:ea:be:ab:97:f5:72:59:7a:64:aa:c6:ac:
-                    e4:01:2e:40:53:05:c4:92:9a:43:80:e0:45:0e:55:
-                    ea:fa:48:14:2b:33:f8:9e:da:96:a8:fe:77:3c:e8:
-                    a0:64:a9:95:8e:ad:21:ce:12:16:f5:55:34:63:ba:
-                    63:0c:59:37:9d:6a:43:ed:ae:40:bc:91:00:ff:d7:
-                    16:00:4c:d1:1a:48:9a:29:fd:7a:b1:83:39:d6:e0:
-                    a1:1e:c7:15:42:07:b9:7f:79:7b:ee:58:f3:d9:03:
-                    68:d7:6b:54:b2:09:e1:ce:32:a8:ca:2b:f3:03:3b:
-                    28:6d:5d:72:20:b2:8b:de:2d:6c:bc:28:d7:9d:a0:
-                    a5:98:17:84:dd:69:a4:7f:aa:26:c0:17:91:6f:1a:
-                    3d:62:f5:62:49:c8:70:33:7d:d8:64:12:b6:9a:2e:
-                    98:f3:a6:5c:84:a9:00:0d:a7:89:81:da:b8:26:be:
-                    51:a9
-                Exponent: 65537 (0x10001)
+            Public Key Algorithm: dsaEncryption
+                pub: 
+                    5e:94:7b:e9:45:cd:ed:31:41:42:c7:9e:f6:d0:50:
+                    c7:97:ba:6e:eb:5d:d3:c3:ce:e1:f3:79:df:0c:b1:
+                    42:98:14:bc:fb:f2:43:6a:e2:c2:fd:3b:c1:ca:45:
+                    64:a6:ea:12:08:62:23:e6:d4:36:49:97:ec:7d:fe:
+                    3e:da:66:14:00:7c:f2:b8:d4:71:c2:fe:3f:71:34:
+                    a3:0f:a0:12:c0:3a:cf:a4:46:d7:69:b0:67:2b:f2:
+                    ee:21:07:8b:66:e4:59:9b:9e:11:a1:74:dd:60:4e:
+                    14:70:77:d8:e5:02:11:e7:d2:37:fb:f8:c1:f4:c7:
+                    75:7f:c5:2c:00:4a:6d:d3
+                P:   
+                    00:fd:7f:53:81:1d:75:12:29:52:df:4a:9c:2e:ec:
+                    e4:e7:f6:11:b7:52:3c:ef:44:00:c3:1e:3f:80:b6:
+                    51:26:69:45:5d:40:22:51:fb:59:3d:8d:58:fa:bf:
+                    c5:f5:ba:30:f6:cb:9b:55:6c:d7:81:3b:80:1d:34:
+                    6f:f2:66:60:b7:6b:99:50:a5:a4:9f:9f:e8:04:7b:
+                    10:22:c2:4f:bb:a9:d7:fe:b7:c6:1b:f8:3b:57:e7:
+                    c6:a8:a6:15:0f:04:fb:83:f6:d3:c5:1e:c3:02:35:
+                    54:13:5a:16:91:32:f6:75:f3:ae:2b:61:d7:2a:ef:
+                    f2:22:03:19:9d:d1:48:01:c7
+                Q:   
+                    00:97:60:50:8f:15:23:0b:cc:b2:92:b9:82:a2:eb:
+                    84:0b:f0:58:1c:f5
+                G:   
+                    00:f7:e1:a0:85:d6:9b:3d:de:cb:bc:ab:5c:36:b8:
+                    57:b9:79:94:af:bb:fa:3a:ea:82:f9:57:4c:0b:3d:
+                    07:82:67:51:59:57:8e:ba:d4:59:4f:e6:71:07:10:
+                    81:80:b4:49:16:71:23:e8:4c:28:16:13:b7:cf:09:
+                    32:8c:c8:a6:e1:3c:16:7a:8b:54:7c:8d:28:e0:a3:
+                    ae:1e:2b:b3:a6:75:91:6e:a3:7f:0b:fa:21:35:62:
+                    f1:fb:62:7a:01:24:3b:cc:a4:f1:be:a8:51:90:89:
+                    a8:83:df:e1:5a:e5:9f:06:92:8b:66:5e:80:7b:55:
+                    25:64:01:4c:3b:fe:cf:49:2a
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                48:C6:33:68:EF:F4:D8:B6:3D:DF:94:C2:6E:C9:F6:A7:E7:F2:80:5A
+                C0:B3:BA:34:B8:23:F7:47:7A:22:DE:7B:B9:A8:57:B8:3E:BA:61:70
             X509v3 Authority Key Identifier: 
-                keyid:56:17:EF:F6:6B:8B:59:FE:23:19:68:DE:78:C0:E1:4D:67:7D:D0:66
+                keyid:75:E8:B1:5D:FD:14:00:8C:C7:5F:C7:0E:D6:02:8B:56:48:20:12:84
                 DirName:/C=DE/ST=Bayern/L=Munich/O=Home/OU=Apache WSS4J/CN=Werner
-                serial:8D:E1:2C:0A:69:11:77:D2
+                serial:11:8E:29:58:04:58:67:B0:43:BE:B3:3E:B4:34:95:F5:E6:7E:BC:8A
 
     Signature Algorithm: sha256WithRSAEncryption
-         46:22:92:73:6f:73:20:f7:af:33:39:04:18:3a:c0:79:92:7a:
-         eb:89:3f:43:94:4d:fb:c1:f7:b7:7a:a6:9d:07:85:4b:d1:d5:
-         54:de:c2:6d:bc:72:7c:77:a5:d1:9c:93:60:5d:06:be:9d:0d:
-         6c:4c:5a:74:46:cf:ca:e7:fb:dc:fa:f0:23:53:81:5c:5f:3f:
-         00:33:4d:3e:37:2b:97:6c:1a:52:52:79:6a:ff:51:27:20:8a:
-         de:e5:f5:09:c1:01:35:26:6e:04:a4:88:0e:f5:b2:f6:16:d6:
-         6d:5b:50:e2:8b:55:f9:ae:9a:eb:f0:49:44:c2:67:10:ff:30:
-         42:5f
+         8d:90:a4:f4:a8:c9:6b:81:89:ff:86:eb:45:2f:88:65:b2:cc:
+         ba:2f:5c:68:05:ce:c7:eb:cd:5b:b9:e1:ad:b0:91:5b:cd:3d:
+         89:0c:b7:1f:41:18:55:24:e4:00:41:83:db:67:ba:a2:4b:80:
+         14:00:11:6b:b0:74:c3:e4:52:10:a5:02:7f:dd:c3:fa:8a:ad:
+         23:f0:cf:9e:a7:51:02:53:5a:28:ba:c4:2b:88:b5:0e:a7:6f:
+         3e:cc:dc:50:9c:fb:a4:a6:eb:a5:bc:aa:94:14:20:a1:a2:82:
+         c9:d4:86:0e:44:ed:f9:cd:c8:a1:f1:db:4a:7b:5e:69:06:02:
+         bd:9a:73:0f:5f:0b:6e:5e:e5:65:e7:ba:71:cb:81:fd:56:ba:
+         81:93:9c:3a:f5:cb:bd:4d:04:ef:6d:b3:a5:ea:00:bb:32:d7:
+         83:0b:a7:6f:80:04:c4:25:22:82:fc:36:2e:85:97:c1:80:8c:
+         7d:dc:00:c6:dc:fe:06:76:46:48:cd:23:3c:69:01:4e:02:b8:
+         25:cf:db:f6:b4:67:21:72:59:eb:ba:3c:88:16:4f:cd:7c:83:
+         74:1b:28:ff:a8:45:9d:01:0d:92:4c:f8:80:07:4f:da:f3:f2:
+         af:bd:56:a1:33:70:51:ea:4e:a2:4e:a7:c1:43:a5:7f:7a:5b:
+         90:f9:97:a3
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
 -----END CERTIFICATE-----

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.crt
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.crt?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
Binary files webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.crt (original) and webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.crt Thu Apr 25 10:14:34 2019 differ

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.jks
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.jks?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
Binary files webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.jks (original) and webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.jks Thu Apr 25 10:14:34 2019 differ

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.pem?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.pem (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CA.pem Thu Apr 25 10:14:34 2019
@@ -1,19 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIDFjCCAn+gAwIBAgIJAI3hLAppEXfSMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNV
-BAYTAkRFMQ8wDQYDVQQIEwZCYXllcm4xDzANBgNVBAcTBk11bmljaDENMAsGA1UE
-ChMESG9tZTEVMBMGA1UECxMMQXBhY2hlIFdTUzRKMQ8wDQYDVQQDEwZXZXJuZXIw
-HhcNMDkwNDI0MTAzMjQ2WhcNMTkwNDIyMTAzMjQ2WjBmMQswCQYDVQQGEwJERTEP
-MA0GA1UECBMGQmF5ZXJuMQ8wDQYDVQQHEwZNdW5pY2gxDTALBgNVBAoTBEhvbWUx
-FTATBgNVBAsTDEFwYWNoZSBXU1M0SjEPMA0GA1UEAxMGV2VybmVyMIGfMA0GCSqG
-SIb3DQEBAQUAA4GNADCBiQKBgQDWyYLtAg1XlEGC5dCc4SP1Rg4SbEVLWvXBIZrA
-IG1MqDpjDFM7WlOdMudqmVFn6+z+PMPfuQdTET7+udhDty4ukhycuAkiv80lie+6
-tbfWddR9i3gZt0YMTq2PvXOpKiBAjD7umjbzbGnSbXAWKAYLQO5Nzcjc9eYVWxNu
-rUqJvwIDAQABo4HLMIHIMB0GA1UdDgQWBBRWF+/2a4tZ/iMZaN54wOFNZ33QZjCB
-mAYDVR0jBIGQMIGNgBRWF+/2a4tZ/iMZaN54wOFNZ33QZqFqpGgwZjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEPMA0GA1UEBxMGTXVuaWNoMQ0wCwYDVQQK
-EwRIb21lMRUwEwYDVQQLEwxBcGFjaGUgV1NTNEoxDzANBgNVBAMTBldlcm5lcoIJ
-AI3hLAppEXfSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAYTuCjZSS
-cbxzaWtItIL0Szh410aAisfB12MDWTGvxOL6YdqXtlwpA/miTK67KaEBnsb7PwnU
-GClKvGIoFYAtvgAyKclzsl4dl4pA8P2a4ofSKsdVKLyIIS7Vqgj0fmlc6lYJlhXI
-xUHz4tR1T97/ZU1uAr5KwXiEA7SYQzZkHZg=
+MIIEMTCCAxmgAwIBAgIUEY4pWARYZ7BDvrM+tDSV9eZ+vIowDQYJKoZIhvcNAQEL
+BQAwZjELMAkGA1UEBhMCREUxDzANBgNVBAgMBkJheWVybjEPMA0GA1UEBwwGTXVu
+aWNoMQ0wCwYDVQQKDARIb21lMRUwEwYDVQQLDAxBcGFjaGUgV1NTNEoxDzANBgNV
+BAMMBldlcm5lcjAeFw0xOTA0MjMwOTI5NDdaFw0yOTA0MjAwOTI5NDdaMGYxCzAJ
+BgNVBAYTAkRFMQ8wDQYDVQQIDAZCYXllcm4xDzANBgNVBAcMBk11bmljaDENMAsG
+A1UECgwESG9tZTEVMBMGA1UECwwMQXBhY2hlIFdTUzRKMQ8wDQYDVQQDDAZXZXJu
+ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDax6gRMy69XcBF7ON
+GC3n1MbPC0iFUt14gHj8KRJf8PIq2IhCvLw4biqVRphERLryv/sMpqmxFuNXHtmO
+c/bfPq0gOoXWgoqooJbs7Kjf3oXwNJ7xX/Xi6p3/83uAiR/ZbjWH0AGaWc5XpMh7
+2mx7h+HnGQ2+MQmH+6195pPzoKNZlBtbnh/REj8dv3jIR4040A1pd3LsYTOZNkgc
+O5qWvfR9VYrI9vRuD47jHIzsyUgOq8H4ZkqHQhCuE9IUUmLDwAXOHrl0eLzp4dSB
+yFAShSlshKKTavDGrtCflEF5AToLNuw4g/EmQi6h+3R+V8YAjd7H2fgoLefUXeBA
+qqZrAgMBAAGjgdYwgdMwHQYDVR0OBBYEFHXosV39FACMx1/HDtYCi1ZIIBKEMIGj
+BgNVHSMEgZswgZiAFHXosV39FACMx1/HDtYCi1ZIIBKEoWqkaDBmMQswCQYDVQQG
+EwJERTEPMA0GA1UECAwGQmF5ZXJuMQ8wDQYDVQQHDAZNdW5pY2gxDTALBgNVBAoM
+BEhvbWUxFTATBgNVBAsMDEFwYWNoZSBXU1M0SjEPMA0GA1UEAwwGV2VybmVyghQR
+jilYBFhnsEO+sz60NJX15n68ijAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
+A4IBAQB7vXRA04/ZIatp/FWwu5YISuCwAvDPVGPB6s8UGCBlTkPts+hrzqQsu9zs
+H1N2TBKa1EWDfX387h5p5QZEVC9fygBdFeH2TNRIRA34+5Z0Z9iThOxar2s54CpA
+Ttxb/PnLOyEa3k11aifsC3cDBMFs5Po4dbG9m8346BaCMRT2qq4v8sj0E69E6Reb
+4zm4W3weO5jG8hmhv99ORC5/ncX/FMR8Y2ZD/U3xeoG4fpo4j70GnPtJLpqsfV9O
+XrtEthEOY5lXLBqg1RFQ9yT3+K1ZLTvimBY2tSMFoTPlxFHuJF9XsCXWm+NyNE85
+OF/zYDG5vGsArVMb9bg8nhO1I4Wj
 -----END CERTIFICATE-----

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CAKey.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CAKey.pem?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CAKey.pem (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40CAKey.pem Thu Apr 25 10:14:34 2019
@@ -1,18 +1,30 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,C6C14348CDE07279
-
-eBKIFCXiTtpJmC9b2ezRtuLjFSf7DA75vCVwphunhAXqnptHhrb8ZsAnc0L2OUZn
-vRFyXt8SpcK08SC6vrmQlL2Tgx9HvLma9EaYWotFqm2/Bg06tYCZJ5TKEeMgzQad
-UPF6U7quhPZrSLguam5d4BFuTlIdiGZyE/Fbu/FKZr5eUPK6ou7cjYkHuj4C9z5y
-UkPjXPu0cN3YfM19IBW8hDaqBIjuLP6D9mduQtrbKiIgNkh2E/CRAyq5mvIdGHuJ
-PU9GyHAC4ibZq4dR7cLgiBkHGpuP2W9c/xY1/lG/bOFfDp3AgFQmG6zcTRwn+dXm
-aUdAqxy/u0avBRWBsFJoSZ7y8q8U9yx6LkXvgLhTj+TxpDZSRLpIv5pReKj6ti+U
-7BtvZOpn3zrG3IszhMLb7Yxee0Whpm5UY6b/m5tr8qmZEo72W10EZvDY9JyHZ49M
-yHv8+Q5T0H9WRXeEV/F0ueiWR9QWjXUc8ZYP3EUDVna8VN5VPl8yF5nUJP0bXsvu
-gaH1/5T5a4NBUP3JRSrACk7+36RV8Oa1B6Qp38xWVXT81x6gebBi4mJArfaSoupv
-tkpeSSyyChK2+EFuXSPx2HQ2Y15gfPJLYNf4iEKpHnggN46zQ2jnh/9tKhj8nG3Y
-uq1DlfldY9x8oO7whcQR/zVgeI51/RqQ2wyKW5EafrFEj7EfTnAunpickO5Gjz12
-nXmfT+kxkYH5ZwB/IcOAbz5RNbewbstqV3RCEJr26Dz2dk6OvS8QYdcoHR4L0xiK
-TzzPqy4PbV3KIyvyd2cdyOvRuVWvrkPsjf4P2JyH9JatKnMFUsGS0A==
------END RSA PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIh/z1bu+89PkCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKBJxpPt6vieBIIEyKXJsPXrVlS9
+JSV1UGu8InaNHLv1C/MpaBpdr+ZHC6p8e6CRXjOrEmOkjr8pGiL2sA59RjygYR9V
+kRObYtq9dLLQ9BkQifx8w8nSONNqfZVuVR/HEhM0aAT9bygdeaC6YQwZcsKjYvUC
+puaDCXAXni4lEm5+a94T//O6ZlNHFrEIH/5Qqr6Gysdd+pIx76/2Gyr9TkWtomSj
+Wqx/I2lgbyZS6lOvTFWzrWaISj6TAoMSecAo5O8HB6CeLRhOXvzWkZ5Td5yZg7q1
+WuiLMUT8PyF3XSTXJUJCwkuDKRBJBH+UTzpkfNINmhsSf13hYNddBjrWAQUajzFU
+L835j2E3yLBpVmM0sE415+MUnmqRcH6B7vystrFmRiqSPAh2Xc1sZEgU52ToaXUN
+APNp9WFJZ7OMv/rnjQhNrXKt4S3+o9keHr3FCrnY7vw2b2b4RlfyvM4q3RHC4Sa3
+rahavfUhmZEtgu1DBGEV3GjHst0v7jH3vMdlaET9QhTCXPmP7OsPQNyCGpwjgVX1
+qRPNizGnhAWP4ZglUEatCPK1bxYCR/MZ+Xrw9qn8TFyOmxIDpnxkeKo5H6igUk7P
+nhzuqDipvOEYzV8uQBiC6tf8PtC13bz6vTh7VyY7X1LsoaKxNvC0q3RmpkXgsn2R
+q0OQR4UReBGAGirlQNRUoqnendThb9aPEhZjkKOH5T6UA7hszB9e2JnRv/E3wHFo
+tW5b7//Pbgr2hO4cv4P9dDe901f+lx7rBbG1sMV2/uKp7dJ79E+O+WK8+oShZWvd
+Gi/Hnzq1A9p9yZCAo9v/7BfHZMbM7b1xF5j2aGBoHYw7tQ3qiHBlwN0D9mK3Z8gg
+Oalghz9noUk4FeU5LLSV+siY4Khm0G6JygZqWyRg6X8RLd8p8JFWCG9R023ds+HB
+Q8W+a57o6nJVqALOaebPLZDMx5H9XbVlRj0fApdUNWcYhgXQLhCqjc2T7YRf/GqL
+SeY9sQG9jKMON93ZEPVE76WV4WGXWi4CySTH+wMa+Zz7+v8IyTcd1XAZ958di5dL
+I0D4m/zA3OikHZXgxBDt5O1POwe0vtR3yNvBoMrfEPrrBsgZ8GX7UT+IUSZnx92g
+OTUNlyR6F9jVUkjSTym/Uc7h0iimqJyA7Pmbv4rGrZtTicIKc+EDjsA/D6i/PYJD
+Et7YSr5wrtRkggGGkT2p7RQP1AgfjmpcgfnMaCEVG19FKoD5HZMbbf4T+1W4ghxs
+XNNHLzrMo4Rtdc57T5TCBDoP5RBGQhKj+Kh6JhZIQNZoswHpR7oQZY3Sm8n6cw10
+e5HEt0Zdp1TsEq0TGHdALQFRXLsWU63nn5rE7HoNde+smmZj6wIa0QcDcfDmkNO3
+N0hh/ws5D3ZjbSzWUT7WYDipHmvqTJkGr6CZBsgq6Z9/PU5i7DqLulK5LgCBjw/N
+j8SsTRtserCibQIsraiBP6FVIUwwLu+O2dDo4+jxymlqJYY6FxJX0d9m92AHlQw3
+iRIWvIpZcO0r/o5eef3KJPOwPy+VofBLq7IfgNczcj0tkeMdXJwUv5EO/EYT++HL
+myvERAHYWT3FmaKKLEFLkfCxNXlBcqiRQLnDPsiY1M0mEp6oK6hzxAc3omRbcCZQ
+iLWn9wnMi7yHDCrHXslK8Q==
+-----END ENCRYPTED PRIVATE KEY-----

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.cer
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.cer?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.cer (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.cer Thu Apr 25 10:14:34 2019
@@ -1,15 +1,18 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIC2DCCAcACAQAwYzELMAkGA1UEBhMCSUUxETAPBgNVBAgTCExlaW5zdGVyMQ8wDQYDVQQHEwZE
-dWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwGA1UECxMFV1NTNEoxDzANBgNVBAMTBlNlcnZlcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLtQqOhfqioCSQINQh6aYoW8x2XKpil3Ebg
-NNu04QSsKX8C+kqAlxk94tK83uljv2DJkoJMSkl3Ye4LPXbekG+Vp68aWPbisjX1YFx9FEKuj73L
-cn9tUQF6yTXdkeZDL+x9fly41hwX8gxCuRnc9rWqEH6dCk/yQnNYktvruy1Um65XXAU4SeBJ4Zxp
-4VpMynQd28AyhFxs1iVfqpsBXy08xHWE5QVO5r13Zl7/AbcvRpIJFxJBA0Kdpc+5n45/oDLxncgc
-qXskWXdCzJBVD6qcwYi3byHAbPPToYnYZ23fHHTQRyniCqqDzJ9mJlctmOylVBN+oWXzDHD/UTrK
-1/8CAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0OBBYEFFT1okwi5ZtDsDVk8K50U1Bd6nCJ
-MA0GCSqGSIb3DQEBCwUAA4IBAQA1RIAMErZH1vqlcDAIMWbmSTJ9y4rLt42RFg/n/Wmfm7IPlJ0I
-TY2fgAuXjPIEPhYpcK8HnGm8lcChyhEE9iXKu2vWHW3lbVXUsX8Ai2/1rEmXwFbuURj1nftIxHaT
-fVsGwSpgVzO3UBnAHkKDFD17L1Gm9EbmG2TTOCS2CX2NuLf6VSMxmyNYFuEeRv26SAddYROUBOq3
-NxFIgU6VnOi/UVBkhBJ16aMCsnoYuwsfCyKk6xxGIwTKNLyDg1YI47fOUZD4NPftmyXxXXc+G3uK
-V1JaSHIReZsi8QPVkOg1oHqfbvnyQDQjSiTfCTgFDaGohYlSq9fj1yI9KG5BssV3
+MIIC2DCCAcACAQAwYzELMAkGA1UEBhMCSUUxETAPBgNVBAgTCExlaW5zdGVyMQ8w
+DQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwGA1UECxMFV1NTNEox
+DzANBgNVBAMTBlNlcnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AIgZq5epVGRp41zm1XXUSHl1pbLUOgG7CiQdW3cpLJwTT+gfhH6Dwu3gY/ePoJOf
+apxK0A/K48nYPyJwaAuTiSEBW4c9bC1J0xS14OxdEfECiZ+fBrWybl1by40X67Xd
+JykRlvcfFKijbOnKLxGLpkKmSaD0d9s1KioY15UrQqQCBNlideHkG019XjqLfTjq
+AuZtsGKeNKxrLGP88ObyqfT2me8IQA6/jQxiQBnlfsymAqdEdHCPDFCRkIPWUyvy
+Ge+k/9JAlccOMeCbWiPE3MMEzGUjZoCXyLOK1m2UP6x2buXndPlJpttBUkTLUM1N
+ARGw3EKnJcjvwIV7E78HaBUCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0O
+BBYEFOS7E7Cw0m+18ZWgn34zQRzOZ/tQMA0GCSqGSIb3DQEBCwUAA4IBAQBOA93u
+vGBctu64BpVH4zdWyedhZ5n/+LgwMWk32KhC7aospAdoUe1oochAAY/3x0GT3aYq
+qRYCkazT1kTwWUbYbCybFS5Q/iHbWUsf4NIz1S368k1nC3/crt/GciNGbcSrH3My
+I/Q/jT/8GUMOUuSMVfu7GQ9NvYsYasXlqsee4LV5/oNYeFGYeBis6TOnvzxgYwWO
+qWqC8oxIURNF6nNA2+HMoyq64RCa+nd0H9lNrm5KQUMM2BK6tTYspmJgC8UC4Osk
+fWsqsgCvethK+x8FnymfPMIgseYNhpdKjq9ZU3x/ILfmpllV5VhKnZ3sfQdl0kIa
+djYHKIzbjDJTfNRD
 -----END NEW CERTIFICATE REQUEST-----

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.crt
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.crt?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
Binary files webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.crt (original) and webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.crt Thu Apr 25 10:14:34 2019 differ

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.jks
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.jks?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
Binary files webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.jks (original) and webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.jks Thu Apr 25 10:14:34 2019 differ

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.pem?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.pem (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40_server.pem Thu Apr 25 10:14:34 2019
@@ -1,35 +1,35 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 28 (0x1c)
-    Signature Algorithm: sha256WithRSAEncryption
+        Serial Number: 34 (0x22)
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=DE, ST=Bayern, L=Munich, O=Home, OU=Apache WSS4J, CN=Werner
         Validity
-            Not Before: Sep  9 14:18:08 2015 GMT
-            Not After : Sep  6 14:18:08 2025 GMT
+            Not Before: Apr 23 09:37:53 2019 GMT
+            Not After : Apr 20 09:37:53 2029 GMT
         Subject: C=IE, ST=Leinster, L=Dublin, O=Apache, OU=WSS4J, CN=Server
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
-                    00:b2:ed:42:a3:a1:7e:a8:a8:09:24:08:35:08:7a:
-                    69:8a:16:f3:1d:97:2a:98:a5:dc:46:e0:34:db:b4:
-                    e1:04:ac:29:7f:02:fa:4a:80:97:19:3d:e2:d2:bc:
-                    de:e9:63:bf:60:c9:92:82:4c:4a:49:77:61:ee:0b:
-                    3d:76:de:90:6f:95:a7:af:1a:58:f6:e2:b2:35:f5:
-                    60:5c:7d:14:42:ae:8f:bd:cb:72:7f:6d:51:01:7a:
-                    c9:35:dd:91:e6:43:2f:ec:7d:7e:5c:b8:d6:1c:17:
-                    f2:0c:42:b9:19:dc:f6:b5:aa:10:7e:9d:0a:4f:f2:
-                    42:73:58:92:db:eb:bb:2d:54:9b:ae:57:5c:05:38:
-                    49:e0:49:e1:9c:69:e1:5a:4c:ca:74:1d:db:c0:32:
-                    84:5c:6c:d6:25:5f:aa:9b:01:5f:2d:3c:c4:75:84:
-                    e5:05:4e:e6:bd:77:66:5e:ff:01:b7:2f:46:92:09:
-                    17:12:41:03:42:9d:a5:cf:b9:9f:8e:7f:a0:32:f1:
-                    9d:c8:1c:a9:7b:24:59:77:42:cc:90:55:0f:aa:9c:
-                    c1:88:b7:6f:21:c0:6c:f3:d3:a1:89:d8:67:6d:df:
-                    1c:74:d0:47:29:e2:0a:aa:83:cc:9f:66:26:57:2d:
-                    98:ec:a5:54:13:7e:a1:65:f3:0c:70:ff:51:3a:ca:
-                    d7:ff
+                    00:88:19:ab:97:a9:54:64:69:e3:5c:e6:d5:75:d4:
+                    48:79:75:a5:b2:d4:3a:01:bb:0a:24:1d:5b:77:29:
+                    2c:9c:13:4f:e8:1f:84:7e:83:c2:ed:e0:63:f7:8f:
+                    a0:93:9f:6a:9c:4a:d0:0f:ca:e3:c9:d8:3f:22:70:
+                    68:0b:93:89:21:01:5b:87:3d:6c:2d:49:d3:14:b5:
+                    e0:ec:5d:11:f1:02:89:9f:9f:06:b5:b2:6e:5d:5b:
+                    cb:8d:17:eb:b5:dd:27:29:11:96:f7:1f:14:a8:a3:
+                    6c:e9:ca:2f:11:8b:a6:42:a6:49:a0:f4:77:db:35:
+                    2a:2a:18:d7:95:2b:42:a4:02:04:d9:62:75:e1:e4:
+                    1b:4d:7d:5e:3a:8b:7d:38:ea:02:e6:6d:b0:62:9e:
+                    34:ac:6b:2c:63:fc:f0:e6:f2:a9:f4:f6:99:ef:08:
+                    40:0e:bf:8d:0c:62:40:19:e5:7e:cc:a6:02:a7:44:
+                    74:70:8f:0c:50:91:90:83:d6:53:2b:f2:19:ef:a4:
+                    ff:d2:40:95:c7:0e:31:e0:9b:5a:23:c4:dc:c3:04:
+                    cc:65:23:66:80:97:c8:b3:8a:d6:6d:94:3f:ac:76:
+                    6e:e5:e7:74:f9:49:a6:db:41:52:44:cb:50:cd:4d:
+                    01:11:b0:dc:42:a7:25:c8:ef:c0:85:7b:13:bf:07:
+                    68:15
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -37,40 +37,50 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                54:F5:A2:4C:22:E5:9B:43:B0:35:64:F0:AE:74:53:50:5D:EA:70:89
+                E4:BB:13:B0:B0:D2:6F:B5:F1:95:A0:9F:7E:33:41:1C:CE:67:FB:50
             X509v3 Authority Key Identifier: 
-                keyid:56:17:EF:F6:6B:8B:59:FE:23:19:68:DE:78:C0:E1:4D:67:7D:D0:66
+                keyid:75:E8:B1:5D:FD:14:00:8C:C7:5F:C7:0E:D6:02:8B:56:48:20:12:84
                 DirName:/C=DE/ST=Bayern/L=Munich/O=Home/OU=Apache WSS4J/CN=Werner
-                serial:8D:E1:2C:0A:69:11:77:D2
+                serial:11:8E:29:58:04:58:67:B0:43:BE:B3:3E:B4:34:95:F5:E6:7E:BC:8A
 
     Signature Algorithm: sha256WithRSAEncryption
-         51:1b:94:26:18:04:55:5f:f6:16:d0:55:e2:fa:59:c7:61:83:
-         96:2e:b2:6e:91:51:31:dc:ec:86:cd:ad:0c:19:d8:62:6b:ed:
-         01:6d:de:1b:79:66:6f:a6:0d:52:a7:19:f8:68:b7:c8:9f:df:
-         3f:84:51:26:11:46:10:90:94:38:0c:ba:9a:3d:db:39:35:34:
-         d0:b2:4d:ef:66:93:4c:62:d1:e4:7f:3c:6b:46:fb:6b:ce:a7:
-         8d:e7:22:58:6c:62:c9:d7:ee:ca:78:0b:fc:d2:f3:d3:56:9f:
-         1d:87:bd:b8:d0:bd:c5:3d:d9:8e:3c:a4:85:71:ee:c7:4c:7d:
-         66:3f
+         6f:86:64:ff:6f:0e:89:6c:b4:f7:c3:e8:6f:59:0d:67:2e:91:
+         08:49:df:1b:56:c6:19:cf:49:ad:dd:7e:2b:ab:5d:b9:80:6e:
+         1b:5f:fa:49:86:4a:7e:87:e1:49:65:d4:ea:42:25:76:9f:9a:
+         02:2a:7b:0e:a8:c3:a0:19:d5:2a:eb:72:64:4a:de:14:1f:46:
+         de:09:78:e2:69:59:1a:57:4f:3e:28:3f:c4:8d:ff:c9:a6:4c:
+         19:c9:5e:80:91:d3:5b:0a:cc:8f:78:c0:4e:66:5c:03:75:b8:
+         b9:38:74:0b:e9:6e:3a:ec:ce:f6:03:b5:25:21:4e:a9:af:fc:
+         fa:47:93:d3:3e:cb:83:ec:d1:30:dd:09:ac:33:e6:96:f6:e1:
+         63:ac:3a:68:55:34:c7:97:9d:4b:79:5e:66:ef:e4:60:fe:56:
+         5e:99:5a:50:35:d5:11:6e:ec:ec:57:6b:75:94:59:4c:06:6a:
+         5e:34:26:6b:8a:54:a3:0f:55:41:ad:9a:6d:79:c4:a4:76:b9:
+         da:33:8f:8a:da:df:15:64:7f:1d:b5:ce:37:62:e1:86:50:ff:
+         c4:70:35:58:61:75:d7:e5:54:c8:e3:e9:d0:dd:d3:b6:d8:31:
+         d0:a6:2f:1a:ad:9b:30:fa:f6:21:b1:03:eb:89:41:21:1a:88:
+         ea:01:05:1c
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
 -----END CERTIFICATE-----

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java Thu Apr 25 10:14:34 2019
@@ -51,7 +51,7 @@ import java.util.Properties;
  *
  * Generate the CA keys/certs + export the CA cert to a keystore
  *
- * openssl req -x509 -newkey rsa:1024 -keyout wss40CAKey.pem -out wss40CA.pem
+ * openssl req -x509 -newkey rsa:2048 -keyout wss40CAKey.pem -out wss40CA.pem
  * -config ca.config -days 3650
  * openssl x509 -outform DER -in wss40CA.pem -out wss40CA.crt
  * keytool -import -file wss40CA.crt -alias wss40CA -keystore wss40CA.jks

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java?rev=1858106&r1=1858105&r2=1858106&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java Thu Apr 25 10:14:34 2019
@@ -78,8 +78,8 @@ public class AssertionSigningTest extend
         KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
         ClassLoader loader = Loader.getClassLoader(AssertionSigningTest.class);
         InputStream input = Merlin.loadInputStream(loader,
-                "keys/client_keystore.jks");
-        keyStore.load(input, "password".toCharArray());
+                "keys/wss40.jks");
+        keyStore.load(input, "security".toCharArray());
         input.close();
         ((Merlin) issuerCrypto).setKeyStore(keyStore);
 
@@ -104,7 +104,7 @@ public class AssertionSigningTest extend
         SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
         SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
 
-        samlAssertion.signAssertion("client_certchain", "password", issuerCrypto,
+        samlAssertion.signAssertion("wss40", "security", issuerCrypto,
                 false);
         Signature signature = samlAssertion.getSaml2().getSignature();
         Assert.assertTrue(signature.getSignatureAlgorithm().equalsIgnoreCase(
@@ -117,7 +117,7 @@ public class AssertionSigningTest extend
         // Verify Signature
         SAMLKeyInfo keyInfo = new SAMLKeyInfo();
         CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
-        cryptoType.setAlias("client_certchain");
+        cryptoType.setAlias("wss40");
         keyInfo.setCerts(issuerCrypto.getX509Certificates(cryptoType));
 
         Document doc = dbf.newDocumentBuilder().newDocument();
@@ -145,7 +145,7 @@ public class AssertionSigningTest extend
         SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
         SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback);
 
-        samlAssertion.signAssertion("client_certchain", "password", issuerCrypto,
+        samlAssertion.signAssertion("wss40", "security", issuerCrypto,
                 false, customCanonicalizationAlgorithm,
                 customSignatureAlgorithm, customSignatureDigestAlgorithm);
         Signature signature = samlAssertion.getSaml2().getSignature();
@@ -164,7 +164,7 @@ public class AssertionSigningTest extend
         // Verify Signature
         SAMLKeyInfo keyInfo = new SAMLKeyInfo();
         CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
-        cryptoType.setAlias("client_certchain");
+        cryptoType.setAlias("wss40");
         keyInfo.setCerts(issuerCrypto.getX509Certificates(cryptoType));
 
         samlAssertion = new SamlAssertionWrapper(assertionElement);



Mime
View raw message