openstack/deb-python-pysaml2
Code Issues Proposed changes

Correction so all aes encryption alg. can be used while decrypting.

Browse Source
This commit is contained in:
Hans Hörberg
2015-04-17 16:05:52 +02:00
parent d38e94715b
commit 805915bce5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/saml2/aes.py
View File

@@ -87,7 +87,7 @@ class AESCipher(object):
return cmsg return cmsg
def decrypt(self, msg, iv=None, padding="PKCS#7", b64dec=True): def decrypt(self, msg, iv=None, alg="aes_128_cbc", padding="PKCS#7", b64dec=True):
""" """
:param key: The encryption key :param key: The encryption key
:param iv: init vector :param iv: init vector
@@ -102,7 +102,7 @@ class AESCipher(object):
_iv = data[:AES.block_size] _iv = data[:AES.block_size]
if iv: if iv:
assert iv == _iv assert iv == _iv
cipher, iv = self.build_cipher(iv) cipher, iv = self.build_cipher(iv, alg=alg)
res = cipher.decrypt(data)[AES.block_size:] res = cipher.decrypt(data)[AES.block_size:]
if padding in ["PKCS#5", "PKCS#7"]: if padding in ["PKCS#5", "PKCS#7"]:
res = res[:-ord(res[-1])] res = res[:-ord(res[-1])]