github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-01-29 21:51:31 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
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
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