You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by we...@apache.org on 2004/03/11 23:16:47 UTC
cvs commit: ws-fx/wss4j/test/wssec TestWSSecurity2.java TestWSSecuritySOAP12.java
werner 2004/03/11 14:16:47
Modified: wss4j/test/interop PackageTests.java
wss4j/test/wssec TestWSSecurity2.java
TestWSSecuritySOAP12.java
Log:
Fix problems found during interop tests.
Revision Changes Path
1.2 +2 -1 ws-fx/wss4j/test/interop/PackageTests.java
Index: PackageTests.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/test/interop/PackageTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PackageTests.java 13 Feb 2004 20:43:08 -0000 1.1
+++ PackageTests.java 11 Mar 2004 22:16:47 -0000 1.2
@@ -54,7 +54,8 @@
suite.addTestSuite(TestScenario3.class);
suite.addTestSuite(TestScenario4.class);
suite.addTestSuite(TestScenario5.class);
- suite.addTestSuite(TestScenario6.class);
+ suite.addTestSuite(TestScenario6.class);
+ suite.addTestSuite(TestScenario7.class);
return suite;
}
1.3 +4 -5 ws-fx/wss4j/test/wssec/TestWSSecurity2.java
Index: TestWSSecurity2.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/test/wssec/TestWSSecurity2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestWSSecurity2.java 7 Mar 2004 10:36:44 -0000 1.2
+++ TestWSSecurity2.java 11 Mar 2004 22:16:47 -0000 1.3
@@ -64,7 +64,7 @@
"</soapenv:Envelope>";
static final WSSecurityEngine secEngine = new WSSecurityEngine();
- static final Crypto crypto = CryptoFactory.getInstance();
+ static final Crypto crypto = CryptoFactory.getInstance("cryptoSKI.properties");
MessageContext msgContext;
Message message;
@@ -136,7 +136,7 @@
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
SOAPEnvelope envelope = null;
WSEncryptBody builder = new WSEncryptBody();
- builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e");
+ builder.setUserInfo("wss4jcert");
builder.setKeyIdentifierType(WSConstants.X509_KEY_IDENTIFIER);
Document doc = unsignedEnvelope.getAsDocument();
log.info("Before Encryption Triple DES....");
@@ -198,12 +198,12 @@
* <p/>
*
* @throws Exception Thrown when there is any problem in signing or verification
- *
+ */
public void testEncryptionDecryptionOAEP() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
SOAPEnvelope envelope = null;
WSEncryptBody builder = new WSEncryptBody();
- builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e");
+ builder.setUserInfo("wss4jcert");
builder.setKeyIdentifierType(WSConstants.X509_KEY_IDENTIFIER);
builder.setKeyEnc(WSConstants.KEYTRANSPORT_RSAOEP);
Document doc = unsignedEnvelope.getAsDocument();
@@ -222,7 +222,6 @@
verify(encryptedDoc);
}
- */
/**
* Verifies the soap envelope
1.2 +4 -1 ws-fx/wss4j/test/wssec/TestWSSecuritySOAP12.java
Index: TestWSSecuritySOAP12.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/test/wssec/TestWSSecuritySOAP12.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestWSSecuritySOAP12.java 13 Feb 2004 20:43:09 -0000 1.1
+++ TestWSSecuritySOAP12.java 11 Mar 2004 22:16:47 -0000 1.2
@@ -135,7 +135,10 @@
*/
Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
- XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
+ if (log.isDebugEnabled()) {
+ log.debug("Signed message SOAP 1.2:");
+ XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
+ }
signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
log.info("After Signing....");
verify(signedDoc);