commit 169d7c2a58b74f45e806c24233d275921c2f79f0
author Scott Cantor <scantor@apache.org> Tue May 14 21:24:14 2013 +0000
committer Scott Cantor <scantor@apache.org> Tue May 14 21:24:14 2013 +0000
tree dfd42c23b703a3fe1bf8513a79a61bf77e2a45ac
parent 608b54de57cc737d1d75c43393450bc0d4d69718

Fix key size checking, and avoid breaking existing apps.


git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-cpp/trunk@1482595 13f79535-47bb-0310-9956-ffa450edef68

xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp

diff --git a/xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp b/xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp
index a55ffb8..df0d24f 100644
--- a/xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp
+++ b/xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp
@@ -1133,25 +1133,25 @@
 	XSECCryptoSymmetricKey * sk = NULL;
 
 	if (strEquals(uri, DSIGConstants::s_unicodeStrURI3DES_CBC)) {
-        if (keyLen != 192)
+        if (keyLen < 192 / 8)
             throw XSECException(XSECException::CipherError, 
 		        "XENCAlgorithmHandlerDefault - key size was invalid");
 		sk = XSECPlatformUtils::g_cryptoProvider->keySymmetric(XSECCryptoSymmetricKey::KEY_3DES_192);
 	}
 	else if (strEquals(uri, DSIGConstants::s_unicodeStrURIAES128_CBC) || strEquals(uri, DSIGConstants::s_unicodeStrURIAES128_GCM)) {
-        if (keyLen != 128)
+        if (keyLen < 128 / 8)
             throw XSECException(XSECException::CipherError, 
 		        "XENCAlgorithmHandlerDefault - key size was invalid");
 		sk = XSECPlatformUtils::g_cryptoProvider->keySymmetric(XSECCryptoSymmetricKey::KEY_AES_128);
 	}
 	else if (strEquals(uri, DSIGConstants::s_unicodeStrURIAES192_CBC) || strEquals(uri, DSIGConstants::s_unicodeStrURIAES192_GCM)) {
-        if (keyLen != 192)
+        if (keyLen < 192 / 8)
             throw XSECException(XSECException::CipherError, 
 		        "XENCAlgorithmHandlerDefault - key size was invalid");
 		sk = XSECPlatformUtils::g_cryptoProvider->keySymmetric(XSECCryptoSymmetricKey::KEY_AES_192);
 	}
 	else if (strEquals(uri, DSIGConstants::s_unicodeStrURIAES256_CBC) || strEquals(uri, DSIGConstants::s_unicodeStrURIAES256_GCM)) {
-        if (keyLen != 256)
+        if (keyLen < 256 / 8)
             throw XSECException(XSECException::CipherError, 
 		        "XENCAlgorithmHandlerDefault - key size was invalid");
 		sk = XSECPlatformUtils::g_cryptoProvider->keySymmetric(XSECCryptoSymmetricKey::KEY_AES_256);