From 0879b2d99d783cbe3a1a82030414ae5494f957f7 Mon Sep 17 00:00:00 2001 From: Hetavi Shah Date: Tue, 2 Dec 2025 11:19:17 +0530 Subject: [PATCH] [OND211-2329]: Updated imports from Cryto to Cryptodome in all files. --- admin/client/admin_client.py | 4 ++-- api/utils/crypt.py | 4 ++-- test/testcases/conftest.py | 4 ++-- test/testcases/test_http_api/test_user_management/conftest.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/admin/client/admin_client.py b/admin/client/admin_client.py index 4b7880090..4b210d2b5 100644 --- a/admin/client/admin_client.py +++ b/admin/client/admin_client.py @@ -18,8 +18,8 @@ import argparse import base64 from cmd import Cmd -from Crypto.PublicKey import RSA -from Crypto.Cipher import PKCS1_v1_5 as Cipher_pkcs1_v1_5 +from Cryptodome.PublicKey import RSA +from Cryptodome.Cipher import PKCS1_v1_5 as Cipher_pkcs1_v1_5 from typing import Dict, List, Any from lark import Lark, Transformer, Tree import requests diff --git a/api/utils/crypt.py b/api/utils/crypt.py index 174ca3568..7aa6126d7 100644 --- a/api/utils/crypt.py +++ b/api/utils/crypt.py @@ -43,8 +43,8 @@ def decrypt(line): def decrypt2(crypt_text): from base64 import b64decode, b16decode - from Crypto.Cipher import PKCS1_v1_5 as Cipher_PKCS1_v1_5 - from Crypto.PublicKey import RSA + from Cryptodome.Cipher import PKCS1_v1_5 as Cipher_PKCS1_v1_5 + from Cryptodome.PublicKey import RSA decode_data = b64decode(crypt_text) if len(decode_data) == 127: hex_fixed = '00' + decode_data.hex() diff --git a/test/testcases/conftest.py b/test/testcases/conftest.py index 931bed069..9473022c7 100644 --- a/test/testcases/conftest.py +++ b/test/testcases/conftest.py @@ -21,8 +21,8 @@ from typing import Any, Dict, Optional import pytest import requests -from Crypto.Cipher import PKCS1_v1_5 as Cipher_pkcs1_v1_5 -from Crypto.PublicKey import RSA +from Cryptodome.Cipher import PKCS1_v1_5 as Cipher_pkcs1_v1_5 +from Cryptodome.PublicKey import RSA from configs import EMAIL, HOST_ADDRESS, VERSION, ZHIPU_AI_API_KEY from libs.auth import RAGFlowWebApiAuth diff --git a/test/testcases/test_http_api/test_user_management/conftest.py b/test/testcases/test_http_api/test_user_management/conftest.py index eb242de0c..f367b060d 100644 --- a/test/testcases/test_http_api/test_user_management/conftest.py +++ b/test/testcases/test_http_api/test_user_management/conftest.py @@ -25,8 +25,8 @@ from pathlib import Path from typing import Any import pytest -from Crypto.Cipher import PKCS1_v1_5 as Cipher_pkcs1_v1_5 -from Crypto.PublicKey import RSA +from Cryptodome.Cipher import PKCS1_v1_5 as Cipher_pkcs1_v1_5 +from Cryptodome.PublicKey import RSA from common import get_user_info from libs.auth import RAGFlowWebApiAuth