[jbossws-commits] JBossWS SVN: r16009 - in thirdparty/wss4j/branches/1_5_x-fixes: lib and 3 other directories.

Author: alessio.soldano(a)jboss.com Date: 2012-03-23 05:37:24 -0400 (Fri, 23 Mar 2012) New Revision: 16009 Added: thirdparty/wss4j/branches/1_5_x-fixes/lib/xmlsec-1.5.1.jar Removed: thirdparty/wss4j/branches/1_5_x-fixes/lib/xmlsec-1.4.5.jar Modified: thirdparty/wss4j/branches/1_5_x-fixes/pom.xml thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/WSConstants.java thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/WSSConfig.java thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecEncrypt.java thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/transform/STRTransform.java Log: [JBPAPP-7599] Upgrading to Apache Santuario 1.5.1 and adding support to AES-GCM algorithms Deleted: thirdparty/wss4j/branches/1_5_x-fixes/lib/xmlsec-1.4.5.jar =================================================================== (Binary files differ) Added: thirdparty/wss4j/branches/1_5_x-fixes/lib/xmlsec-1.5.1.jar =================================================================== (Binary files differ) Property changes on: thirdparty/wss4j/branches/1_5_x-fixes/lib/xmlsec-1.5.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: thirdparty/wss4j/branches/1_5_x-fixes/pom.xml =================================================================== --- thirdparty/wss4j/branches/1_5_x-fixes/pom.xml 2012-03-23 09:31:26 UTC (rev 16008) +++ thirdparty/wss4j/branches/1_5_x-fixes/pom.xml 2012-03-23 09:37:24 UTC (rev 16009) @@ -195,7 +195,7 @@ javax.xml.crypto.*, org.apache.xml.security.*, org.bouncycastle.*;resolution:=optional, - org.jcp.xml.dsig.internal.*, + org.apache.jcp.xml.dsig.internal.*, org.opensaml.*;resolution:=optional, *;resolution:=optional </Import-Package> @@ -398,7 +398,7 @@ <properties> - <xmlsec.version>1.4.5</xmlsec.version> + <xmlsec.version>1.5.1</xmlsec.version> <opensaml.version>1.1</opensaml.version> <xml.apis.version>1.3.04</xml.apis.version> <bcprov.jdk14.version>1.46</bcprov.jdk14.version> Modified: thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/WSConstants.java =================================================================== --- thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/WSConstants.java 2012-03-23 09:31:26 UTC (rev 16008) +++ thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/WSConstants.java 2012-03-23 09:37:24 UTC (rev 16009) @@ -242,6 +242,8 @@ */ public static final String AES_128 = EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128; + public static final String AES_128_GCM = EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128_GCM; + /** * Sets the {@link org.apache.ws.security.message.WSEncryptBody#build(Document, Crypto) encryption} * method to use AES with 256 bit key as the symmetric algorithm to encrypt data. @@ -253,6 +255,8 @@ */ public static final String AES_256 = EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES256; + public static final String AES_256_GCM = EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES256_GCM; + /** * Sets the {@link org.apache.ws.security.message.WSEncryptBody#build(Document, Crypto) encryption} * method to use AES with 192 bit key as the symmetric algorithm to encrypt data. @@ -264,6 +268,8 @@ */ public static final String AES_192 = EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES192; + public static final String AES_192_GCM = EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES192_GCM; + /** * Sets the {@link org.apache.ws.security.message.WSSignEnvelope#build(Document, Crypto) signature} * method to use DSA with SHA1 (DSS) to sign data. Modified: thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/WSSConfig.java =================================================================== --- thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/WSSConfig.java 2012-03-23 09:31:26 UTC (rev 16008) +++ thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/WSSConfig.java 2012-03-23 09:37:24 UTC (rev 16009) @@ -305,7 +305,6 @@ addJceProvider("BC", "org.bouncycastle.jce.provider.BouncyCastleProvider"); addJceProvider("JuiCE", "org.apache.security.juice.provider.JuiCEProviderOpenSSL"); } - Transform.init(); try { Transform.register( STRTransform.implementedTransformURI, Modified: thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecEncrypt.java =================================================================== --- thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecEncrypt.java 2012-03-23 09:31:26 UTC (rev 16008) +++ thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecEncrypt.java 2012-03-23 09:37:24 UTC (rev 16009) @@ -708,11 +708,11 @@ // String keyAlgorithm = JCEMapper.getJCEKeyAlgorithmFromURI(symEncAlgo); KeyGenerator keyGen = KeyGenerator.getInstance(keyAlgorithm); - if (symEncAlgo.equalsIgnoreCase(WSConstants.AES_128)) { + if (symEncAlgo.equalsIgnoreCase(WSConstants.AES_128) || symEncAlgo.equalsIgnoreCase(WSConstants.AES_128_GCM)) { keyGen.init(128); - } else if (symEncAlgo.equalsIgnoreCase(WSConstants.AES_192)) { + } else if (symEncAlgo.equalsIgnoreCase(WSConstants.AES_192) || symEncAlgo.equalsIgnoreCase(WSConstants.AES_192_GCM)) { keyGen.init(192); - } else if (symEncAlgo.equalsIgnoreCase(WSConstants.AES_256)) { + } else if (symEncAlgo.equalsIgnoreCase(WSConstants.AES_256) || symEncAlgo.equalsIgnoreCase(WSConstants.AES_256_GCM)) { keyGen.init(256); } return keyGen; Modified: thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/transform/STRTransform.java =================================================================== --- thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/transform/STRTransform.java 2012-03-23 09:31:26 UTC (rev 16008) +++ thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/transform/STRTransform.java 2012-03-23 09:37:24 UTC (rev 16009) @@ -40,6 +40,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.OutputStream; /** * Class STRTransform @@ -85,6 +86,11 @@ return STRTransform.implementedTransformURI; } + protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, + Transform transformObject) + throws IOException, CanonicalizationException, InvalidCanonicalizerException { + return enginePerformTransform(input, null, transformObject); + } /** * Method enginePerformTransform * @@ -92,7 +98,8 @@ * @throws CanonicalizationException * @throws InvalidCanonicalizerException */ - protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, + protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, + OutputStream os, Transform transformObject) throws IOException, CanonicalizationException, InvalidCanonicalizerException { doDebug = log.isDebugEnabled();