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 di...@apache.org on 2004/03/10 21:36:40 UTC
cvs commit: ws-fx/wss4j/interop WSETEST.cer WSSTest1.pfx WSSTest2.pfx wsstest1.properties wsstest2.properties
dims 2004/03/10 12:36:40
Modified: wss4j build.xml
wss4j/interop/org/apache/ws/axis/oasis Client_deploy.wsdd
wss4j/src/org/apache/ws/security/message WSEncryptBody.java
wss4j/interop wsstest1.properties wsstest2.properties
Added: wss4j/interop WSETEST.cer WSSTest1.pfx WSSTest2.pfx
Log:
Got both Scenario1 and Scenario2 working with Betrusted and MSFT endpoints.
Note:
***** Unfortunately BROKE TONS OF TESTS *****
Revision Changes Path
1.5 +2 -2 ws-fx/wss4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 10 Mar 2004 14:23:34 -0000 1.4
+++ build.xml 10 Mar 2004 20:36:40 -0000 1.5
@@ -416,8 +416,8 @@
<copy todir="${build.dir}/keys">
<fileset dir="${dir.keys}" includes="**"/>
</copy>
- <copy todir="${build.dir}/specs">
- <fileset dir="${dir.specs}" includes="*.pfx"/>
+ <copy todir="${build.dir}/interop">
+ <fileset dir="${dir.interop}" includes="*.pfx"/>
</copy>
<property name="deploy.xml.property" refid="deploy.xml.files"/>
1.8 +2 -2 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd
Index: Client_deploy.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Client_deploy.wsdd 10 Mar 2004 14:23:34 -0000 1.7
+++ Client_deploy.wsdd 10 Mar 2004 20:36:40 -0000 1.8
@@ -20,12 +20,12 @@
<parameter name="action" value="UsernameToken Encrypt"/>
<parameter name="user" value="Chris"/>
<parameter name="passwordCallbackClass"
- value="org.apache.ws.axis.oasis.PWCallback"/>
+ value="org.apache.ws.axis.oasis.PWCallback1"/>
<parameter name="passwordType" value="PasswordText" />
<parameter name="addUTElements" value="Nonce Created" />
<parameter name="encryptionPropFile" value="wsstest2.properties" />
<parameter name="encryptionKeyIdentifier" value="SKIKeyIdentifier" />
- <parameter name="encryptionUser" value="{4A309A0F-CCAB-4858-85CA-AFBA92B43B05}" />
+ <parameter name="encryptionUser" value="86ab6c4828bcde6983d81b2b59ff426c_a8272f6f-2c94-436e-aa71-d8d2be4647f6" />
<parameter name="encryptionParts"
value="{Element}{http://www.docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken" />
</handler>
1.5 +2 -2 ws-fx/wss4j/src/org/apache/ws/security/message/WSEncryptBody.java
Index: WSEncryptBody.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/security/message/WSEncryptBody.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSEncryptBody.java 10 Mar 2004 14:23:34 -0000 1.4
+++ WSEncryptBody.java 10 Mar 2004 20:36:40 -0000 1.5
@@ -329,10 +329,10 @@
}
Cipher cipher = null;
if (keyEncAlgo.equalsIgnoreCase(WSConstants.KEYTRANSPORT_RSA15)) {
- cipher = Cipher.getInstance("RSA");
+ cipher = Cipher.getInstance("RSA/ECB/PKCS1PADDING","BC");
}
else if (keyEncAlgo.equalsIgnoreCase(WSConstants.KEYTRANSPORT_RSAOEP)) {
- cipher = Cipher.getInstance("RSA/NONE/OAEPPADDING");
+ cipher = Cipher.getInstance("RSA/NONE/OAEPPADDING","BC");
}
else {
throw new WSSecurityException
1.2 +4 -4 ws-fx/wss4j/interop/wsstest1.properties
Index: wsstest1.properties
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/wsstest1.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wsstest1.properties 10 Mar 2004 14:23:34 -0000 1.1
+++ wsstest1.properties 10 Mar 2004 20:36:40 -0000 1.2
@@ -1,6 +1,6 @@
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=PKCS12
+org.apache.ws.security.crypto.merlin.keystore.type=pkcs12
org.apache.ws.security.crypto.merlin.keystore.provider=BC
-org.apache.ws.security.crypto.merlin.keystore.password=
-org.apache.ws.security.crypto.merlin.keystore.alias={E22EA2E5-2C32-4FD6-8DA3-1AAC75CFEFD2}
-org.apache.ws.security.crypto.merlin.file=specs/wsstest1.pfx
+org.apache.ws.security.crypto.merlin.keystore.password=xyz
+org.apache.ws.security.crypto.merlin.keystore.alias=7706c71b0628d6ecc85ea1e8ad62be60_a8272f6f-2c94-436e-aa71-d8d2be4647f6
+org.apache.ws.security.crypto.merlin.file=interop/WSSTest1.pfx
1.2 +4 -4 ws-fx/wss4j/interop/wsstest2.properties
Index: wsstest2.properties
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/wsstest2.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wsstest2.properties 10 Mar 2004 14:23:34 -0000 1.1
+++ wsstest2.properties 10 Mar 2004 20:36:40 -0000 1.2
@@ -1,6 +1,6 @@
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=PKCS12
+org.apache.ws.security.crypto.merlin.keystore.type=pkcs12
org.apache.ws.security.crypto.merlin.keystore.provider=BC
-org.apache.ws.security.crypto.merlin.keystore.password=
-org.apache.ws.security.crypto.merlin.keystore.alias={4A309A0F-CCAB-4858-85CA-AFBA92B43B05}
-org.apache.ws.security.crypto.merlin.file=specs/wsstest2.pfx
+org.apache.ws.security.crypto.merlin.keystore.password=xyz
+org.apache.ws.security.crypto.merlin.keystore.alias=86ab6c4828bcde6983d81b2b59ff426c_a8272f6f-2c94-436e-aa71-d8d2be4647f6
+org.apache.ws.security.crypto.merlin.file=interop/WSSTest2.pfx
1.1 ws-fx/wss4j/interop/WSETEST.cer
<<Binary file>>
1.1 ws-fx/wss4j/interop/WSSTest1.pfx
<<Binary file>>
1.1 ws-fx/wss4j/interop/WSSTest2.pfx
<<Binary file>>