Author: coheigea
Date: Thu Apr 25 10:15:21 2019
New Revision: 1858108
URL: http://svn.apache.org/viewvc?rev=1858108&view=rev
Log:
WSS-647 - More tests fixed
Removed:
webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/resources/alice.properties
webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/resources/wss40.properties
webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/resources/wss40All.properties
webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/resources/wss40CA.properties
webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/resources/wss40badca.properties
webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/resources/wss40badcatrust.properties
webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/resources/wss40rev.properties
webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/resources/wss86.properties
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/wss40badca.jks
webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40badcatrust.jks
webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.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=1858108&r1=1858107&r2=1858108&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:21 2019
@@ -77,3 +77,23 @@ keytool -import -file wss40exp.crt -alia
=====
+wss40expca:
+
+Create a CA that will shortly expire:
+
+openssl req -x509 -newkey rsa:2048 -keyout wss40CAKey.pem -out wss40CA.pem
-config ca.config -days 1
+openssl x509 -outform DER -in wss40CA.pem -out wss40CA.crt
+keytool -import -file wss40CA.crt -alias wss40CA -keystore wss40CA.jks
+
+keytool -genkey -validity 3650 -alias wss40expca -keyalg RSA -keystore
wss40expca.jks -dname "CN=Colm,OU=WSS4J,O=Apache,L=Dublin,ST=Leinster,C=IE"
+keytool -certreq -alias wss40expca -keystore wss40expca.jks -file
wss40expca.cer
+openssl ca -config ca.config -policy policy_anything -days 3650 -out
wss40expca.pem -infiles wss40expca.cer
+openssl x509 -outform DER -in wss40expca.pem -out wss40expca.crt
+keytool -import -file wss40CA.crt -alias wss40CA -keystore wss40expca.jks
+keytool -import -file wss40expca.crt -alias wss40expca -keystore wss40expca.jks
+
+mv wss40CA.jks wss40badcatrust.jks
+mv wss40expca.jks wss40badca.jks
+
+=====
+
Modified:
webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40badca.jks
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40badca.jks?rev=1858108&r1=1858107&r2=1858108&view=diff
==============================================================================
Binary files
webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40badca.jks
(original) and
webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40badca.jks
Thu Apr 25 10:15:21 2019 differ
Modified:
webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40badcatrust.jks
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40badcatrust.jks?rev=1858108&r1=1858107&r2=1858108&view=diff
==============================================================================
Binary files
webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40badcatrust.jks
(original) and
webservices/wss4j/branches/2_2_x-fixes/ws-security-common/src/test/resources/keys/wss40badcatrust.jks
Thu Apr 25 10:15:21 2019 differ
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=1858108&r1=1858107&r2=1858108&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:15:21 2019
@@ -243,7 +243,7 @@ public class SignatureCertTest extends o
secHeader.insertSecurityHeader();
WSSecSignature sign = new WSSecSignature(secHeader);
- sign.setUserInfo("wss4jcertdsa", "security");
+ sign.setUserInfo("wss40expca", "security");
sign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
Document signedDoc =
