Author: coheigea
Date: Thu Apr 15 14:00:46 2010
New Revision: 934414
URL: http://svn.apache.org/viewvc?rev=934414&view=rev
Log:
Replaced out of date keystore that was causing tests to fail.
Added:
webservices/wss4j/branches/1_5_x-fixes/keys/wss40.jks (with props)
webservices/wss4j/branches/1_5_x-fixes/test/wss40.properties (with props)
Removed:
webservices/wss4j/branches/1_5_x-fixes/keys/wss4j.keystore
webservices/wss4j/branches/1_5_x-fixes/test/cryptoSKI.properties
Modified:
webservices/wss4j/branches/1_5_x-fixes/test/wssec/SignatureKeyValueTest.java
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityDataRef.java
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityDataRef1.java
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew11.java
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew12.java
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew15.java
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew2.java
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNewDK.java
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNewSCT.java
Added: webservices/wss4j/branches/1_5_x-fixes/keys/wss40.jks
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/keys/wss40.jks?rev=934414&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/wss4j/branches/1_5_x-fixes/keys/wss40.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: webservices/wss4j/branches/1_5_x-fixes/test/wss40.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wss40.properties?rev=934414&view=auto
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/test/wss40.properties (added)
+++ webservices/wss4j/branches/1_5_x-fixes/test/wss40.properties Thu Apr 15
14:00:46 2010
@@ -0,0 +1,5 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=security
+org.apache.ws.security.crypto.merlin.keystore.alias=wss40
+org.apache.ws.security.crypto.merlin.file=keys/wss40.jks
Propchange: webservices/wss4j/branches/1_5_x-fixes/test/wss40.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/wss4j/branches/1_5_x-fixes/test/wss40.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: webservices/wss4j/branches/1_5_x-fixes/test/wss40.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
webservices/wss4j/branches/1_5_x-fixes/test/wssec/SignatureKeyValueTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/SignatureKeyValueTest.java?rev=934414&r1=934413&r2=934414&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/test/wssec/SignatureKeyValueTest.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/test/wssec/SignatureKeyValueTest.java
Thu Apr 15 14:00:46 2010
@@ -68,7 +68,7 @@ public class SignatureKeyValueTest exten
+ "</SOAP-ENV:Envelope>";
private WSSecurityEngine secEngine = new WSSecurityEngine();
- private Crypto crypto = CryptoFactory.getInstance("cryptoSKI.properties");
+ private Crypto crypto = CryptoFactory.getInstance("wss40.properties");
private java.security.KeyStore keyStore = null;
private MessageContext msgContext;
private SOAPEnvelope unsignedEnvelope;
@@ -125,7 +125,7 @@ public class SignatureKeyValueTest exten
*/
public void testRSAKeyValue() throws Exception {
WSSecSignature builder = new WSSecSignature();
- builder.setUserInfo("wss4jcert", "security");
+ builder.setUserInfo("wss40", "security");
builder.setKeyIdentifierType(WSConstants.KEY_VALUE);
Document doc = unsignedEnvelope.getAsDocument();
WSSecHeader secHeader = new WSSecHeader();
@@ -190,7 +190,7 @@ public class SignatureKeyValueTest exten
*/
public void testDSAKeyValue() throws Exception {
WSSecSignature builder = new WSSecSignature();
- builder.setUserInfo("wss4jcertdsa", "security");
+ builder.setUserInfo("wss40DSA", "security");
builder.setKeyIdentifierType(WSConstants.KEY_VALUE);
Document doc = unsignedEnvelope.getAsDocument();
WSSecHeader secHeader = new WSSecHeader();
Modified:
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityDataRef.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityDataRef.java?rev=934414&r1=934413&r2=934414&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityDataRef.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityDataRef.java
Thu Apr 15 14:00:46 2010
@@ -79,7 +79,7 @@ public class TestWSSecurityDataRef exten
+ "</SOAP-ENV:Envelope>";
private WSSecurityEngine secEngine = new WSSecurityEngine();
- private Crypto crypto = CryptoFactory.getInstance("cryptoSKI.properties");
+ private Crypto crypto = CryptoFactory.getInstance("wss40.properties");
private MessageContext msgContext;
private Message message;
@@ -139,7 +139,7 @@ public class TestWSSecurityDataRef exten
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("wss4jcert");
+ builder.setUserInfo("wss40");
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = unsignedEnvelope.getAsDocument();
Modified:
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityDataRef1.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityDataRef1.java?rev=934414&r1=934413&r2=934414&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityDataRef1.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityDataRef1.java
Thu Apr 15 14:00:46 2010
@@ -79,7 +79,7 @@ public class TestWSSecurityDataRef1 exte
+ "</SOAP-ENV:Envelope>";
private WSSecurityEngine secEngine = new WSSecurityEngine();
- private Crypto crypto = CryptoFactory.getInstance("cryptoSKI.properties");
+ private Crypto crypto = CryptoFactory.getInstance("wss40.properties");
private MessageContext msgContext;
private Message message;
@@ -139,7 +139,7 @@ public class TestWSSecurityDataRef1 exte
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("wss4jcert");
+ builder.setUserInfo("wss40");
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = unsignedEnvelope.getAsDocument();
Modified:
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew11.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew11.java?rev=934414&r1=934413&r2=934414&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew11.java
(original)
+++ webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew11.java
Thu Apr 15 14:00:46 2010
@@ -65,7 +65,7 @@ public class TestWSSecurityNew11 extends
+ "</SOAP-ENV:Envelope>";
private WSSecurityEngine secEngine = new WSSecurityEngine();
- private Crypto crypto = CryptoFactory.getInstance("cryptoSKI.properties");
+ private Crypto crypto = CryptoFactory.getInstance("wss40.properties");
private MessageContext msgContext;
private SOAPEnvelope unsignedEnvelope;
@@ -126,7 +126,7 @@ public class TestWSSecurityNew11 extends
*/
public void testX509SignatureDirectSTR() throws Exception {
WSSecSignature builder = new WSSecSignature();
- builder.setUserInfo("wss4jcert", "security");
+ builder.setUserInfo("wss40", "security");
// builder.setUserInfo("john", "keypass");
SOAPConstants soapConstants =
WSSecurityUtil.getSOAPConstants(unsignedEnvelope.getAsDOM());
Vector parts = new Vector();
@@ -176,7 +176,7 @@ public class TestWSSecurityNew11 extends
*/
public void testWSS96() throws Exception {
WSSecSignature builder = new WSSecSignature();
- builder.setUserInfo("wss4jcert", "security");
+ builder.setUserInfo("wss40", "security");
SOAPConstants soapConstants =
WSSecurityUtil.getSOAPConstants(unsignedEnvelope.getAsDOM());
Vector parts = new Vector();
@@ -234,7 +234,7 @@ public class TestWSSecurityNew11 extends
*/
public void testX509SignatureISSTR() throws Exception {
WSSecSignature builder = new WSSecSignature();
- builder.setUserInfo("wss4jcert", "security");
+ builder.setUserInfo("wss40", "security");
// builder.setUserInfo("john", "keypass");
SOAPConstants soapConstants =
WSSecurityUtil.getSOAPConstants(unsignedEnvelope.getAsDOM());
Vector parts = new Vector();
@@ -288,7 +288,7 @@ public class TestWSSecurityNew11 extends
*/
public void testX509SignatureSKISTR() throws Exception {
WSSecSignature builder = new WSSecSignature();
- builder.setUserInfo("wss4jcert", "security");
+ builder.setUserInfo("wss40", "security");
// builder.setUserInfo("john", "keypass");
SOAPConstants soapConstants =
WSSecurityUtil.getSOAPConstants(unsignedEnvelope.getAsDOM());
Vector parts = new Vector();
Modified:
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew12.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew12.java?rev=934414&r1=934413&r2=934414&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew12.java
(original)
+++ webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew12.java
Thu Apr 15 14:00:46 2010
@@ -63,7 +63,7 @@ public class TestWSSecurityNew12 extends
+ "</SOAP-ENV:Envelope>";
private WSSecurityEngine secEngine = new WSSecurityEngine();
- private Crypto crypto = CryptoFactory.getInstance("cryptoSKI.properties");
+ private Crypto crypto = CryptoFactory.getInstance("wss40.properties");
private MessageContext msgContext;
private SOAPEnvelope unsignedEnvelope;
@@ -123,7 +123,7 @@ public class TestWSSecurityNew12 extends
*/
public void testX509SignatureDSA_SKI() throws Exception {
WSSecSignature builder = new WSSecSignature();
- builder.setUserInfo("wss4jcertDSA", "security");
+ builder.setUserInfo("wss40DSA", "security");
builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
builder.setSignatureAlgorithm(XMLSignature.ALGO_ID_SIGNATURE_DSA);
@@ -158,7 +158,7 @@ public class TestWSSecurityNew12 extends
*/
public void testX509SignatureDSA_Autodetect() throws Exception {
WSSecSignature builder = new WSSecSignature();
- builder.setUserInfo("wss4jcertDSA", "security");
+ builder.setUserInfo("wss40DSA", "security");
builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
// builder.setUserInfo("john", "keypass");
@@ -192,7 +192,7 @@ public class TestWSSecurityNew12 extends
*/
public void testX509SignatureRSA_Autodetect() throws Exception {
WSSecSignature builder = new WSSecSignature();
- builder.setUserInfo("wss4jcert", "security");
+ builder.setUserInfo("wss40", "security");
builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
// builder.setUserInfo("john", "keypass");
Modified:
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew15.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew15.java?rev=934414&r1=934413&r2=934414&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew15.java
(original)
+++ webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew15.java
Thu Apr 15 14:00:46 2010
@@ -81,7 +81,7 @@ public class TestWSSecurityNew15 extends
+ "</SOAP-ENV:Envelope>";
private WSSecurityEngine secEngine = new WSSecurityEngine();
- private Crypto crypto = CryptoFactory.getInstance("cryptoSKI.properties");
+ private Crypto crypto = CryptoFactory.getInstance("wss40.properties");
private MessageContext msgContext;
private Message message;
@@ -142,7 +142,7 @@ public class TestWSSecurityNew15 extends
public void testEncryptionDecryptionRSA15() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("wss4jcert");
+ builder.setUserInfo("wss40");
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = unsignedEnvelope.getAsDocument();
Modified:
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew2.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew2.java?rev=934414&r1=934413&r2=934414&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew2.java
(original)
+++ webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew2.java
Thu Apr 15 14:00:46 2010
@@ -73,7 +73,7 @@ public class TestWSSecurityNew2 extends
);
private WSSecurityEngine secEngine = new WSSecurityEngine();
- private Crypto crypto = CryptoFactory.getInstance("cryptoSKI.properties");
+ private Crypto crypto = CryptoFactory.getInstance("wss40.properties");
private MessageContext msgContext;
private Message message;
@@ -134,7 +134,7 @@ public class TestWSSecurityNew2 extends
public void testEncryptionDecryptionRSA15() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("wss4jcert");
+ builder.setUserInfo("wss40");
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = unsignedEnvelope.getAsDocument();
@@ -201,7 +201,7 @@ public class TestWSSecurityNew2 extends
public void testEncryptionDecryptionOAEP() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("wss4jcert");
+ builder.setUserInfo("wss40");
builder.setKeyIdentifierType(WSConstants.X509_KEY_IDENTIFIER);
builder.setKeyEnc(WSConstants.KEYTRANSPORT_RSAOEP);
Document doc = unsignedEnvelope.getAsDocument();
Modified:
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNewDK.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNewDK.java?rev=934414&r1=934413&r2=934414&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNewDK.java
(original)
+++ webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNewDK.java
Thu Apr 15 14:00:46 2010
@@ -65,7 +65,7 @@ public class TestWSSecurityNewDK extends
+ "</SOAP-ENV:Envelope>";
private WSSecurityEngine secEngine = new WSSecurityEngine();
- private Crypto crypto = CryptoFactory.getInstance("cryptoSKI.properties");
+ private Crypto crypto = CryptoFactory.getInstance("wss40.properties");
private MessageContext msgContext;
private Message message;
@@ -128,7 +128,7 @@ public class TestWSSecurityNewDK extends
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
- encrKeyBuilder.setUserInfo("wss4jcert");
+ encrKeyBuilder.setUserInfo("wss40");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.prepare(doc, crypto);
@@ -166,7 +166,7 @@ public class TestWSSecurityNewDK extends
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
- encrKeyBuilder.setUserInfo("wss4jcert");
+ encrKeyBuilder.setUserInfo("wss40");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.prepare(doc, crypto);
@@ -200,7 +200,7 @@ public class TestWSSecurityNewDK extends
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
- encrKeyBuilder.setUserInfo("wss4jcert");
+ encrKeyBuilder.setUserInfo("wss40");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.prepare(doc, crypto);
@@ -240,12 +240,12 @@ public class TestWSSecurityNewDK extends
secHeader.insertSecurityHeader(doc);
SecurityTokenReference secToken = new SecurityTokenReference(doc);
- X509Certificate[] certs = crypto.getCertificates("wss4jcert");
+ X509Certificate[] certs = crypto.getCertificates("wss40");
secToken.setKeyIdentifierThumb(certs[0]);
secToken.getElement();
WSSecDKSign sigBuilder = new WSSecDKSign();
- java.security.Key key = crypto.getPrivateKey("wss4jcert", "security");
+ java.security.Key key = crypto.getPrivateKey("wss40", "security");
sigBuilder.setExternalKey(key.getEncoded(), secToken.getElement());
sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
sigBuilder.build(doc, secHeader);
@@ -274,12 +274,12 @@ public class TestWSSecurityNewDK extends
secHeader.insertSecurityHeader(doc);
SecurityTokenReference secToken = new SecurityTokenReference(doc);
- X509Certificate[] certs = crypto.getCertificates("wss4jcert");
+ X509Certificate[] certs = crypto.getCertificates("wss40");
secToken.setKeyIdentifierSKI(certs[0], crypto);
secToken.getElement();
WSSecDKSign sigBuilder = new WSSecDKSign();
- java.security.Key key = crypto.getPrivateKey("wss4jcert", "security");
+ java.security.Key key = crypto.getPrivateKey("wss40", "security");
sigBuilder.setExternalKey(key.getEncoded(), secToken.getElement());
sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
sigBuilder.build(doc, secHeader);
@@ -304,7 +304,7 @@ public class TestWSSecurityNewDK extends
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
- encrKeyBuilder.setUserInfo("wss4jcert");
+ encrKeyBuilder.setUserInfo("wss40");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.prepare(doc, crypto);
@@ -345,7 +345,7 @@ public class TestWSSecurityNewDK extends
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
- encrKeyBuilder.setUserInfo("wss4jcert");
+ encrKeyBuilder.setUserInfo("wss40");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.prepare(doc, crypto);
Modified:
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNewSCT.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNewSCT.java?rev=934414&r1=934413&r2=934414&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNewSCT.java
(original)
+++ webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNewSCT.java
Thu Apr 15 14:00:46 2010
@@ -71,7 +71,7 @@ public class TestWSSecurityNewSCT extend
+ "</SOAP-ENV:Envelope>";
private WSSecurityEngine secEngine = new WSSecurityEngine();
- private Crypto crypto = CryptoFactory.getInstance("cryptoSKI.properties");
+ private Crypto crypto = CryptoFactory.getInstance("wss40.properties");
private MessageContext msgContext;
private Message message;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
