[jbossws-commits] JBossWS SVN: r17242 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594: ant-import and 8 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Jan 22 04:48:17 EST 2013
Author: mmusaji
Date: 2013-01-22 04:48:17 -0500 (Tue, 22 Jan 2013)
New Revision: 17242
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/ant-import/macros-deploy-native.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/Constants.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/STRTransform.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/java/org/jboss/test/ws/jaxws/
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/version.properties
Log:
[JBPAPP-10594] Backport JBPAPP-7601 - Move to Santuario 1.5.2 and add GCM algorithm support
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/native/branches/jbossws-native-2.0.1.SP2_CP:17228
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/ant-import/macros-deploy-native.xml 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/ant-import/macros-deploy-native.xml 2013-01-22 09:48:17 UTC (rev 17242)
@@ -143,6 +143,7 @@
<include name="policy.jar"/>
<include name="stax-ex.jar"/>
<include name="streambuffer.jar"/>
+ <include name="xmlsec.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
</copy>
@@ -182,6 +183,7 @@
<include name="policy.jar"/>
<include name="stax-ex.jar"/>
<include name="streambuffer.jar"/>
+ <include name="xmlsec.jar"/>
<include name="wsdl4j.jar"/>
<!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/ant-import-tests/build-jars-jaxws.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml:14048
+ /stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml:17228
/stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml:14048
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/trunk/modules/core/src/main/java:11162
+ /stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java:17228
/stack/native/trunk/modules/core/src/main/java:11162
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/Constants.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/Constants.java 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/Constants.java 2013-01-22 09:48:17 UTC (rev 17242)
@@ -51,7 +51,7 @@
public static final String XML_ENCRYPTION_NS = EncryptionConstants.EncryptionSpecNS;
- public static final String XML_ENCRYPTION_PREFIX = "xenc";
+ public static final String XML_ENCRYPTION_PREFIX = "ds"; //xmlsec 1.4.2 requires this to be "ds" to correctly create KeyInfo elements
public static final String ID = "Id";
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2013-01-22 09:48:17 UTC (rev 17242)
@@ -71,6 +71,9 @@
algorithms.put("aes-128", new Algorithm("AES", XMLCipher.AES_128, 128));
algorithms.put("aes-192", new Algorithm("AES", XMLCipher.AES_192, 192));
algorithms.put("aes-256", new Algorithm("AES", XMLCipher.AES_256, 256));
+ algorithms.put("aes-128-gcm", new Algorithm("AES", XMLCipher.AES_128_GCM, 128));
+ algorithms.put("aes-192-gcm", new Algorithm("AES", XMLCipher.AES_192_GCM, 192));
+ algorithms.put("aes-256-gcm", new Algorithm("AES", XMLCipher.AES_256_GCM, 256));
algorithms.put("tripledes", new Algorithm("TripleDes", XMLCipher.TRIPLEDES, 168));
}
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/STRTransform.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/STRTransform.java 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/STRTransform.java 2013-01-22 09:48:17 UTC (rev 17242)
@@ -22,6 +22,7 @@
package org.jboss.ws.extensions.security;
import java.io.IOException;
+import java.io.OutputStream;
import javax.xml.parsers.ParserConfigurationException;
@@ -91,7 +92,14 @@
@Override
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input) throws IOException, CanonicalizationException,
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform transformObject) throws IOException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformationException, ParserConfigurationException, SAXException
+ {
+ return enginePerformTransform(input, null, transformObject);
+ }
+
+ @Override
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, OutputStream os, Transform transformObject) throws IOException, CanonicalizationException,
InvalidCanonicalizerException, TransformationException, ParserConfigurationException, SAXException
{
@@ -115,7 +123,7 @@
element = token.getSTRTransformElement();
// Obtain the canonicalizer specified in the transformation parameters
- Element parameters = XMLUtils.selectNode(this._transformObject.getElement().getFirstChild(), Constants.WSSE_NS,
+ Element parameters = XMLUtils.selectNode(transformObject.getElement().getFirstChild(), Constants.WSSE_NS,
"TransformationParameters", 0);
if (parameters == null)
throw new TransformationException("wsse:TransformationParameters expected!");
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2013-01-22 09:48:17 UTC (rev 17242)
@@ -75,6 +75,7 @@
try
{
cipher = XMLCipher.getInstance();
+ cipher.init(XMLCipher.DECRYPT_MODE, null);
key = cipher.loadEncryptedKey(element);
}
catch (XMLSecurityException e)
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java 2013-01-22 09:48:17 UTC (rev 17242)
@@ -172,6 +172,7 @@
Element element = document.createElementNS(Constants.WSSE_NS, Constants.WSSE_HEADER);
Util.addNamespace(element, Constants.WSSE_PREFIX, Constants.WSSE_NS);
Util.addNamespace(element, Constants.WSU_PREFIX, Constants.WSU_NS);
+ Util.addNamespace(element, Constants.XML_ENCRYPTION_PREFIX, Constants.XML_SIGNATURE_NS);
if (timestamp != null)
element.appendChild(timestamp.getElement());
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/java/org/jboss/test/ws/jaxws
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws:14048
+ /stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws:17228
/stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws:14048
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws:14048
+ /stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws:17228
/stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws:14048
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml 2013-01-22 09:48:17 UTC (rev 17242)
@@ -3,7 +3,7 @@
<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
<config>
- <encrypt type="x509v3" alias="wsse"/>
+ <encrypt type="x509v3" algorithm="aes-128-gcm" alias="wsse"/>
<requires>
<encryption/>
</requires>
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml 2013-01-22 09:48:17 UTC (rev 17242)
@@ -7,7 +7,7 @@
<trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
<trust-store-password>jbossws</trust-store-password>
<config>
- <encrypt type="x509v3" alias="wsse"/>
+ <encrypt type="x509v3" algorithm="aes-128-gcm" alias="wsse"/>
<requires>
<encryption/>
</requires>
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/version.properties 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/version.properties 2013-01-22 09:48:17 UTC (rev 17242)
@@ -15,7 +15,7 @@
implementation.vendor.id=http://www.jboss.org
# Thirdparty library versions that are referenced in component-info.xml
-apache-xmlsec=1.3.0
+apache-xmlsec=1.5.2
ibm-wsdl4j=1.6.2
jbpm-bpel=1.1.0.Beta5
stax-api=1.0
More information about the jbossws-commits
mailing list