From: rzhxeo Date: Wed, 28 Aug 2013 14:03:35 +0000 (+0200) Subject: Let aes_decrypt_text return bytes instead of unicode X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=0012690aae977d76e9162e2334989498366a8e94;p=youtube-dl Let aes_decrypt_text return bytes instead of unicode --- diff --git a/youtube_dl/aes.py b/youtube_dl/aes.py index 9913d59a4..9a0c93fa6 100644 --- a/youtube_dl/aes.py +++ b/youtube_dl/aes.py @@ -3,7 +3,7 @@ __all__ = ['aes_encrypt', 'key_expansion', 'aes_ctr_decrypt', 'aes_decrypt_text' import base64 from math import ceil -from .utils import bytes_to_intlist +from .utils import bytes_to_intlist, intlist_to_bytes BLOCK_SIZE_BYTES = 16 @@ -118,7 +118,7 @@ def aes_decrypt_text(data, password, key_size_bytes): return temp decrypted_data = aes_ctr_decrypt(cipher, key, Counter()) - plaintext = ''.join(map(lambda x: chr(x), decrypted_data)) + plaintext = intlist_to_bytes(decrypted_data) return plaintext