ws-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=1858107&view=rev
Log:
WSS-647 - Fixing more tests

Added:
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/24.pem
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/25.pem
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/26.pem
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/27.pem
Removed:
    webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/resources/wss40.jks
    webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/resources/wss40CA.jks
    webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/resources/wss40CACRL.pem
    webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/resources/wss40rev.jks
Modified:
    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.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/wss40CADupl.jks
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40exp.cer
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40exp.crt
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40exp.jks
    webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40exp.pem
    webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java
    webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java
    webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java
    webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureIssuerCertConstaintsTest.java

Modified: 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=1858107&r1=1858106&r2=1858107&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/README.txt (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/README.txt Thu Apr 25 10:15:10 2019
@@ -58,3 +58,22 @@ keytool -import -file wss40CA.crt -alias
 keytool -import -file rsa1024.crt -alias wss40 -keystore rsa1024.jks
 
 =====
+
+WSS40CADupl:
+
+cp wss40CA.jks wss40CADupl.jks
+keytool -genkey -validity 3650 -alias wss40dupl -keyalg RSA -keystore wss40CADupl.jks -dname "CN=Werner, OU=Apache WSS4J, O=Home, L=Munich, ST=Bayern, C=DE"
+
+=====
+
+wss40exp:
+
+keytool -genkey -validity 1 -alias wss40exp -keyalg RSA -keystore wss40exp.jks -dname "CN=Colm,OU=WSS4J,O=Apache,L=Dublin,ST=Leinster,C=IE"
+keytool -certreq -alias wss40exp -keystore wss40exp.jks -file wss40exp.cer
+openssl ca -config ca.config -policy policy_anything -days 1 -out wss40exp.pem -infiles wss40exp.cer
+openssl x509 -outform DER -in wss40exp.pem -out wss40exp.crt
+keytool -import -file wss40CA.crt -alias wss40CA -keystore wss40exp.jks
+keytool -import -file wss40exp.crt -alias wss40exp -keystore wss40exp.jks
+
+=====
+

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/24.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/24.pem?rev=1858107&view=auto
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/24.pem (added)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/24.pem Thu Apr 25 10:15:10 2019
@@ -0,0 +1,86 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 36 (0x24)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=DE, ST=Bayern, L=Munich, O=Home, OU=Apache WSS4J, CN=Werner
+        Validity
+            Not Before: Apr 23 16:58:31 2019 GMT
+            Not After : Apr 20 16:58:31 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:9b:c6:38:8a:e2:f7:f5:3b:47:e0:25:14:34:78:
+                    6b:59:8d:88:7c:1e:3a:df:f2:30:1a:b2:95:a0:aa:
+                    07:8e:6e:0f:ea:76:f2:08:2b:91:83:2f:cb:b4:1b:
+                    69:82:ce:7d:d2:89:43:6d:12:be:58:fd:af:d8:c1:
+                    2d:f5:a9:83:f7:dd:b4:0a:25:c0:5d:70:05:60:26:
+                    e2:73:7e:e5:d9:a6:a4:fe:d4:56:9f:dd:cb:d0:26:
+                    a3:00:b7:2a:14:50:f2:4f:da:4b:e9:39:29:67:42:
+                    f6:d8:18:f9:21:60:09:fb:76:2e:2c:2d:76:b0:cf:
+                    85:69:a8:12:e0:c3:bc:92:d5:8f:c5:b6:47:f9:2c:
+                    be:dc:f9:e6:7d:02:9f:33:53:47:c3:64:d5:23:eb:
+                    87:25:89:2f:c6:e2:78:60:6b:6d:6c:d9:c6:d7:c1:
+                    c4:0a:07:da:2c:8b:f2:bc:96:be:2b:09:71:58:f2:
+                    35:f1:a8:8b:91:1a:5f:84:c3:c4:ff:57:82:a2:cf:
+                    79:5c:15:66:f9:7e:1f:54:b5:40:72:29:38:f1:17:
+                    b0:d3:cc:95:94:d2:11:9b:81:c4:6e:c8:b1:8b:19:
+                    a0:82:7b:eb:4d:01:94:3a:2a:08:25:2c:94:a4:4f:
+                    a9:ec:70:30:fa:a9:29:e7:27:af:33:7f:04:25:d1:
+                    30:77
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                DD:63:64:36:08:C5:2E:46:5E:86:87:19:0B:EB:29:2C:6F:25:7E:6B
+            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
+         5b:ed:7d:7d:64:4a:88:63:1b:b6:ca:b1:7b:0e:64:3e:41:7b:
+         f0:95:19:67:5d:b8:9f:50:78:19:ef:66:b6:02:79:d2:be:3b:
+         8b:3b:56:28:3d:ab:53:14:64:14:81:f3:71:f4:da:81:45:3a:
+         e8:2c:2d:61:5f:dc:08:b2:1d:ae:77:db:2c:c0:66:0e:3e:d0:
+         80:da:00:8e:81:97:e8:f1:e0:5d:c4:f1:b1:99:ff:23:af:4a:
+         e2:46:dd:69:5d:ae:fb:e8:04:18:32:54:3f:29:76:48:f8:8d:
+         27:37:d6:d0:00:eb:95:83:fd:e3:d6:7d:e2:fe:ef:66:67:f4:
+         96:98:5f:dc:87:65:c0:dc:66:13:be:b6:2d:bb:09:a4:ef:d7:
+         5e:d1:4e:6c:15:a3:fd:07:59:7d:0a:45:2b:70:e7:04:15:89:
+         f6:60:df:aa:f4:10:78:0d:38:c6:10:9c:7a:3a:a5:fc:d2:a5:
+         6b:3a:74:3d:2e:17:23:39:4e:53:b0:fa:00:87:5e:51:58:35:
+         73:52:a7:27:8d:a8:eb:28:7b:ab:c5:29:fb:62:b8:42:98:58:
+         7b:95:0f:62:97:89:ff:1d:f3:73:df:00:9d:25:f0:f3:65:e9:
+         a3:6d:24:18:c4:b7:0b:39:a7:a2:3e:88:f3:2b:05:fb:15:dc:
+         74:ba:a7:95
+-----BEGIN CERTIFICATE-----
+MIIERTCCAy2gAwIBAgIBJDANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJERTEP
+MA0GA1UECAwGQmF5ZXJuMQ8wDQYDVQQHDAZNdW5pY2gxDTALBgNVBAoMBEhvbWUx
+FTATBgNVBAsMDEFwYWNoZSBXU1M0SjEPMA0GA1UEAwwGV2VybmVyMB4XDTE5MDQy
+MzE2NTgzMVoXDTI5MDQyMDE2NTgzMVowYTELMAkGA1UEBhMCSUUxETAPBgNVBAgT
+CExlaW5zdGVyMQ8wDQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwG
+A1UECxMFV1NTNEoxDTALBgNVBAMTBENvbG0wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCbxjiK4vf1O0fgJRQ0eGtZjYh8Hjrf8jAaspWgqgeObg/qdvII
+K5GDL8u0G2mCzn3SiUNtEr5Y/a/YwS31qYP33bQKJcBdcAVgJuJzfuXZpqT+1Faf
+3cvQJqMAtyoUUPJP2kvpOSlnQvbYGPkhYAn7di4sLXawz4VpqBLgw7yS1Y/Ftkf5
+LL7c+eZ9Ap8zU0fDZNUj64cliS/G4nhga21s2cbXwcQKB9osi/K8lr4rCXFY8jXx
+qIuRGl+Ew8T/V4Kiz3lcFWb5fh9UtUByKTjxF7DTzJWU0hGbgcRuyLGLGaCCe+tN
+AZQ6KgglLJSkT6nscDD6qSnnJ68zfwQl0TB3AgMBAAGjggEBMIH+MAkGA1UdEwQC
+MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+MB0GA1UdDgQWBBTdY2Q2CMUuRl6GhxkL6yksbyV+azCBowYDVR0jBIGbMIGYgBR1
+6LFd/RQAjMdfxw7WAotWSCAShKFqpGgwZjELMAkGA1UEBhMCREUxDzANBgNVBAgM
+BkJheWVybjEPMA0GA1UEBwwGTXVuaWNoMQ0wCwYDVQQKDARIb21lMRUwEwYDVQQL
+DAxBcGFjaGUgV1NTNEoxDzANBgNVBAMMBldlcm5lcoIUEY4pWARYZ7BDvrM+tDSV
+9eZ+vIowDQYJKoZIhvcNAQELBQADggEBAFvtfX1kSohjG7bKsXsOZD5Be/CVGWdd
+uJ9QeBnvZrYCedK+O4s7Vig9q1MUZBSB83H02oFFOugsLWFf3AiyHa532yzAZg4+
+0IDaAI6Bl+jx4F3E8bGZ/yOvSuJG3WldrvvoBBgyVD8pdkj4jSc31tAA65WD/ePW
+feL+72Zn9JaYX9yHZcDcZhO+ti27CaTv117RTmwVo/0HWX0KRStw5wQVifZg36r0
+EHgNOMYQnHo6pfzSpWs6dD0uFyM5TlOw+gCHXlFYNXNSpyeNqOsoe6vFKftiuEKY
+WHuVD2KXif8d83PfAJ0l8PNl6aNtJBjEtws5p6I+iPMrBfsV3HS6p5U=
+-----END CERTIFICATE-----

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/25.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/25.pem?rev=1858107&view=auto
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/25.pem (added)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/25.pem Thu Apr 25 10:15:10 2019
@@ -0,0 +1,86 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 37 (0x25)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=DE, ST=Bayern, L=Munich, O=Home, OU=Apache WSS4J, CN=Werner
+        Validity
+            Not Before: Apr 23 17:00:06 2019 GMT
+            Not After : Apr 20 17:00:06 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:8c:19:5e:36:19:59:77:33:9f:b5:ab:a4:1d:87:
+                    c0:16:80:a3:bb:b2:5c:ac:8f:e0:e8:d7:26:ff:61:
+                    30:8c:7e:89:a3:95:da:9f:41:fa:6f:c0:41:cb:60:
+                    73:0f:b4:6b:bf:24:1d:e2:af:29:19:dc:95:0d:e9:
+                    cd:3c:90:f5:14:ce:a1:9e:ae:3d:05:5b:13:82:db:
+                    5e:b0:ad:2f:97:24:46:f4:28:c8:a7:a5:0d:98:20:
+                    ad:b4:41:3a:9d:0a:bc:0a:87:f0:ee:98:cf:07:18:
+                    1b:93:32:57:1a:98:fd:12:9f:05:86:ed:85:ea:ae:
+                    ca:dc:fe:fe:71:3c:47:7e:ec:cf:9d:ce:c1:79:3c:
+                    e0:7a:ce:be:8a:09:6d:19:e4:9e:90:47:aa:d5:3b:
+                    ea:f7:22:9a:2b:35:78:33:3c:04:e0:78:6a:ad:e8:
+                    98:41:c6:10:37:c7:30:74:5c:b7:f0:1b:f2:ba:82:
+                    fa:c6:c9:32:b3:55:cd:19:a1:f6:ac:53:f5:48:52:
+                    9c:7c:16:c7:67:ef:28:0e:eb:6b:81:10:19:9a:5d:
+                    aa:d1:3b:69:f3:fb:27:ce:20:15:bc:d2:20:11:30:
+                    1a:2d:5d:2d:b5:26:98:1a:a1:59:c6:08:a3:95:84:
+                    08:b5:f3:82:c6:6c:51:40:a3:9d:29:c8:77:45:c5:
+                    91:fd
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                EF:AF:69:A3:26:8A:6F:27:9D:DB:98:1F:34:D9:0B:5E:49:F4:F8:D0
+            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
+         5e:28:fd:91:44:e8:b4:e8:b3:bb:03:8f:5a:4f:9b:b2:cd:1d:
+         a2:06:cb:fe:85:fb:1b:8c:4e:ea:5e:c1:a3:eb:08:72:cf:8d:
+         33:3f:39:ee:61:2a:f3:ae:ad:f3:d4:55:d6:a4:ab:fe:a3:0c:
+         be:02:a7:80:73:6a:26:b1:44:65:50:9f:97:96:12:e5:94:62:
+         9b:18:55:70:79:ae:ed:c0:e1:2d:e3:f9:df:84:ab:55:06:8c:
+         2b:5b:57:3e:23:bf:1e:ed:36:e3:08:b7:2f:9a:6a:53:9c:ca:
+         9c:72:51:c7:68:9f:75:f4:3c:42:a2:93:b6:58:2b:e6:2b:8e:
+         dd:ad:28:fe:81:c4:c1:8e:56:62:21:f8:5d:6b:13:10:c4:1f:
+         49:f6:b7:26:2d:bd:d9:98:92:2d:83:a9:02:15:f2:ac:57:54:
+         d5:10:f8:b6:1d:d4:6e:cb:30:e0:7a:6e:ea:76:ab:c9:66:08:
+         ab:68:24:72:a7:23:46:8a:be:b2:20:72:44:8d:03:6e:78:ca:
+         05:65:20:c5:a8:58:47:89:b4:1e:95:15:58:94:57:ab:cf:ff:
+         15:36:94:a2:a4:06:fe:7b:6e:6a:30:47:1e:bd:95:12:b3:fe:
+         0a:05:33:b7:bf:d3:34:7f:52:e5:09:80:2c:37:6b:2d:33:7c:
+         cd:be:14:f0
+-----BEGIN CERTIFICATE-----
+MIIERTCCAy2gAwIBAgIBJTANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJERTEP
+MA0GA1UECAwGQmF5ZXJuMQ8wDQYDVQQHDAZNdW5pY2gxDTALBgNVBAoMBEhvbWUx
+FTATBgNVBAsMDEFwYWNoZSBXU1M0SjEPMA0GA1UEAwwGV2VybmVyMB4XDTE5MDQy
+MzE3MDAwNloXDTI5MDQyMDE3MDAwNlowYTELMAkGA1UEBhMCSUUxETAPBgNVBAgT
+CExlaW5zdGVyMQ8wDQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwG
+A1UECxMFV1NTNEoxDTALBgNVBAMTBENvbG0wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCMGV42GVl3M5+1q6Qdh8AWgKO7slysj+Do1yb/YTCMfomjldqf
+QfpvwEHLYHMPtGu/JB3irykZ3JUN6c08kPUUzqGerj0FWxOC216wrS+XJEb0KMin
+pQ2YIK20QTqdCrwKh/DumM8HGBuTMlcamP0SnwWG7YXqrsrc/v5xPEd+7M+dzsF5
+POB6zr6KCW0Z5J6QR6rVO+r3IporNXgzPATgeGqt6JhBxhA3xzB0XLfwG/K6gvrG
+yTKzVc0ZofasU/VIUpx8Fsdn7ygO62uBEBmaXarRO2nz+yfOIBW80iARMBotXS21
+JpgaoVnGCKOVhAi184LGbFFAo50pyHdFxZH9AgMBAAGjggEBMIH+MAkGA1UdEwQC
+MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+MB0GA1UdDgQWBBTvr2mjJopvJ53bmB802QteSfT40DCBowYDVR0jBIGbMIGYgBR1
+6LFd/RQAjMdfxw7WAotWSCAShKFqpGgwZjELMAkGA1UEBhMCREUxDzANBgNVBAgM
+BkJheWVybjEPMA0GA1UEBwwGTXVuaWNoMQ0wCwYDVQQKDARIb21lMRUwEwYDVQQL
+DAxBcGFjaGUgV1NTNEoxDzANBgNVBAMMBldlcm5lcoIUEY4pWARYZ7BDvrM+tDSV
+9eZ+vIowDQYJKoZIhvcNAQELBQADggEBAF4o/ZFE6LTos7sDj1pPm7LNHaIGy/6F
++xuMTupewaPrCHLPjTM/Oe5hKvOurfPUVdakq/6jDL4Cp4BzaiaxRGVQn5eWEuWU
+YpsYVXB5ru3A4S3j+d+Eq1UGjCtbVz4jvx7tNuMIty+aalOcypxyUcdon3X0PEKi
+k7ZYK+Yrjt2tKP6BxMGOVmIh+F1rExDEH0n2tyYtvdmYki2DqQIV8qxXVNUQ+LYd
+1G7LMOB6bup2q8lmCKtoJHKnI0aKvrIgckSNA254ygVlIMWoWEeJtB6VFViUV6vP
+/xU2lKKkBv57bmowRx69lRKz/goFM7e/0zR/UuUJgCw3ay0zfM2+FPA=
+-----END CERTIFICATE-----

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/26.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/26.pem?rev=1858107&view=auto
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/26.pem (added)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/26.pem Thu Apr 25 10:15:10 2019
@@ -0,0 +1,86 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 38 (0x26)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=DE, ST=Bayern, L=Munich, O=Home, OU=Apache WSS4J, CN=Werner
+        Validity
+            Not Before: Apr 23 17:02:41 2019 GMT
+            Not After : Apr 20 17:02:41 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:8c:95:5f:c1:20:28:b6:f5:aa:0e:6f:d6:71:4c:
+                    38:d8:42:45:f8:07:09:93:a8:97:fc:21:97:4b:53:
+                    35:46:8e:29:50:b2:03:d2:0c:10:53:40:7f:b4:13:
+                    0f:e4:9b:04:c4:d7:d5:24:2c:4f:82:aa:c5:a9:7e:
+                    6e:1d:43:22:59:45:5e:22:d8:a2:48:f7:2d:de:ad:
+                    61:c7:40:9c:39:40:d7:af:6d:3d:38:2d:bb:2e:cf:
+                    aa:80:2f:15:4c:60:6c:bb:4f:ee:8a:27:50:16:eb:
+                    fd:a5:f0:09:c3:14:50:cb:e2:95:9c:83:33:a6:4c:
+                    08:31:ff:ff:26:ee:2b:67:9b:67:6f:e1:36:cd:3b:
+                    7a:17:93:01:74:ba:cb:37:94:62:7f:17:b2:98:cf:
+                    c2:b9:d9:84:2d:51:4d:0a:ab:bc:e3:26:56:40:32:
+                    73:f4:22:10:54:d5:22:df:f8:2f:3b:79:d2:ab:d4:
+                    59:ff:1a:f4:1c:67:00:8c:54:e2:14:58:57:fa:be:
+                    bb:93:15:95:7e:5a:3e:d5:92:36:7d:fa:6a:6a:0c:
+                    d3:79:8e:f6:4d:fe:3d:67:4a:46:7b:ef:79:a1:87:
+                    15:73:d9:aa:09:14:c3:4e:70:8d:14:5c:1c:2e:d1:
+                    96:97:e7:44:15:c3:ea:8d:2e:a1:5a:d0:3f:3d:24:
+                    ac:0f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                90:A6:C1:17:D0:9D:CE:E5:E5:91:4A:7C:CD:E7:4D:E9:F8:9C:78:6F
+            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
+         08:ca:26:11:1c:55:f7:d8:36:e9:80:24:79:af:5b:e7:46:f5:
+         28:e4:30:ce:eb:52:ff:2f:d9:df:ef:c1:05:a1:a3:e9:bc:f9:
+         7d:2c:c8:ff:36:a8:78:d3:ef:b5:98:be:16:fb:03:22:74:95:
+         8a:a2:95:d8:da:5c:c4:6c:c5:61:e0:f6:57:6d:f1:8f:70:93:
+         14:fa:f5:c8:cb:94:fc:21:86:20:71:f5:08:05:60:30:73:55:
+         60:2f:85:bb:a9:da:10:f9:6a:dd:09:d5:58:14:60:48:47:4b:
+         6d:bb:71:95:48:ec:a4:ae:5a:83:0d:72:01:13:3c:fc:bc:0a:
+         d7:5f:79:a9:b5:96:68:5b:9f:70:e3:67:ff:b2:f5:58:42:64:
+         50:89:8e:21:8b:0c:8f:e2:18:62:30:5c:a4:a0:d4:66:7d:3c:
+         68:99:03:87:f5:fd:0c:55:f4:b3:ea:c1:87:c9:b0:86:d7:c9:
+         06:f0:a5:6d:72:36:da:6b:59:d2:29:88:74:35:3b:f9:e7:06:
+         79:8b:dc:ec:f2:1d:38:51:ab:38:2a:c4:04:17:cf:bb:e5:d6:
+         7f:45:dd:44:69:99:76:56:6e:b5:e2:8f:46:7a:fd:b3:2a:c4:
+         f7:ed:b6:fe:73:70:11:9e:8b:86:74:92:31:eb:fc:a7:5f:4f:
+         84:0a:9f:61
+-----BEGIN CERTIFICATE-----
+MIIERTCCAy2gAwIBAgIBJjANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJERTEP
+MA0GA1UECAwGQmF5ZXJuMQ8wDQYDVQQHDAZNdW5pY2gxDTALBgNVBAoMBEhvbWUx
+FTATBgNVBAsMDEFwYWNoZSBXU1M0SjEPMA0GA1UEAwwGV2VybmVyMB4XDTE5MDQy
+MzE3MDI0MVoXDTI5MDQyMDE3MDI0MVowYTELMAkGA1UEBhMCSUUxETAPBgNVBAgT
+CExlaW5zdGVyMQ8wDQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwG
+A1UECxMFV1NTNEoxDTALBgNVBAMTBENvbG0wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCMlV/BICi29aoOb9ZxTDjYQkX4BwmTqJf8IZdLUzVGjilQsgPS
+DBBTQH+0Ew/kmwTE19UkLE+CqsWpfm4dQyJZRV4i2KJI9y3erWHHQJw5QNevbT04
+Lbsuz6qALxVMYGy7T+6KJ1AW6/2l8AnDFFDL4pWcgzOmTAgx//8m7itnm2dv4TbN
+O3oXkwF0uss3lGJ/F7KYz8K52YQtUU0Kq7zjJlZAMnP0IhBU1SLf+C87edKr1Fn/
+GvQcZwCMVOIUWFf6vruTFZV+Wj7VkjZ9+mpqDNN5jvZN/j1nSkZ773mhhxVz2aoJ
+FMNOcI0UXBwu0ZaX50QVw+qNLqFa0D89JKwPAgMBAAGjggEBMIH+MAkGA1UdEwQC
+MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+MB0GA1UdDgQWBBSQpsEX0J3O5eWRSnzN503p+Jx4bzCBowYDVR0jBIGbMIGYgBR1
+6LFd/RQAjMdfxw7WAotWSCAShKFqpGgwZjELMAkGA1UEBhMCREUxDzANBgNVBAgM
+BkJheWVybjEPMA0GA1UEBwwGTXVuaWNoMQ0wCwYDVQQKDARIb21lMRUwEwYDVQQL
+DAxBcGFjaGUgV1NTNEoxDzANBgNVBAMMBldlcm5lcoIUEY4pWARYZ7BDvrM+tDSV
+9eZ+vIowDQYJKoZIhvcNAQELBQADggEBAAjKJhEcVffYNumAJHmvW+dG9SjkMM7r
+Uv8v2d/vwQWho+m8+X0syP82qHjT77WYvhb7AyJ0lYqildjaXMRsxWHg9ldt8Y9w
+kxT69cjLlPwhhiBx9QgFYDBzVWAvhbup2hD5at0J1VgUYEhHS227cZVI7KSuWoMN
+cgETPPy8Ctdfeam1lmhbn3DjZ/+y9VhCZFCJjiGLDI/iGGIwXKSg1GZ9PGiZA4f1
+/QxV9LPqwYfJsIbXyQbwpW1yNtprWdIpiHQ1O/nnBnmL3OzyHThRqzgqxAQXz7vl
+1n9F3URpmXZWbrXij0Z6/bMqxPfttv5zcBGei4Z0kjHr/KdfT4QKn2E=
+-----END CERTIFICATE-----

Added: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/27.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/27.pem?rev=1858107&view=auto
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/27.pem (added)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/ca.db.certs/27.pem Thu Apr 25 10:15:10 2019
@@ -0,0 +1,86 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 39 (0x27)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=DE, ST=Bayern, L=Munich, O=Home, OU=Apache WSS4J, CN=Werner
+        Validity
+            Not Before: Apr 23 17:04:40 2019 GMT
+            Not After : Apr 24 17:04:40 2019 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:a3:e0:da:aa:3a:81:16:30:be:13:a2:71:b9:6c:
+                    33:c5:db:15:9d:cb:14:27:47:2c:e8:44:20:3c:27:
+                    3e:a7:cf:a4:0e:76:a8:2a:f6:db:a0:b8:80:23:3c:
+                    40:f3:c4:01:93:74:83:fc:48:c4:fa:12:78:50:b6:
+                    83:e9:6c:41:0f:14:c0:b9:d1:76:e9:0d:0e:25:2d:
+                    38:44:3f:41:c6:65:cb:03:ad:8d:14:8f:a0:93:26:
+                    28:8f:9a:7a:dd:bf:85:3a:b0:35:2b:ae:d6:05:9f:
+                    0f:ac:7e:1e:c1:17:dd:d6:0b:11:5a:72:e4:bd:c8:
+                    b5:60:e4:66:fc:59:64:f0:08:20:0c:77:00:32:2b:
+                    bc:3d:5c:c9:10:48:4f:82:af:37:42:7c:b3:a4:e0:
+                    e0:16:bb:64:09:fd:c3:0c:b6:ac:a8:76:be:32:18:
+                    55:29:aa:78:8f:89:04:20:68:95:49:43:e4:ab:62:
+                    f8:5e:b8:5b:34:84:a2:dd:86:2d:6e:83:f4:7c:00:
+                    27:01:f8:93:ab:a5:70:39:e7:6d:0e:b5:9a:75:55:
+                    97:cf:68:cc:2c:eb:c5:65:90:2c:da:98:38:c1:65:
+                    a1:3b:af:0b:f9:ac:a6:5d:10:b1:e2:9e:41:07:79:
+                    b7:a0:6a:51:4f:1c:b5:ce:f6:01:0f:43:50:29:a2:
+                    60:b9
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                FC:52:AE:28:AF:8D:3D:1B:9F:1D:DF:D5:99:8E:F6:FE:45:B4:30: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
+         01:c8:23:34:fd:29:bc:ea:d4:eb:f2:17:07:c9:71:70:32:c4:
+         0d:9e:e5:64:d3:46:38:bb:49:f0:cb:7b:6b:ba:3a:2a:f8:d1:
+         d4:9f:39:41:65:95:9a:08:ad:ad:1f:1c:08:19:7a:22:66:32:
+         37:97:8b:d0:70:55:13:ca:1d:57:b6:e9:a8:11:a6:e0:9c:84:
+         57:b8:a7:2c:62:f3:05:49:ea:42:57:89:1a:5e:bd:b3:fe:b2:
+         19:ed:05:92:cc:2b:3c:74:20:3a:41:40:9d:78:00:c0:55:dd:
+         01:3e:e2:f0:dc:37:d0:18:1f:1d:06:59:0d:24:26:61:db:66:
+         aa:e3:40:ee:fa:7e:a5:bb:55:e2:69:dc:6d:65:2f:45:dc:63:
+         67:bd:f9:1d:c8:7d:92:0a:29:7f:20:2d:9d:a9:ec:a1:b3:49:
+         eb:8c:3c:17:93:fc:2e:cc:34:9e:bc:20:00:ca:22:72:aa:48:
+         27:d0:c9:05:d4:b3:20:45:52:89:0d:29:36:f6:f2:a4:a4:51:
+         15:ca:7e:f2:c3:6a:cd:2a:4e:00:30:02:f4:b9:1c:e5:96:9f:
+         58:80:fc:73:8d:cd:ac:1d:e7:a6:ab:63:c3:2b:35:53:56:4a:
+         24:65:5e:22:3c:5e:52:c0:4d:ae:e6:da:02:45:6e:8b:8a:47:
+         32:cf:fe:6a
+-----BEGIN CERTIFICATE-----
+MIIERTCCAy2gAwIBAgIBJzANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJERTEP
+MA0GA1UECAwGQmF5ZXJuMQ8wDQYDVQQHDAZNdW5pY2gxDTALBgNVBAoMBEhvbWUx
+FTATBgNVBAsMDEFwYWNoZSBXU1M0SjEPMA0GA1UEAwwGV2VybmVyMB4XDTE5MDQy
+MzE3MDQ0MFoXDTE5MDQyNDE3MDQ0MFowYTELMAkGA1UEBhMCSUUxETAPBgNVBAgT
+CExlaW5zdGVyMQ8wDQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwG
+A1UECxMFV1NTNEoxDTALBgNVBAMTBENvbG0wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCj4NqqOoEWML4TonG5bDPF2xWdyxQnRyzoRCA8Jz6nz6QOdqgq
+9tuguIAjPEDzxAGTdIP8SMT6EnhQtoPpbEEPFMC50XbpDQ4lLThEP0HGZcsDrY0U
+j6CTJiiPmnrdv4U6sDUrrtYFnw+sfh7BF93WCxFacuS9yLVg5Gb8WWTwCCAMdwAy
+K7w9XMkQSE+CrzdCfLOk4OAWu2QJ/cMMtqyodr4yGFUpqniPiQQgaJVJQ+SrYvhe
+uFs0hKLdhi1ug/R8ACcB+JOrpXA5520OtZp1VZfPaMws68VlkCzamDjBZaE7rwv5
+rKZdELHinkEHebegalFPHLXO9gEPQ1ApomC5AgMBAAGjggEBMIH+MAkGA1UdEwQC
+MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+MB0GA1UdDgQWBBT8Uq4or409G58d39WZjvb+RbQwcDCBowYDVR0jBIGbMIGYgBR1
+6LFd/RQAjMdfxw7WAotWSCAShKFqpGgwZjELMAkGA1UEBhMCREUxDzANBgNVBAgM
+BkJheWVybjEPMA0GA1UEBwwGTXVuaWNoMQ0wCwYDVQQKDARIb21lMRUwEwYDVQQL
+DAxBcGFjaGUgV1NTNEoxDzANBgNVBAMMBldlcm5lcoIUEY4pWARYZ7BDvrM+tDSV
+9eZ+vIowDQYJKoZIhvcNAQELBQADggEBAAHIIzT9Kbzq1OvyFwfJcXAyxA2e5WTT
+Rji7SfDLe2u6Oir40dSfOUFllZoIra0fHAgZeiJmMjeXi9BwVRPKHVe26agRpuCc
+hFe4pyxi8wVJ6kJXiRpevbP+shntBZLMKzx0IDpBQJ14AMBV3QE+4vDcN9AYHx0G
+WQ0kJmHbZqrjQO76fqW7VeJp3G1lL0XcY2e9+R3IfZIKKX8gLZ2p7KGzSeuMPBeT
+/C7MNJ68IADKInKqSCfQyQXUsyBFUokNKTb28qSkURXKfvLDas0qTgAwAvS5HOWW
+n1iA/HONzawd56arY8MrNVNWSiRlXiI8XlLATa7m2gJFbouKRzLP/mo=
+-----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=1858107&r1=1858106&r2=1858107&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:15:10 2019
@@ -33,3 +33,7 @@ V	290420093040Z		20	unknown	/C=IE/ST=Lei
 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
+V	290420165831Z		24	unknown	/C=IE/ST=Leinster/L=Dublin/O=Apache/OU=WSS4J/CN=Colm
+V	290420170006Z		25	unknown	/C=IE/ST=Leinster/L=Dublin/O=Apache/OU=WSS4J/CN=Colm
+V	290420170241Z		26	unknown	/C=IE/ST=Leinster/L=Dublin/O=Apache/OU=WSS4J/CN=Colm
+V	190424170440Z		27	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=1858107&r1=1858106&r2=1858107&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=1858107&r1=1858106&r2=1858107&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:15:10 2019
@@ -1 +1 @@
-24
+28

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=1858107&r1=1858106&r2=1858107&view=diff
==============================================================================
Binary files - no diff available.

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

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40exp.cer
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40exp.cer?rev=1858107&r1=1858106&r2=1858107&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40exp.cer (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40exp.cer Thu Apr 25 10:15:10 2019
@@ -1,15 +1,18 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIC1jCCAb4CAQAwYTELMAkGA1UEBhMCSUUxETAPBgNVBAgTCExlaW5zdGVyMQ8wDQYDVQQHEwZE
-dWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwGA1UECxMFV1NTNEoxDTALBgNVBAMTBENvbG0wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCavahVtC+MjP7GdVCL+Ia0rprgZilS0mmYk2fX
-dpxdc5uti1F1gb+ZpbBbemt7ekzXnf3zIHKHEvLnLRY5qRPTNvHaX+W0FbInkY5C6/5jq0j64/db
-h1DkPczrC/hX3KjAC5V9sptnlz5dUM3Uu+tmm/sCeb+Xc2EeG7+nCgyYwBHz74ZbfLtD21oXDv/2
-NPVhUB898TMiNtLwdm/7h8YSZKpN+3tw35IlKtrJF6H9fToKa2cE+8Wr/Z9KelHLZcv9fgHYNZjW
-shOPmfA+S+7nKYHoSV3Gd4/1Ki26FMf41cNm35P7C+FMSi/WYGZbFnxo8TgmDQoQCEwToXVExL45
-AgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBQNlsa3CngS9Q9AO6n24J5jsMSrUTAN
-BgkqhkiG9w0BAQsFAAOCAQEAceqX/SXOZTnYSYX+9zQcRa1k+gW6JSZS7t81iVz63MhSbW3OvQoZ
-BYfi/ay5cbwF9Bq6Pvhz9O2DB9bKGLF6x418HlPrQXXNnCMu1aWLT1JETZRIn1zUR7sZusMiEptB
-aJrT2a8L/b8xzcEAqLpSZT6mCnqbaoHORlmpT4xUfotEpHikGUAAFGJPBR88Ht9jcqAaedKzDi2t
-zaYGDGXehDV+QPsneSLf5w+PchJUx7iHsg00SodIl/Pky/ZkEMuu623AvGh015RB0kBtupGE5FWV
-02o5r5vtwbBhIBhnJ+8L2d/uVHjlReHl0NhnTm6lDSeAmUnQpEXhmQ5rvLcEkg==
+MIIC1jCCAb4CAQAwYTELMAkGA1UEBhMCSUUxETAPBgNVBAgTCExlaW5zdGVyMQ8w
+DQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwGA1UECxMFV1NTNEox
+DTALBgNVBAMTBENvbG0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj
+4NqqOoEWML4TonG5bDPF2xWdyxQnRyzoRCA8Jz6nz6QOdqgq9tuguIAjPEDzxAGT
+dIP8SMT6EnhQtoPpbEEPFMC50XbpDQ4lLThEP0HGZcsDrY0Uj6CTJiiPmnrdv4U6
+sDUrrtYFnw+sfh7BF93WCxFacuS9yLVg5Gb8WWTwCCAMdwAyK7w9XMkQSE+CrzdC
+fLOk4OAWu2QJ/cMMtqyodr4yGFUpqniPiQQgaJVJQ+SrYvheuFs0hKLdhi1ug/R8
+ACcB+JOrpXA5520OtZp1VZfPaMws68VlkCzamDjBZaE7rwv5rKZdELHinkEHebeg
+alFPHLXO9gEPQ1ApomC5AgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQW
+BBT8Uq4or409G58d39WZjvb+RbQwcDANBgkqhkiG9w0BAQsFAAOCAQEABh7jPaOe
+rxW9BFmq+3LQkMa0yLdFBzkhO8QgkHtWOWOnQj1CBqkzQ5BRFppcusPK6adOpxxU
+NoXhLMKL5JGXoaF053FJNuVpzDHmqEfqGWnVfE0MqTAIBJzCL0/siZn2rjm75Cs9
+PYqzf4xGUtP/do5o2ImyUL33/5+uqy8QHAYf7QsWQktVVBAEWfUX6pD3s5/xCddk
+oJhWK8PBeXP6HjCECLT9r81pPlvc0rhwqEccg90zvmEOhw+aUYE9X01d/cG5w/t7
+tX9epcz79y1oV2My8Lv8ze5bURQLA1ks+FCDLXdtChZDG/cNFeJJLPz1/bGtuHpd
+6ZNQAhm8NyMxCg==
 -----END NEW CERTIFICATE REQUEST-----

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

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

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40exp.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40exp.pem?rev=1858107&r1=1858106&r2=1858107&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40exp.pem (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40exp.pem Thu Apr 25 10:15:10 2019
@@ -1,35 +1,35 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 31 (0x1f)
-    Signature Algorithm: sha256WithRSAEncryption
+        Serial Number: 39 (0x27)
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=DE, ST=Bayern, L=Munich, O=Home, OU=Apache WSS4J, CN=Werner
         Validity
-            Not Before: Sep 10 15:48:18 2015 GMT
-            Not After : Sep 11 15:48:18 2015 GMT
+            Not Before: Apr 23 17:04:40 2019 GMT
+            Not After : Apr 24 17:04:40 2019 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)
+                RSA Public-Key: (2048 bit)
                 Modulus:
-                    00:9a:bd:a8:55:b4:2f:8c:8c:fe:c6:75:50:8b:f8:
-                    86:b4:ae:9a:e0:66:29:52:d2:69:98:93:67:d7:76:
-                    9c:5d:73:9b:ad:8b:51:75:81:bf:99:a5:b0:5b:7a:
-                    6b:7b:7a:4c:d7:9d:fd:f3:20:72:87:12:f2:e7:2d:
-                    16:39:a9:13:d3:36:f1:da:5f:e5:b4:15:b2:27:91:
-                    8e:42:eb:fe:63:ab:48:fa:e3:f7:5b:87:50:e4:3d:
-                    cc:eb:0b:f8:57:dc:a8:c0:0b:95:7d:b2:9b:67:97:
-                    3e:5d:50:cd:d4:bb:eb:66:9b:fb:02:79:bf:97:73:
-                    61:1e:1b:bf:a7:0a:0c:98:c0:11:f3:ef:86:5b:7c:
-                    bb:43:db:5a:17:0e:ff:f6:34:f5:61:50:1f:3d:f1:
-                    33:22:36:d2:f0:76:6f:fb:87:c6:12:64:aa:4d:fb:
-                    7b:70:df:92:25:2a:da:c9:17:a1:fd:7d:3a:0a:6b:
-                    67:04:fb:c5:ab:fd:9f:4a:7a:51:cb:65:cb:fd:7e:
-                    01:d8:35:98:d6:b2:13:8f:99:f0:3e:4b:ee:e7:29:
-                    81:e8:49:5d:c6:77:8f:f5:2a:2d:ba:14:c7:f8:d5:
-                    c3:66:df:93:fb:0b:e1:4c:4a:2f:d6:60:66:5b:16:
-                    7c:68:f1:38:26:0d:0a:10:08:4c:13:a1:75:44:c4:
-                    be:39
+                    00:a3:e0:da:aa:3a:81:16:30:be:13:a2:71:b9:6c:
+                    33:c5:db:15:9d:cb:14:27:47:2c:e8:44:20:3c:27:
+                    3e:a7:cf:a4:0e:76:a8:2a:f6:db:a0:b8:80:23:3c:
+                    40:f3:c4:01:93:74:83:fc:48:c4:fa:12:78:50:b6:
+                    83:e9:6c:41:0f:14:c0:b9:d1:76:e9:0d:0e:25:2d:
+                    38:44:3f:41:c6:65:cb:03:ad:8d:14:8f:a0:93:26:
+                    28:8f:9a:7a:dd:bf:85:3a:b0:35:2b:ae:d6:05:9f:
+                    0f:ac:7e:1e:c1:17:dd:d6:0b:11:5a:72:e4:bd:c8:
+                    b5:60:e4:66:fc:59:64:f0:08:20:0c:77:00:32:2b:
+                    bc:3d:5c:c9:10:48:4f:82:af:37:42:7c:b3:a4:e0:
+                    e0:16:bb:64:09:fd:c3:0c:b6:ac:a8:76:be:32:18:
+                    55:29:aa:78:8f:89:04:20:68:95:49:43:e4:ab:62:
+                    f8:5e:b8:5b:34:84:a2:dd:86:2d:6e:83:f4:7c:00:
+                    27:01:f8:93:ab:a5:70:39:e7:6d:0e:b5:9a:75:55:
+                    97:cf:68:cc:2c:eb:c5:65:90:2c:da:98:38:c1:65:
+                    a1:3b:af:0b:f9:ac:a6:5d:10:b1:e2:9e:41:07:79:
+                    b7:a0:6a:51:4f:1c:b5:ce:f6:01:0f:43:50:29:a2:
+                    60:b9
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -37,40 +37,50 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                0D:96:C6:B7:0A:78:12:F5:0F:40:3B:A9:F6:E0:9E:63:B0:C4:AB:51
+                FC:52:AE:28:AF:8D:3D:1B:9F:1D:DF:D5:99:8E:F6:FE:45:B4:30: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
-         1c:f6:ad:ca:04:ab:26:df:89:28:fa:c5:fd:0f:d3:af:85:94:
-         c0:2a:76:2d:ac:45:94:57:6c:4f:4f:cd:b3:e8:fa:0b:b8:96:
-         67:33:b4:ad:da:9b:70:93:21:33:54:88:c2:6d:6e:87:3a:7e:
-         e1:d7:15:0f:0d:04:f6:1c:af:60:07:c2:c1:4e:f7:dd:95:8c:
-         ea:41:85:1b:52:5b:90:78:82:c1:3f:ef:a1:14:5d:f5:f3:21:
-         d3:8f:3a:1e:12:43:9b:0a:ad:92:ef:92:2f:34:25:5e:4a:8f:
-         a3:1f:22:a5:4c:02:81:ab:82:4a:e1:69:5e:b8:96:43:05:1b:
-         60:b3
+         01:c8:23:34:fd:29:bc:ea:d4:eb:f2:17:07:c9:71:70:32:c4:
+         0d:9e:e5:64:d3:46:38:bb:49:f0:cb:7b:6b:ba:3a:2a:f8:d1:
+         d4:9f:39:41:65:95:9a:08:ad:ad:1f:1c:08:19:7a:22:66:32:
+         37:97:8b:d0:70:55:13:ca:1d:57:b6:e9:a8:11:a6:e0:9c:84:
+         57:b8:a7:2c:62:f3:05:49:ea:42:57:89:1a:5e:bd:b3:fe:b2:
+         19:ed:05:92:cc:2b:3c:74:20:3a:41:40:9d:78:00:c0:55:dd:
+         01:3e:e2:f0:dc:37:d0:18:1f:1d:06:59:0d:24:26:61:db:66:
+         aa:e3:40:ee:fa:7e:a5:bb:55:e2:69:dc:6d:65:2f:45:dc:63:
+         67:bd:f9:1d:c8:7d:92:0a:29:7f:20:2d:9d:a9:ec:a1:b3:49:
+         eb:8c:3c:17:93:fc:2e:cc:34:9e:bc:20:00:ca:22:72:aa:48:
+         27:d0:c9:05:d4:b3:20:45:52:89:0d:29:36:f6:f2:a4:a4:51:
+         15:ca:7e:f2:c3:6a:cd:2a:4e:00:30:02:f4:b9:1c:e5:96:9f:
+         58:80:fc:73:8d:cd:ac:1d:e7:a6:ab:63:c3:2b:35:53:56:4a:
+         24:65:5e:22:3c:5e:52:c0:4d:ae:e6:da:02:45:6e:8b:8a:47:
+         32:cf:fe:6a
 -----BEGIN CERTIFICATE-----
-MIIDuDCCAyGgAwIBAgIBHzANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJERTEP
-MA0GA1UECBMGQmF5ZXJuMQ8wDQYDVQQHEwZNdW5pY2gxDTALBgNVBAoTBEhvbWUx
-FTATBgNVBAsTDEFwYWNoZSBXU1M0SjEPMA0GA1UEAxMGV2VybmVyMB4XDTE1MDkx
-MDE1NDgxOFoXDTE1MDkxMTE1NDgxOFowYTELMAkGA1UEBhMCSUUxETAPBgNVBAgT
+MIIERTCCAy2gAwIBAgIBJzANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJERTEP
+MA0GA1UECAwGQmF5ZXJuMQ8wDQYDVQQHDAZNdW5pY2gxDTALBgNVBAoMBEhvbWUx
+FTATBgNVBAsMDEFwYWNoZSBXU1M0SjEPMA0GA1UEAwwGV2VybmVyMB4XDTE5MDQy
+MzE3MDQ0MFoXDTE5MDQyNDE3MDQ0MFowYTELMAkGA1UEBhMCSUUxETAPBgNVBAgT
 CExlaW5zdGVyMQ8wDQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwG
 A1UECxMFV1NTNEoxDTALBgNVBAMTBENvbG0wggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCavahVtC+MjP7GdVCL+Ia0rprgZilS0mmYk2fXdpxdc5uti1F1
-gb+ZpbBbemt7ekzXnf3zIHKHEvLnLRY5qRPTNvHaX+W0FbInkY5C6/5jq0j64/db
-h1DkPczrC/hX3KjAC5V9sptnlz5dUM3Uu+tmm/sCeb+Xc2EeG7+nCgyYwBHz74Zb
-fLtD21oXDv/2NPVhUB898TMiNtLwdm/7h8YSZKpN+3tw35IlKtrJF6H9fToKa2cE
-+8Wr/Z9KelHLZcv9fgHYNZjWshOPmfA+S+7nKYHoSV3Gd4/1Ki26FMf41cNm35P7
-C+FMSi/WYGZbFnxo8TgmDQoQCEwToXVExL45AgMBAAGjgfYwgfMwCQYDVR0TBAIw
-ADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUw
-HQYDVR0OBBYEFA2WxrcKeBL1D0A7qfbgnmOwxKtRMIGYBgNVHSMEgZAwgY2AFFYX
-7/Zri1n+Ixlo3njA4U1nfdBmoWqkaDBmMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmF5ZXJuMQ8wDQYDVQQHEwZNdW5pY2gxDTALBgNVBAoTBEhvbWUxFTATBgNVBAsT
-DEFwYWNoZSBXU1M0SjEPMA0GA1UEAxMGV2VybmVyggkAjeEsCmkRd9IwDQYJKoZI
-hvcNAQELBQADgYEAHPatygSrJt+JKPrF/Q/Tr4WUwCp2LaxFlFdsT0/Ns+j6C7iW
-ZzO0rdqbcJMhM1SIwm1uhzp+4dcVDw0E9hyvYAfCwU733ZWM6kGFG1JbkHiCwT/v
-oRRd9fMh0486HhJDmwqtku+SLzQlXkqPox8ipUwCgauCSuFpXriWQwUbYLM=
+DwAwggEKAoIBAQCj4NqqOoEWML4TonG5bDPF2xWdyxQnRyzoRCA8Jz6nz6QOdqgq
+9tuguIAjPEDzxAGTdIP8SMT6EnhQtoPpbEEPFMC50XbpDQ4lLThEP0HGZcsDrY0U
+j6CTJiiPmnrdv4U6sDUrrtYFnw+sfh7BF93WCxFacuS9yLVg5Gb8WWTwCCAMdwAy
+K7w9XMkQSE+CrzdCfLOk4OAWu2QJ/cMMtqyodr4yGFUpqniPiQQgaJVJQ+SrYvhe
+uFs0hKLdhi1ug/R8ACcB+JOrpXA5520OtZp1VZfPaMws68VlkCzamDjBZaE7rwv5
+rKZdELHinkEHebegalFPHLXO9gEPQ1ApomC5AgMBAAGjggEBMIH+MAkGA1UdEwQC
+MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+MB0GA1UdDgQWBBT8Uq4or409G58d39WZjvb+RbQwcDCBowYDVR0jBIGbMIGYgBR1
+6LFd/RQAjMdfxw7WAotWSCAShKFqpGgwZjELMAkGA1UEBhMCREUxDzANBgNVBAgM
+BkJheWVybjEPMA0GA1UEBwwGTXVuaWNoMQ0wCwYDVQQKDARIb21lMRUwEwYDVQQL
+DAxBcGFjaGUgV1NTNEoxDzANBgNVBAMMBldlcm5lcoIUEY4pWARYZ7BDvrM+tDSV
+9eZ+vIowDQYJKoZIhvcNAQELBQADggEBAAHIIzT9Kbzq1OvyFwfJcXAyxA2e5WTT
+Rji7SfDLe2u6Oir40dSfOUFllZoIra0fHAgZeiJmMjeXi9BwVRPKHVe26agRpuCc
+hFe4pyxi8wVJ6kJXiRpevbP+shntBZLMKzx0IDpBQJ14AMBV3QE+4vDcN9AYHx0G
+WQ0kJmHbZqrjQO76fqW7VeJp3G1lL0XcY2e9+R3IfZIKKX8gLZ2p7KGzSeuMPBeT
+/C7MNJ68IADKInKqSCfQyQXUsyBFUokNKTb28qSkURXKfvLDas0qTgAwAvS5HOWW
+n1iA/HONzawd56arY8MrNVNWSiRlXiI8XlLATa7m2gJFbouKRzLP/mo=
 -----END CERTIFICATE-----

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java?rev=1858107&r1=1858106&r2=1858107&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java Thu Apr 25 10:15:10 2019
@@ -53,7 +53,7 @@ public class EncryptionCRLTest extends A
             List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
             actions.add(WSSConstants.ENCRYPT);
             securityProperties.setActions(actions);
-            securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("wss40rev.jks"), "security".toCharArray());
+            securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("keys/wss40rev.jks"), "security".toCharArray());
             securityProperties.setEncryptionUser("wss40rev");
             securityProperties.setEncryptionKeyIdentifier(WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE);
 
@@ -105,7 +105,7 @@ public class EncryptionCRLTest extends A
             actions.add(WSSConstants.ENCRYPT);
             securityProperties.setEnableRevocation(true);
             securityProperties.setActions(actions);
-            securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("wss40rev.jks"), "security".toCharArray());
+            securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("keys/wss40rev.jks"), "security".toCharArray());
             securityProperties.setEncryptionUser("wss40rev");
             securityProperties.setEncryptionKeyIdentifier(WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE);
             securityProperties.loadCRLCertStore(this.getClass().getClassLoader().getResource("wss40CACRL.pem"));

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java?rev=1858107&r1=1858106&r2=1858107&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java Thu Apr 25 10:15:10 2019
@@ -98,7 +98,7 @@ public class SignatureCRLTest extends Ab
         //done signature; now test sig-verification: This should pass as revocation is not enabled
         {
             WSSSecurityProperties securityProperties = new WSSSecurityProperties();
-            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("wss40rev.jks"), "security".toCharArray());
+            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("keys/wss40rev.jks"), "security".toCharArray());
             InboundWSSec wsSecIn = WSSec.getInboundWSSec(securityProperties);
             XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
 
@@ -115,7 +115,7 @@ public class SignatureCRLTest extends Ab
             WSSSecurityProperties securityProperties = new WSSSecurityProperties();
             securityProperties.setEnableRevocation(true);
             securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("wss40rev.jks"), "security".toCharArray());
-            securityProperties.loadCRLCertStore(this.getClass().getClassLoader().getResource("wss40CACRL.pem"));
+            securityProperties.loadCRLCertStore(this.getClass().getClassLoader().getResource("keys/wss40CACRL.pem"));
             InboundWSSec wsSecIn = WSSec.getInboundWSSec(securityProperties);
             XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
 
@@ -141,10 +141,10 @@ public class SignatureCRLTest extends Ab
 
         Properties sigProperties = new Properties();
         sigProperties.setProperty("org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin");
-        sigProperties.setProperty("org.apache.wss4j.crypto.merlin.keystore.file", "wss40rev.jks");
+        sigProperties.setProperty("org.apache.wss4j.crypto.merlin.keystore.file", "keys/wss40rev.jks");
         sigProperties.setProperty("org.apache.wss4j.crypto.merlin.keystore.password", "security");
         sigProperties.setProperty("org.apache.wss4j.crypto.merlin.keystore.alias", "wss40rev");
-        sigProperties.setProperty("org.apache.wss4j.crypto.merlin.x509crl.file", "wss40CACRL.pem");
+        sigProperties.setProperty("org.apache.wss4j.crypto.merlin.x509crl.file", "keys/wss40CACRL.pem");
         wss4JHandler.setPassword(messageContext, "security");
         messageContext.put(WSHandlerConstants.SIG_PROP_REF_ID, "" + sigProperties.hashCode());
         messageContext.put("" + sigProperties.hashCode(), sigProperties);

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java?rev=1858107&r1=1858106&r2=1858107&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java Thu Apr 25 10:15:10 2019
@@ -71,7 +71,7 @@ public class SignatureCertConstaintsTest
         //done signature; now test sig-verification: This should pass with a correct cert constraint check
         {
             WSSSecurityProperties securityProperties = new WSSSecurityProperties();
-            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("wss40CA.jks"), "security".toCharArray());
+            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("keys/wss40CA.jks"), "security".toCharArray());
             String certConstraint = ".*CN=Colm.*O=Apache.*";
             Pattern subjectDNPattern = Pattern.compile(certConstraint.trim());
             securityProperties.setSubjectCertConstraints(Collections.singletonList(subjectDNPattern));
@@ -90,7 +90,7 @@ public class SignatureCertConstaintsTest
         //done signature; now test sig-verification: This should fail with an incorrect cert constraint check
         {
             WSSSecurityProperties securityProperties = new WSSSecurityProperties();
-            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("wss40CA.jks"), "security".toCharArray());
+            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("keys/wss40CA.jks"), "security".toCharArray());
             String certConstraint = ".*CN=Colm2.*O=Apache.*";
             Pattern subjectDNPattern = Pattern.compile(certConstraint.trim());
             securityProperties.setSubjectCertConstraints(Collections.singletonList(subjectDNPattern));
@@ -129,7 +129,7 @@ public class SignatureCertConstaintsTest
         //done signature; now test sig-verification: This should pass with a correct cert constraint check
         {
             WSSSecurityProperties securityProperties = new WSSSecurityProperties();
-            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("wss40CA.jks"), "security".toCharArray());
+            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("keys/wss40CA.jks"), "security".toCharArray());
             String certConstraint = ".*CN=Colm.*O=Apache.*";
             Pattern subjectDNPattern = Pattern.compile(certConstraint.trim());
             securityProperties.setSubjectCertConstraints(Collections.singletonList(subjectDNPattern));
@@ -148,7 +148,7 @@ public class SignatureCertConstaintsTest
         //done signature; now test sig-verification: This should fail with an incorrect cert constraint check
         {
             WSSSecurityProperties securityProperties = new WSSSecurityProperties();
-            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("wss40CA.jks"), "security".toCharArray());
+            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("keys/wss40CA.jks"), "security".toCharArray());
             String certConstraint = ".*CN=Colm2.*O=Apache.*";
             Pattern subjectDNPattern = Pattern.compile(certConstraint.trim());
             securityProperties.setSubjectCertConstraints(Collections.singletonList(subjectDNPattern));
@@ -178,7 +178,7 @@ public class SignatureCertConstaintsTest
 
         Properties sigProperties = new Properties();
         sigProperties.setProperty("org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin");
-        sigProperties.setProperty("org.apache.wss4j.crypto.merlin.keystore.file", "wss40.jks");
+        sigProperties.setProperty("org.apache.wss4j.crypto.merlin.keystore.file", "keys/wss40.jks");
         sigProperties.setProperty("org.apache.wss4j.crypto.merlin.keystore.password", "security");
         sigProperties.setProperty("org.apache.wss4j.crypto.merlin.keystore.alias", "wss40");
         wss4JHandler.setPassword(messageContext, "security");

Modified: webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureIssuerCertConstaintsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureIssuerCertConstaintsTest.java?rev=1858107&r1=1858106&r2=1858107&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureIssuerCertConstaintsTest.java (original)
+++ webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureIssuerCertConstaintsTest.java Thu Apr 25 10:15:10 2019
@@ -71,7 +71,7 @@ public class SignatureIssuerCertConstain
         //done signature; now test sig-verification: This should pass with a correct cert constraint check
         {
             WSSSecurityProperties securityProperties = new WSSSecurityProperties();
-            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("wss40CA.jks"), "security".toCharArray());
+            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("keys/wss40CA.jks"), "security".toCharArray());
             String certConstraint = ".*CN=Werner.*OU=Apache.*";
             Pattern issuerDNPattern = Pattern.compile(certConstraint.trim());
             securityProperties.setIssuerDNConstraints(Collections.singletonList(issuerDNPattern));
@@ -90,7 +90,7 @@ public class SignatureIssuerCertConstain
         //done signature; now test sig-verification: This should fail with an incorrect cert constraint check
         {
             WSSSecurityProperties securityProperties = new WSSSecurityProperties();
-            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("wss40CA.jks"), "security".toCharArray());
+            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("keys/wss40CA.jks"), "security".toCharArray());
             String certConstraint = ".*CN=Werner2.*OU=Apache.*";
             Pattern issuerDNPattern = Pattern.compile(certConstraint.trim());
             securityProperties.setIssuerDNConstraints(Collections.singletonList(issuerDNPattern));
@@ -129,7 +129,7 @@ public class SignatureIssuerCertConstain
         //done signature; now test sig-verification: This should pass with a correct cert constraint check
         {
             WSSSecurityProperties securityProperties = new WSSSecurityProperties();
-            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("wss40CA.jks"), "security".toCharArray());
+            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("keys/wss40CA.jks"), "security".toCharArray());
             String certConstraint = ".*CN=Werner.*OU=Apache.*";
             Pattern issuerDNPattern = Pattern.compile(certConstraint.trim());
             securityProperties.setIssuerDNConstraints(Collections.singletonList(issuerDNPattern));
@@ -148,7 +148,7 @@ public class SignatureIssuerCertConstain
         //done signature; now test sig-verification: This should fail with an incorrect cert constraint check
         {
             WSSSecurityProperties securityProperties = new WSSSecurityProperties();
-            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("wss40CA.jks"), "security".toCharArray());
+            securityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("keys/wss40CA.jks"), "security".toCharArray());
             String certConstraint = ".*CN=Werner2.*OU=Apache.*";
             Pattern issuerDNPattern = Pattern.compile(certConstraint.trim());
             securityProperties.setIssuerDNConstraints(Collections.singletonList(issuerDNPattern));
@@ -178,7 +178,7 @@ public class SignatureIssuerCertConstain
 
         Properties sigProperties = new Properties();
         sigProperties.setProperty("org.apache.wss4j.crypto.provider", "org.apache.wss4j.common.crypto.Merlin");
-        sigProperties.setProperty("org.apache.wss4j.crypto.merlin.keystore.file", "wss40.jks");
+        sigProperties.setProperty("org.apache.wss4j.crypto.merlin.keystore.file", "keys/wss40.jks");
         sigProperties.setProperty("org.apache.wss4j.crypto.merlin.keystore.password", "security");
         sigProperties.setProperty("org.apache.wss4j.crypto.merlin.keystore.alias", "wss40");
         wss4JHandler.setPassword(messageContext, "security");



Mime
View raw message