[jbossws-commits] JBossWS SVN: r16011 - thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model.

Author: alessio.soldano(a)jboss.com Date: 2012-03-23 05:48:55 -0400 (Fri, 23 Mar 2012) New Revision: 16011 Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AlgorithmSuite.java Log: [JBPAPP-7599] Adding AES-GCM algorithms to AlgorithmSuite Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AlgorithmSuite.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AlgorithmSuite.java 2012-03-23 09:40:07 UTC (rev 16010) +++ thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AlgorithmSuite.java 2012-03-23 09:48:55 UTC (rev 16011) @@ -522,6 +522,36 @@ this.signatureDerivedKeyLength = 192; this.minimumSymmetricKeyLength = 192; this.maximumSymmetricKeyLength = 192; // due to use of 3des + } else if ("Basic128GCM".equals(algoSuite)) { + this.digest = SPConstants.SHA1; + this.encryption = "http://www.w3.org/2009/xmlenc11#aes128-gcm"; + this.symmetricKeyWrap = SPConstants.KW_AES128; + this.asymmetricKeyWrap = SPConstants.KW_RSA_OAEP; + this.encryptionKeyDerivation = SPConstants.P_SHA1_L128; + this.signatureKeyDerivation = SPConstants.P_SHA1_L128; + this.encryptionDerivedKeyLength = 128; + this.signatureDerivedKeyLength = 128; + this.minimumSymmetricKeyLength = 128; + } else if ("Basic192GCM".equals(algoSuite)) { + this.digest = SPConstants.SHA1; + this.encryption = "http://www.w3.org/2009/xmlenc11#aes192-gcm"; + this.symmetricKeyWrap = SPConstants.KW_AES192; + this.asymmetricKeyWrap = SPConstants.KW_RSA_OAEP; + this.encryptionKeyDerivation = SPConstants.P_SHA1_L192; + this.signatureKeyDerivation = SPConstants.P_SHA1_L192; + this.encryptionDerivedKeyLength = 192; + this.signatureDerivedKeyLength = 192; + this.minimumSymmetricKeyLength = 192; + } else if ("Basic256GCM".equals(algoSuite)) { + this.digest = SPConstants.SHA1; + this.encryption = "http://www.w3.org/2009/xmlenc11#aes256-gcm"; + this.symmetricKeyWrap = SPConstants.KW_AES256; + this.asymmetricKeyWrap = SPConstants.KW_RSA_OAEP; + this.encryptionKeyDerivation = SPConstants.P_SHA1_L256; + this.signatureKeyDerivation = SPConstants.P_SHA1_L192; + this.encryptionDerivedKeyLength = 256; + this.signatureDerivedKeyLength = 192; + this.minimumSymmetricKeyLength = 256; } else { throw new WSSPolicyException(new Message("INVALID_ALGORITHM", LOG, algoSuite)); }