github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: 删除`pycryptodome`依赖包安装(因为`pycryptodome`和`pycrypto`安装包目录冲突);只安装 `pycryptodomex`依赖包; 修改 `from crypto` 为 `from cryptodome`

pull/5515/head^2
Bai 2021-01-22 15:57:29 +08:00 committed by Jiangjie.Bai
parent d04b90b8e8
commit efb9f48c6f
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/authentication/utils.py
View File

@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
#
import base64
from Crypto.PublicKey import RSA
from Crypto.Cipher import PKCS1_v1_5
from Crypto import Random
from Cryptodome.PublicKey import RSA
from Cryptodome.Cipher import PKCS1_v1_5
from Cryptodome import Random
from common.utils import get_logger

6
apps/common/utils/crypto.py
View File

@ -1,7 +1,7 @@
import base64
from Crypto.Cipher import AES
from Crypto.Util.Padding import pad
from Crypto.Random import get_random_bytes
from Cryptodome.Cipher import AES
from Cryptodome.Util.Padding import pad
from Cryptodome.Random import get_random_bytes
from gmssl.sm4 import CryptSM4, SM4_ENCRYPT, SM4_DECRYPT
from django.conf import settings

1
requirements/requirements.txt
View File

@ -53,7 +53,6 @@ Pillow==7.1.0
pyasn1==0.4.8
pycparser==2.19
pycrypto==2.6.1
pycryptodome==3.9.9
pycryptodomex==3.9.9
pyotp==2.2.6
PyNaCl==1.2.1