Blob Blame History Raw
diff -up ./setup.py.orig ./setup.py
--- ./setup.py.orig	2020-12-22 10:43:42.000000000 +0100
+++ ./setup.py	2020-12-22 23:45:35.087964685 +0100
@@ -21,7 +21,7 @@ if environ.get("STREAMLINK_USE_PYCRYPTO"
     deps.append("pycrypto")
 else:
     # this version of pycryptodome is known to work and has a Windows wheel for py2.7, py3.3-3.6
-    deps.append("pycryptodome>=3.4.3,<4")
+    deps.append("pycryptodomex>=3.4.3,<4")
 
 # for localization
 if environ.get("STREAMLINK_USE_PYCOUNTRY"):
diff -up ./src/streamlink/plugins/abematv.py.orig ./src/streamlink/plugins/abematv.py
--- ./src/streamlink/plugins/abematv.py.orig	2020-12-22 10:43:42.000000000 +0100
+++ ./src/streamlink/plugins/abematv.py	2020-12-22 23:45:01.783801545 +0100
@@ -8,7 +8,7 @@ import uuid
 from base64 import urlsafe_b64encode
 from binascii import unhexlify
 
-from Crypto.Cipher import AES
+from Cryptodome.Cipher import AES
 from requests import Response
 from requests.adapters import BaseAdapter
 
diff -up ./src/streamlink/plugins/rtve.py.orig ./src/streamlink/plugins/rtve.py
--- ./src/streamlink/plugins/rtve.py.orig	2020-12-22 10:43:42.000000000 +0100
+++ ./src/streamlink/plugins/rtve.py	2020-12-22 23:45:01.780801620 +0100
@@ -3,7 +3,7 @@ import logging
 import re
 from functools import partial
 
-from Crypto.Cipher import Blowfish
+from Cryptodome.Cipher import Blowfish
 
 from streamlink.plugin import Plugin, PluginArgument, PluginArguments
 from streamlink.plugin.api import useragents, validate
diff -up ./src/streamlink/plugins/steam.py.orig ./src/streamlink/plugins/steam.py
--- ./src/streamlink/plugins/steam.py.orig	2020-12-22 10:43:42.000000000 +0100
+++ ./src/streamlink/plugins/steam.py	2020-12-22 23:45:01.776801720 +0100
@@ -4,8 +4,8 @@ import re
 import time
 from html import unescape as html_unescape
 
-from Crypto.Cipher import PKCS1_v1_5
-from Crypto.PublicKey import RSA
+from Cryptodome.Cipher import PKCS1_v1_5
+from Cryptodome.PublicKey import RSA
 
 import streamlink
 from streamlink.exceptions import FatalPluginError
diff -up ./src/streamlink/plugins/ustvnow.py.orig ./src/streamlink/plugins/ustvnow.py
--- ./src/streamlink/plugins/ustvnow.py.orig	2020-12-22 10:43:42.000000000 +0100
+++ ./src/streamlink/plugins/ustvnow.py	2020-12-22 23:45:01.787801444 +0100
@@ -5,9 +5,9 @@ import re
 from urllib.parse import urljoin, urlparse
 from uuid import uuid4
 
-from Crypto.Cipher import AES
-from Crypto.Hash import SHA256
-from Crypto.Util.Padding import pad, unpad
+from Cryptodome.Cipher import AES
+from Cryptodome.Hash import SHA256
+from Cryptodome.Util.Padding import pad, unpad
 
 from streamlink import PluginError
 from streamlink.plugin import Plugin, PluginArgument, PluginArguments
diff -up ./src/streamlink/plugins/webtv.py.orig ./src/streamlink/plugins/webtv.py
--- ./src/streamlink/plugins/webtv.py.orig	2020-12-22 10:43:42.000000000 +0100
+++ ./src/streamlink/plugins/webtv.py	2020-12-22 23:45:01.772801821 +0100
@@ -3,7 +3,7 @@ import binascii
 import logging
 import re
 
-from Crypto.Cipher import AES
+from Cryptodome.Cipher import AES
 
 from streamlink.plugin import Plugin
 from streamlink.plugin.api import validate
diff -up ./src/streamlink/stream/hls.py.orig ./src/streamlink/stream/hls.py
--- ./src/streamlink/stream/hls.py.orig	2020-12-22 10:43:42.000000000 +0100
+++ ./src/streamlink/stream/hls.py	2020-12-22 23:45:01.791801344 +0100
@@ -5,7 +5,7 @@ from collections import OrderedDict, def
 from threading import Event
 from urllib.parse import urlparse
 
-from Crypto.Cipher import AES
+from Cryptodome.Cipher import AES
 from requests.exceptions import ChunkedEncodingError
 
 from streamlink.exceptions import StreamError
diff -up ./src/streamlink/utils/crypto.py.orig ./src/streamlink/utils/crypto.py
--- ./src/streamlink/utils/crypto.py.orig	2020-12-22 10:43:42.000000000 +0100
+++ ./src/streamlink/utils/crypto.py	2020-12-22 23:45:01.765801997 +0100
@@ -1,6 +1,6 @@
 import hashlib
 
-from Crypto.Cipher import AES
+from Cryptodome.Cipher import AES
 
 
 def evp_bytestokey(password, salt, key_len, iv_len):
diff -up ./tests/streams/test_hls.py.orig ./tests/streams/test_hls.py
--- ./tests/streams/test_hls.py.orig	2020-12-22 10:43:42.000000000 +0100
+++ ./tests/streams/test_hls.py	2020-12-22 23:45:01.762802072 +0100
@@ -4,7 +4,7 @@ from unittest.mock import Mock, patch
 
 import pytest
 import requests_mock
-from Crypto.Cipher import AES
+from Cryptodome.Cipher import AES
 
 from streamlink.session import Streamlink
 from streamlink.stream import hls