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

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

v2.4
Bai 2021-01-25 11:55:39 +08:00 committed by Jiangjie.Bai
parent 346f925032
commit 34be588887
3 changed files with 7 additions and 8 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 -*- # -*- coding: utf-8 -*-
# #
import base64 import base64
from Crypto.PublicKey import RSA from Cryptodome.PublicKey import RSA
from Crypto.Cipher import PKCS1_v1_5 from Cryptodome.Cipher import PKCS1_v1_5
from Crypto import Random from Cryptodome import Random
from common.utils import get_logger from common.utils import get_logger

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

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

3
requirements/requirements.txt
View File

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