projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Set the format_id field to the itag of the format (closes #1624)
[youtube-dl]
/
youtube_dl
/
aes.py
diff --git
a/youtube_dl/aes.py
b/youtube_dl/aes.py
index 278f8bb8264947f0ae47de942d693a1c996ad78f..9a0c93fa6f4efb415f7e6dad25239a4c219a2542 100644
(file)
--- 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
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
BLOCK_SIZE_BYTES = 16
@@
-18,7
+18,7
@@
def aes_ctr_decrypt(data, key, counter):
@returns {int[]} decrypted data
"""
expanded_key = key_expansion(key)
@returns {int[]} decrypted data
"""
expanded_key = key_expansion(key)
- block_count = int(ceil(float(len(data)) /
/
BLOCK_SIZE_BYTES))
+ block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
decrypted_data=[]
for i in range(block_count):
decrypted_data=[]
for i in range(block_count):
@@
-118,7
+118,7
@@
def aes_decrypt_text(data, password, key_size_bytes):
return temp
decrypted_data = aes_ctr_decrypt(cipher, key, Counter())
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
return plaintext