You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2014/05/08 11:15:51 UTC
svn commit: r1593214 - in /webservices/wss4j/trunk:
ws-security-common/src/test/resources/keys/
ws-security-common/src/test/resources/keys/ca.db.certs/ ws-security-dom/
ws-security-dom/src/test/java/org/apache/wss4j/dom/message/
ws-security-dom/src/tes...
Author: coheigea
Date: Thu May 8 09:15:49 2014
New Revision: 1593214
URL: http://svn.apache.org/r1593214
Log:
Adding a new testcase for expired certs
Added:
webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.certs/1A.pem
webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.index.attr.old
- copied, changed from r1593212, webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.index.attr
webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.index.old
- copied, changed from r1593212, webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.index
webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.serial.old
- copied, changed from r1593212, webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.serial
webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.cer
webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.crt
webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.jks
webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.pem
Removed:
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/alice.p12
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.config
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/01.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/02.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/03.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/06.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/07.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/08.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/09.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/0A.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/0B.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/0C.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/0D.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/0E.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/0F.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/10.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/11.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/12.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/13.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/14.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/15.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/16.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/17.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/18.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.certs/19.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.index
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.index.attr
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.serial
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/client_keystore.jks
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/rsa2048.jks
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/server_keystore.jks
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40.jks
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40CA.crt
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40CA.jks
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40CA.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40CACRL.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40CAKey.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40_server.cer
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40_server.crt
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40_server.jks
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40_server.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40badca.jks
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40badcatrust.jks
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40dsa.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40rev.cer
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40rev.crt
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40rev.jks
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss40rev.pem
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/wss86.keystore
webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/x509.PFX.MSFT
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.index
webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.serial
webservices/wss4j/trunk/ws-security-dom/pom.xml
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
webservices/wss4j/trunk/ws-security-stax/pom.xml
Added: webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.certs/1A.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.certs/1A.pem?rev=1593214&view=auto
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.certs/1A.pem (added)
+++ webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.certs/1A.pem Thu May 8 09:15:49 2014
@@ -0,0 +1,76 @@
+Certificate:
+ Data:
+ Version: 3 (0x2)
+ Serial Number: 26 (0x1a)
+ Signature Algorithm: md5WithRSAEncryption
+ Issuer: C=DE, ST=Bayern, L=Munich, O=Home, OU=Apache WSS4J, CN=Werner
+ Validity
+ Not Before: May 8 08:50:17 2014 GMT
+ Not After : May 9 08:50:17 2014 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:95:0a:b2:b1:b6:14:8f:2a:cc:00:b2:c6:9f:26:
+ 96:82:15:9d:1d:f6:64:b0:af:3a:7e:55:aa:6a:9a:
+ 32:35:1a:d9:a4:43:a3:ad:16:ed:27:ee:e3:bc:68:
+ 20:6f:85:42:52:18:56:d1:52:67:42:02:ee:1f:de:
+ 30:76:d7:ac:93:b0:31:e1:dc:e2:d5:96:83:2a:10:
+ e1:89:79:60:6f:1a:2e:d1:5b:82:8a:b9:9e:8d:19:
+ 55:43:f3:12:13:bd:ad:3b:c8:90:99:a3:a9:53:96:
+ 80:e5:c9:89:f4:d8:ca:d5:c6:5c:27:a3:7a:1c:e1:
+ c8:38:b9:5c:3e:da:8e:6e:ae:42:25:94:f0:0b:a8:
+ 13:04:7f:03:a2:99:44:0c:da:f2:f5:9b:84:f2:16:
+ a8:ba:c7:05:8f:15:1e:a1:a0:bc:89:90:b9:88:26:
+ 12:72:fa:bc:1a:c1:38:31:7f:ad:f7:a6:8d:22:4f:
+ 16:3e:a3:f0:4e:cb:77:e0:99:80:af:40:9d:38:71:
+ 7a:e6:24:b5:88:72:37:cc:80:f8:94:4a:9e:30:5c:
+ ec:cb:5b:05:d9:c8:87:d7:43:87:61:84:cd:3c:86:
+ a3:64:e4:06:3b:fc:bb:ce:6c:9d:68:e3:d0:0e:ef:
+ 14:c8:fe:f7:67:39:35:7d:5c:fe:3c:6d:36:b3:5e:
+ d6:2f
+ Exponent: 65537 (0x10001)
+ X509v3 extensions:
+ X509v3 Basic Constraints:
+ CA:FALSE
+ Netscape Comment:
+ OpenSSL Generated Certificate
+ X509v3 Subject Key Identifier:
+ FC:4B:03:40:92:8E:77:4A:7A:08:7E:13:9C:8D:3C:4F:E1:69:14:1E
+ 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
+ DirName:/C=DE/ST=Bayern/L=Munich/O=Home/OU=Apache WSS4J/CN=Werner
+ serial:8D:E1:2C:0A:69:11:77:D2
+
+ Signature Algorithm: md5WithRSAEncryption
+ 72:8f:36:52:19:ba:68:63:85:7b:87:19:9d:d3:c1:79:6b:0e:
+ 5f:89:3d:24:52:3e:e8:83:36:e6:27:68:13:b3:f0:a4:c4:f3:
+ 4c:bc:da:9a:fb:62:24:bc:02:2f:5d:f3:81:d2:21:8f:9a:4e:
+ 2d:2d:85:40:c9:cc:28:1d:d2:1c:5f:ef:13:38:af:72:1c:64:
+ a2:e1:4b:97:4f:4e:8e:dd:5a:25:23:07:71:89:7a:0d:74:c9:
+ 75:ba:b2:96:87:b4:c3:b2:59:85:00:82:79:38:4e:60:a0:fd:
+ d6:b1:ae:8f:dc:dc:32:dd:83:44:69:27:6b:d4:fd:74:75:5d:
+ af:74
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAyGgAwIBAgIBGjANBgkqhkiG9w0BAQQFADBmMQswCQYDVQQGEwJERTEP
+MA0GA1UECBMGQmF5ZXJuMQ8wDQYDVQQHEwZNdW5pY2gxDTALBgNVBAoTBEhvbWUx
+FTATBgNVBAsTDEFwYWNoZSBXU1M0SjEPMA0GA1UEAxMGV2VybmVyMB4XDTE0MDUw
+ODA4NTAxN1oXDTE0MDUwOTA4NTAxN1owYTELMAkGA1UEBhMCSUUxETAPBgNVBAgT
+CExlaW5zdGVyMQ8wDQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwG
+A1UECxMFV1NTNEoxDTALBgNVBAMTBENvbG0wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCVCrKxthSPKswAssafJpaCFZ0d9mSwrzp+VapqmjI1GtmkQ6Ot
+Fu0n7uO8aCBvhUJSGFbRUmdCAu4f3jB216yTsDHh3OLVloMqEOGJeWBvGi7RW4KK
+uZ6NGVVD8xITva07yJCZo6lTloDlyYn02MrVxlwno3oc4cg4uVw+2o5urkIllPAL
+qBMEfwOimUQM2vL1m4TyFqi6xwWPFR6hoLyJkLmIJhJy+rwawTgxf633po0iTxY+
+o/BOy3fgmYCvQJ04cXrmJLWIcjfMgPiUSp4wXOzLWwXZyIfXQ4dhhM08hqNk5AY7
+/LvObJ1o49AO7xTI/vdnOTV9XP48bTazXtYvAgMBAAGjgfYwgfMwCQYDVR0TBAIw
+ADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUw
+HQYDVR0OBBYEFPxLA0CSjndKegh+E5yNPE/haRQeMIGYBgNVHSMEgZAwgY2AFFYX
+7/Zri1n+Ixlo3njA4U1nfdBmoWqkaDBmMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
+QmF5ZXJuMQ8wDQYDVQQHEwZNdW5pY2gxDTALBgNVBAoTBEhvbWUxFTATBgNVBAsT
+DEFwYWNoZSBXU1M0SjEPMA0GA1UEAxMGV2VybmVyggkAjeEsCmkRd9IwDQYJKoZI
+hvcNAQEEBQADgYEAco82Uhm6aGOFe4cZndPBeWsOX4k9JFI+6IM25idoE7PwpMTz
+TLzamvtiJLwCL13zgdIhj5pOLS2FQMnMKB3SHF/vEzivchxkouFLl09Ojt1aJSMH
+cYl6DXTJdbqyloe0w7JZhQCCeThOYKD91rGuj9zcMt2DRGkna9T9dHVdr3Q=
+-----END CERTIFICATE-----
Modified: webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.index
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.index?rev=1593214&r1=1593213&r2=1593214&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.index (original)
+++ webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.index Thu May 8 09:15:49 2014
@@ -23,3 +23,4 @@ V 190422112921Z 16 unknown /C=IE/ST=Lei
V 190422134119Z 17 unknown /C=IE/ST=Leinster/L=Dublin/O=Apache/OU=WSS4J/CN=Colm
V 210114124914Z 18 unknown /C=IE/ST=Leinster/L=Dublin/O=Apache/OU=WSS4J/CN=Server
R 210527114754Z 110530115357Z 19 unknown /C=IE/ST=Leinster/L=Dublin/O=Apache/OU=WSS4J/CN=Colm
+V 140509085017Z 1A unknown /C=IE/ST=Leinster/L=Dublin/O=Apache/OU=WSS4J/CN=Colm
Copied: webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.index.attr.old (from r1593212, webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.index.attr)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.index.attr.old?p2=webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.index.attr.old&p1=webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.index.attr&r1=1593212&r2=1593214&rev=1593214&view=diff
==============================================================================
(empty)
Copied: webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.index.old (from r1593212, webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.index)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.index.old?p2=webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.index.old&p1=webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.index&r1=1593212&r2=1593214&rev=1593214&view=diff
==============================================================================
Binary files - no diff available.
Modified: webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.serial
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.serial?rev=1593214&r1=1593213&r2=1593214&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.serial (original)
+++ webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.serial Thu May 8 09:15:49 2014
@@ -1 +1 @@
-1A
+1B
Copied: webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.serial.old (from r1593212, webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.serial)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.serial.old?p2=webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/ca.db.serial.old&p1=webservices/wss4j/trunk/ws-security-dom/src/test/resources/keys/ca.db.serial&r1=1593212&r2=1593214&rev=1593214&view=diff
==============================================================================
Binary files - no diff available.
Added: webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.cer
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.cer?rev=1593214&view=auto
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.cer (added)
+++ webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.cer Thu May 8 09:15:49 2014
@@ -0,0 +1,15 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIIC1jCCAb4CAQAwYTELMAkGA1UEBhMCSUUxETAPBgNVBAgTCExlaW5zdGVyMQ8wDQYDVQQHEwZE
+dWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwGA1UECxMFV1NTNEoxDTALBgNVBAMTBENvbG0wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVCrKxthSPKswAssafJpaCFZ0d9mSwrzp+Vapq
+mjI1GtmkQ6OtFu0n7uO8aCBvhUJSGFbRUmdCAu4f3jB216yTsDHh3OLVloMqEOGJeWBvGi7RW4KK
+uZ6NGVVD8xITva07yJCZo6lTloDlyYn02MrVxlwno3oc4cg4uVw+2o5urkIllPALqBMEfwOimUQM
+2vL1m4TyFqi6xwWPFR6hoLyJkLmIJhJy+rwawTgxf633po0iTxY+o/BOy3fgmYCvQJ04cXrmJLWI
+cjfMgPiUSp4wXOzLWwXZyIfXQ4dhhM08hqNk5AY7/LvObJ1o49AO7xTI/vdnOTV9XP48bTazXtYv
+AgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBT8SwNAko53SnoIfhOcjTxP4WkUHjAN
+BgkqhkiG9w0BAQsFAAOCAQEASxzBqpG0PBnY8JLIgz2Y8AUDTb0gtnLKFsJHge5sYw8jqeN9oUT+
+ouTIGAc2cdezC+YSc6bEueenLNARMxhrt+5EzxAr2MCZd/MetNgLwPH4DW+1tVVeJIo0mKeqoTlu
+gMDPotnPm51eSf/q0e69JNAH65rQ2rr2tQdjGDPSkg1sSdv0dFKWElnLTZHGIE7PmIeao6Uy8+1R
+Oxdbauk8W4cMEgObrmZNubBoYJsxma9B7+1J51hC+YIfjnu95MRX9pwGpNH8nf2MeiZy+Gl5TZiN
+E6dq7J5gXHl/eBTNpUuXtxYTf+jGEklk0Nubn4ypYLwDmguY9gpcaWkxYDQXCA==
+-----END NEW CERTIFICATE REQUEST-----
Added: webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.crt
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.crt?rev=1593214&view=auto
==============================================================================
Files webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.crt (added) and webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.crt Thu May 8 09:15:49 2014 differ
Added: webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.jks
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.jks?rev=1593214&view=auto
==============================================================================
Files webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.jks (added) and webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.jks Thu May 8 09:15:49 2014 differ
Added: webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.pem
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.pem?rev=1593214&view=auto
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.pem (added)
+++ webservices/wss4j/trunk/ws-security-common/src/test/resources/keys/wss40exp.pem Thu May 8 09:15:49 2014
@@ -0,0 +1,76 @@
+Certificate:
+ Data:
+ Version: 3 (0x2)
+ Serial Number: 26 (0x1a)
+ Signature Algorithm: md5WithRSAEncryption
+ Issuer: C=DE, ST=Bayern, L=Munich, O=Home, OU=Apache WSS4J, CN=Werner
+ Validity
+ Not Before: May 8 08:50:17 2014 GMT
+ Not After : May 9 08:50:17 2014 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:95:0a:b2:b1:b6:14:8f:2a:cc:00:b2:c6:9f:26:
+ 96:82:15:9d:1d:f6:64:b0:af:3a:7e:55:aa:6a:9a:
+ 32:35:1a:d9:a4:43:a3:ad:16:ed:27:ee:e3:bc:68:
+ 20:6f:85:42:52:18:56:d1:52:67:42:02:ee:1f:de:
+ 30:76:d7:ac:93:b0:31:e1:dc:e2:d5:96:83:2a:10:
+ e1:89:79:60:6f:1a:2e:d1:5b:82:8a:b9:9e:8d:19:
+ 55:43:f3:12:13:bd:ad:3b:c8:90:99:a3:a9:53:96:
+ 80:e5:c9:89:f4:d8:ca:d5:c6:5c:27:a3:7a:1c:e1:
+ c8:38:b9:5c:3e:da:8e:6e:ae:42:25:94:f0:0b:a8:
+ 13:04:7f:03:a2:99:44:0c:da:f2:f5:9b:84:f2:16:
+ a8:ba:c7:05:8f:15:1e:a1:a0:bc:89:90:b9:88:26:
+ 12:72:fa:bc:1a:c1:38:31:7f:ad:f7:a6:8d:22:4f:
+ 16:3e:a3:f0:4e:cb:77:e0:99:80:af:40:9d:38:71:
+ 7a:e6:24:b5:88:72:37:cc:80:f8:94:4a:9e:30:5c:
+ ec:cb:5b:05:d9:c8:87:d7:43:87:61:84:cd:3c:86:
+ a3:64:e4:06:3b:fc:bb:ce:6c:9d:68:e3:d0:0e:ef:
+ 14:c8:fe:f7:67:39:35:7d:5c:fe:3c:6d:36:b3:5e:
+ d6:2f
+ Exponent: 65537 (0x10001)
+ X509v3 extensions:
+ X509v3 Basic Constraints:
+ CA:FALSE
+ Netscape Comment:
+ OpenSSL Generated Certificate
+ X509v3 Subject Key Identifier:
+ FC:4B:03:40:92:8E:77:4A:7A:08:7E:13:9C:8D:3C:4F:E1:69:14:1E
+ 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
+ DirName:/C=DE/ST=Bayern/L=Munich/O=Home/OU=Apache WSS4J/CN=Werner
+ serial:8D:E1:2C:0A:69:11:77:D2
+
+ Signature Algorithm: md5WithRSAEncryption
+ 72:8f:36:52:19:ba:68:63:85:7b:87:19:9d:d3:c1:79:6b:0e:
+ 5f:89:3d:24:52:3e:e8:83:36:e6:27:68:13:b3:f0:a4:c4:f3:
+ 4c:bc:da:9a:fb:62:24:bc:02:2f:5d:f3:81:d2:21:8f:9a:4e:
+ 2d:2d:85:40:c9:cc:28:1d:d2:1c:5f:ef:13:38:af:72:1c:64:
+ a2:e1:4b:97:4f:4e:8e:dd:5a:25:23:07:71:89:7a:0d:74:c9:
+ 75:ba:b2:96:87:b4:c3:b2:59:85:00:82:79:38:4e:60:a0:fd:
+ d6:b1:ae:8f:dc:dc:32:dd:83:44:69:27:6b:d4:fd:74:75:5d:
+ af:74
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAyGgAwIBAgIBGjANBgkqhkiG9w0BAQQFADBmMQswCQYDVQQGEwJERTEP
+MA0GA1UECBMGQmF5ZXJuMQ8wDQYDVQQHEwZNdW5pY2gxDTALBgNVBAoTBEhvbWUx
+FTATBgNVBAsTDEFwYWNoZSBXU1M0SjEPMA0GA1UEAxMGV2VybmVyMB4XDTE0MDUw
+ODA4NTAxN1oXDTE0MDUwOTA4NTAxN1owYTELMAkGA1UEBhMCSUUxETAPBgNVBAgT
+CExlaW5zdGVyMQ8wDQYDVQQHEwZEdWJsaW4xDzANBgNVBAoTBkFwYWNoZTEOMAwG
+A1UECxMFV1NTNEoxDTALBgNVBAMTBENvbG0wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCVCrKxthSPKswAssafJpaCFZ0d9mSwrzp+VapqmjI1GtmkQ6Ot
+Fu0n7uO8aCBvhUJSGFbRUmdCAu4f3jB216yTsDHh3OLVloMqEOGJeWBvGi7RW4KK
+uZ6NGVVD8xITva07yJCZo6lTloDlyYn02MrVxlwno3oc4cg4uVw+2o5urkIllPAL
+qBMEfwOimUQM2vL1m4TyFqi6xwWPFR6hoLyJkLmIJhJy+rwawTgxf633po0iTxY+
+o/BOy3fgmYCvQJ04cXrmJLWIcjfMgPiUSp4wXOzLWwXZyIfXQ4dhhM08hqNk5AY7
+/LvObJ1o49AO7xTI/vdnOTV9XP48bTazXtYvAgMBAAGjgfYwgfMwCQYDVR0TBAIw
+ADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUw
+HQYDVR0OBBYEFPxLA0CSjndKegh+E5yNPE/haRQeMIGYBgNVHSMEgZAwgY2AFFYX
+7/Zri1n+Ixlo3njA4U1nfdBmoWqkaDBmMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
+QmF5ZXJuMQ8wDQYDVQQHEwZNdW5pY2gxDTALBgNVBAoTBEhvbWUxFTATBgNVBAsT
+DEFwYWNoZSBXU1M0SjEPMA0GA1UEAxMGV2VybmVyggkAjeEsCmkRd9IwDQYJKoZI
+hvcNAQEEBQADgYEAco82Uhm6aGOFe4cZndPBeWsOX4k9JFI+6IM25idoE7PwpMTz
+TLzamvtiJLwCL13zgdIhj5pOLS2FQMnMKB3SHF/vEzivchxkouFLl09Ojt1aJSMH
+cYl6DXTJdbqyloe0w7JZhQCCeThOYKD91rGuj9zcMt2DRGkna9T9dHVdr3Q=
+-----END CERTIFICATE-----
Modified: webservices/wss4j/trunk/ws-security-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/pom.xml?rev=1593214&r1=1593213&r2=1593214&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-dom/pom.xml Thu May 8 09:15:49 2014
@@ -198,6 +198,13 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-ws-security-common</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java?rev=1593214&r1=1593213&r2=1593214&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java Thu May 8 09:15:49 2014
@@ -28,6 +28,7 @@ import org.apache.wss4j.dom.common.SOAPU
import org.apache.wss4j.dom.common.SecurityTestUtil;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
+import org.apache.wss4j.common.crypto.Merlin;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.handler.HandlerAction;
@@ -39,6 +40,7 @@ import org.w3c.dom.Document;
import java.security.cert.X509Certificate;
import java.util.Collections;
import java.util.List;
+import java.util.Properties;
/**
* This is a test for WSS-40. Essentially it just tests that a message is signed using a
@@ -305,6 +307,75 @@ public class SignatureCertTest extends o
assertTrue (certs != null && certs.length == 2);
}
+ @org.junit.Test
+ public void testExpiredCert() throws Exception {
+ Properties clientProperties = new Properties();
+ clientProperties.put("org.apache.wss4j.crypto.provider",
+ "org.apache.wss4j.common.crypto.Merlin");
+ clientProperties.put("org.apache.wss4j.crypto.merlin.keystore.type", "jks");
+ clientProperties.put("org.apache.wss4j.crypto.merlin.keystore.password", "security");
+ clientProperties.put("org.apache.wss4j.crypto.merlin.keystore.alias", "wss40exp");
+ clientProperties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/wss40exp.jks");
+
+ Crypto clientCrypto = new Merlin(clientProperties, this.getClass().getClassLoader(), null);
+
+ WSSecSignature sign = new WSSecSignature();
+ sign.setUserInfo("wss40exp", "security");
+ sign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
+
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+
+ WSSecHeader secHeader = new WSSecHeader();
+ secHeader.insertSecurityHeader(doc);
+ Document signedDoc = sign.build(doc, clientCrypto, secHeader);
+
+ if (LOG.isDebugEnabled()) {
+ String outputString =
+ XMLUtils.PrettyDocumentToString(signedDoc);
+ LOG.debug(outputString);
+ }
+ //
+ // Verify the signature
+ //
+ // TODO Failure expected after expiry
+ WSSecurityEngine newEngine = new WSSecurityEngine();
+ newEngine.processSecurityHeader(doc, null, null, cryptoCA);
+ }
+
+ @org.junit.Test
+ public void testExpiredCertInKeystore() throws Exception {
+ Properties clientProperties = new Properties();
+ clientProperties.put("org.apache.wss4j.crypto.provider",
+ "org.apache.wss4j.common.crypto.Merlin");
+ clientProperties.put("org.apache.wss4j.crypto.merlin.keystore.type", "jks");
+ clientProperties.put("org.apache.wss4j.crypto.merlin.keystore.password", "security");
+ clientProperties.put("org.apache.wss4j.crypto.merlin.keystore.alias", "wss40exp");
+ clientProperties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/wss40exp.jks");
+
+ Crypto clientCrypto = new Merlin(clientProperties, this.getClass().getClassLoader(), null);
+
+ WSSecSignature sign = new WSSecSignature();
+ sign.setUserInfo("wss40exp", "security");
+ sign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
+
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+
+ WSSecHeader secHeader = new WSSecHeader();
+ secHeader.insertSecurityHeader(doc);
+ Document signedDoc = sign.build(doc, clientCrypto, secHeader);
+
+ if (LOG.isDebugEnabled()) {
+ String outputString =
+ XMLUtils.PrettyDocumentToString(signedDoc);
+ LOG.debug(outputString);
+ }
+ //
+ // Verify the signature
+ //
+ // TODO Failure expected after expiry
+ WSSecurityEngine newEngine = new WSSecurityEngine();
+ newEngine.processSecurityHeader(doc, null, null, clientCrypto);
+ }
/**
* Verifies the soap envelope
Modified: webservices/wss4j/trunk/ws-security-stax/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/pom.xml?rev=1593214&r1=1593213&r2=1593214&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-stax/pom.xml Thu May 8 09:15:49 2014
@@ -158,6 +158,13 @@
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-ws-security-common</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-dom</artifactId>
<version>${project.version}</version>
<scope>test</scope>