Author: ruchithf
Date: Thu Nov 8 10:38:57 2007
New Revision: 593249
URL: http://svn.apache.org/viewvc?rev=593249&view=rev
Log:
We have to make sure we use the correct length key to encrypt when using
different symm encr algos
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java?rev=593249&r1=593248&r2=593249&view=diff
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java
Thu Nov 8 10:38:57 2007
@@ -113,6 +113,7 @@
this.encryptionDerivedKeyLength = 192;
this.signatureDerivedKeyLength = 192;
this.minimumSymmetricKeyLength = 192;
+ this.maximumSymmetricKeyLength = 192;
} else if (Constants.ALGO_SUITE_BASIC128.equals(algoSuite)) {
this.digest = Constants.SHA1;
this.encryption = Constants.AES128;
@@ -123,6 +124,7 @@
this.encryptionDerivedKeyLength = 128;
this.signatureDerivedKeyLength = 128;
this.minimumSymmetricKeyLength = 128;
+ this.maximumSymmetricKeyLength = 128;
} else if (Constants.ALGO_SUITE_TRIPLE_DES.equals(algoSuite)) {
this.digest = Constants.SHA1;
this.encryption = Constants.TRIPLE_DES;
@@ -154,6 +156,7 @@
this.encryptionDerivedKeyLength = 192;
this.signatureDerivedKeyLength = 192;
this.minimumSymmetricKeyLength = 192;
+ this.maximumSymmetricKeyLength = 192;
} else if (Constants.ALGO_SUITE_BASIC128_RSA15.equals(algoSuite)) {
this.digest = Constants.SHA1;
this.encryption = Constants.AES128;
@@ -164,6 +167,7 @@
this.encryptionDerivedKeyLength = 128;
this.signatureDerivedKeyLength = 128;
this.minimumSymmetricKeyLength = 128;
+ this.maximumSymmetricKeyLength = 128;
} else if (Constants.ALGO_SUITE_TRIPLE_DES_RSA15.equals(algoSuite)) {
this.digest = Constants.SHA1;
this.encryption = Constants.TRIPLE_DES;
@@ -195,6 +199,7 @@
this.encryptionDerivedKeyLength = 192;
this.signatureDerivedKeyLength = 192;
this.minimumSymmetricKeyLength = 192;
+ this.maximumSymmetricKeyLength = 192;
} else if (Constants.ALGO_SUITE_BASIC128_SHA256.equals(algoSuite)) {
this.digest = Constants.SHA256;
this.encryption = Constants.AES128;
@@ -205,6 +210,7 @@
this.encryptionDerivedKeyLength = 128;
this.signatureDerivedKeyLength = 128;
this.minimumSymmetricKeyLength = 128;
+ this.maximumSymmetricKeyLength = 128;
} else if (Constants.ALGO_SUITE_TRIPLE_DES_SHA256.equals(algoSuite)) {
this.digest = Constants.SHA256;
this.encryption = Constants.TRIPLE_DES;
@@ -236,6 +242,7 @@
this.encryptionDerivedKeyLength = 192;
this.signatureDerivedKeyLength = 192;
this.minimumSymmetricKeyLength = 192;
+ this.maximumSymmetricKeyLength = 192;
} else if
(Constants.ALGO_SUITE_BASIC128_SHA256_RSA15.equals(algoSuite)) {
this.digest = Constants.SHA256;
this.encryption = Constants.AES128;
@@ -246,6 +253,7 @@
this.encryptionDerivedKeyLength = 128;
this.signatureDerivedKeyLength = 128;
this.minimumSymmetricKeyLength = 128;
+ this.maximumSymmetricKeyLength = 192;
} else if (Constants.ALGO_SUITE_TRIPLE_DES_SHA256_RSA15
.equals(algoSuite)) {
this.digest = Constants.SHA256;