From 7040d1baf7433d7b6d7998710c956410dc1dc603 Mon Sep 17 00:00:00 2001
From: wklken <wklken@gmail.com>
Date: Thu, 21 Mar 2024 17:28:43 +0800
Subject: [PATCH 1/2] feat(sercurity/pycrypto): replace pycrypto with
 pycryptodome

---
 paas2/esb/pyproject.toml       | 2 +-
 paas2/esb/requirements.txt     | 2 +-
 paas2/esb/requirements_dev.txt | 2 +-
 paas2/login/requirements.txt   | 2 +-
 paas2/paas/requirements.txt    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/paas2/esb/pyproject.toml b/paas2/esb/pyproject.toml
index 679700296..ab1cf2e8e 100644
--- a/paas2/esb/pyproject.toml
+++ b/paas2/esb/pyproject.toml
@@ -27,7 +27,7 @@ gevent = "1.1.2"
 cachetools = "3.1.1"
 enum34 = "1.1.6"
 ConcurrentLogHandler = "0.9.1"
-pycrypto = "2.6.1"
+pycryptodome = "3.20.0"
 PyJWT = "1.4.2"
 gunicorn = "19.9.0"
 uWSGI = "2.0.13.1"
diff --git a/paas2/esb/requirements.txt b/paas2/esb/requirements.txt
index dd93c4fe9..c289c925b 100644
--- a/paas2/esb/requirements.txt
+++ b/paas2/esb/requirements.txt
@@ -29,7 +29,7 @@ pluggy==0.13.1; python_version >= "2.7" and python_full_version < "3.0.0" or pyt
 py==1.10.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
 pyasn1==0.4.8
 pycparser==2.20; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
-pycrypto==2.6.1
+pycryptodome==3.20.0
 pygments==2.1.3
 pyjwt==1.4.2
 pymysql==0.6.7
diff --git a/paas2/esb/requirements_dev.txt b/paas2/esb/requirements_dev.txt
index d822ea0f8..4b8b5ed15 100644
--- a/paas2/esb/requirements_dev.txt
+++ b/paas2/esb/requirements_dev.txt
@@ -55,7 +55,7 @@ py==1.10.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_
 pyasn1==0.4.8
 pycodestyle==2.7.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
 pycparser==2.20; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
-pycrypto==2.6.1
+pycryptodome==3.20.0
 pyflakes==2.3.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
 pygments==2.1.3
 pyjwt==1.4.2
diff --git a/paas2/login/requirements.txt b/paas2/login/requirements.txt
index f4990ca46..aee9441a0 100644
--- a/paas2/login/requirements.txt
+++ b/paas2/login/requirements.txt
@@ -1,7 +1,7 @@
 django==1.11.29
 django-braces==1.13.0
 dj-static==0.0.6
-pycrypto==2.6.1
+pycryptodome==3.20.0
 requests==2.21.0
 pymysql==0.6.7
 gunicorn==19.9.0
diff --git a/paas2/paas/requirements.txt b/paas2/paas/requirements.txt
index 93ab321bd..84cf1fbff 100644
--- a/paas2/paas/requirements.txt
+++ b/paas2/paas/requirements.txt
@@ -1,7 +1,7 @@
 django==1.11.29
 dj-static==0.0.6
 mako==1.0.4
-pycrypto==2.6.1
+pycryptodome==3.20.0
 requests==2.21.0
 gunicorn==19.9.0
 uWSGI==2.0.13.1

From e7036804091a688e608c3d58c5381509519712d8 Mon Sep 17 00:00:00 2001
From: wklken <wklken@gmail.com>
Date: Thu, 21 Mar 2024 17:46:22 +0800
Subject: [PATCH 2/2] fix(paasagent/support-files/images): replace with
 pycryptodome==3.20.0

---
 paas2/paasagent/support-files/images/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paas2/paasagent/support-files/images/requirements.txt b/paas2/paasagent/support-files/images/requirements.txt
index af5b69755..238e36a61 100644
--- a/paas2/paasagent/support-files/images/requirements.txt
+++ b/paas2/paasagent/support-files/images/requirements.txt
@@ -12,7 +12,7 @@ Mako==1.0.4
 MarkupSafe==0.23
 meld3==1.0.2
 pbr==1.10.0
-pycrypto==2.6.1
+pycryptodome==3.20.0
 PyMySQL==0.6.7
 pytz==2016.6.1
 redis==2.10.5