openstack/trove
Code Issues Proposed changes

Merge "encrypt_data(): don't encode IV to base64"

Browse Source
This commit is contained in:
Jenkins
2016-04-01 21:36:19 +00:00
committed by Gerrit Code Review
parent 1d5e743da3 fdab0d8bc1
commit c92a16d731
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trove/common/crypto_utils.py
View File

@@ -47,7 +47,7 @@ def unpad_after_decryption(data):
def encrypt_data(data, key, iv_bit_count=IV_BIT_COUNT): def encrypt_data(data, key, iv_bit_count=IV_BIT_COUNT):
md5_key = hashlib.md5(key).hexdigest() md5_key = hashlib.md5(key).hexdigest()
iv = encode_data(Random.new().read(iv_bit_count))[:iv_bit_count] iv = Random.new().read(iv_bit_count)[:iv_bit_count]
aes = AES.new(md5_key, AES.MODE_CBC, iv) aes = AES.new(md5_key, AES.MODE_CBC, iv)
data = pad_for_encryption(data, iv_bit_count) data = pad_for_encryption(data, iv_bit_count)
encrypted = aes.encrypt(data) encrypted = aes.encrypt(data)