mirror of https://github.com/jumpserver/jumpserver
fix: 删除`pycryptodome`依赖包安装(因为`pycryptodome`和`pycrypto`安装包目录冲突);只安装 `pycryptodomex`依赖包; 修改 `from crypto` 为 `from cryptodome`
parent
346f925032
commit
34be588887
|
@ -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
|
||||
|
||||
|
|
|
@ -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 django.conf import settings
|
||||
|
||||
|
|
|
@ -53,8 +53,7 @@ Pillow==7.1.0
|
|||
pyasn1==0.4.8
|
||||
pycparser==2.19
|
||||
pycrypto==2.6.1
|
||||
pycryptodome==3.9.7
|
||||
pycryptodomex==3.9.7
|
||||
pycryptodomex==3.9.9
|
||||
pyotp==2.2.6
|
||||
PyNaCl==1.2.1
|
||||
python-dateutil==2.6.1
|
||||
|
|
Loading…
Reference in New Issue