mirror of
https://github.com/netbox-community/netbox.git
synced 2025-08-13 02:58:17 -06:00
Switch from "pycryptodome" to "pycryptodomex"
When NetBox is used outside an virtualenv it can happen that there's a Python package conflict between "pycryptodome", which is required by NetBox, and "pycrypto", which is required by another Python package. Thus switch from "pycryptodome" to its library independent variant "pycryptodomex". The latter one uses "Cryptodome" as package name instead of "Crypto".
This commit is contained in:
parent
5904f1f8ee
commit
5c5594520e
@ -81,4 +81,4 @@ py-gfm
|
||||
|
||||
# Extensive cryptographic library (fork of pycrypto)
|
||||
# https://github.com/Legrandin/pycryptodome
|
||||
pycryptodome
|
||||
pycryptodomex
|
||||
|
@ -1,6 +1,6 @@
|
||||
import base64
|
||||
|
||||
from Crypto.PublicKey import RSA
|
||||
from Cryptodome.PublicKey import RSA
|
||||
from django.db.models import Count
|
||||
from django.http import HttpResponseBadRequest
|
||||
from rest_framework.exceptions import ValidationError
|
||||
|
@ -1,5 +1,5 @@
|
||||
from Crypto.Cipher import PKCS1_OAEP
|
||||
from Crypto.PublicKey import RSA
|
||||
from Cryptodome.Cipher import PKCS1_OAEP
|
||||
from Cryptodome.PublicKey import RSA
|
||||
from django import forms
|
||||
from taggit.forms import TagField
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
import os
|
||||
import sys
|
||||
|
||||
from Crypto.Cipher import AES, PKCS1_OAEP
|
||||
from Crypto.PublicKey import RSA
|
||||
from Crypto.Util import strxor
|
||||
from Cryptodome.Cipher import AES, PKCS1_OAEP
|
||||
from Cryptodome.PublicKey import RSA
|
||||
from Cryptodome.Util import strxor
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.hashers import make_password, check_password
|
||||
from django.contrib.auth.models import Group, User
|
||||
|
@ -1,6 +1,6 @@
|
||||
import string
|
||||
|
||||
from Crypto.PublicKey import RSA
|
||||
from Cryptodome.PublicKey import RSA
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import User
|
||||
from django.core.exceptions import ValidationError
|
||||
|
@ -1,3 +1,4 @@
|
||||
django-rest-swagger
|
||||
psycopg2
|
||||
pycrypto
|
||||
pycryptodome
|
||||
|
@ -19,4 +19,4 @@ netaddr==0.7.19
|
||||
Pillow==6.2.0
|
||||
psycopg2-binary==2.8.3
|
||||
py-gfm==0.1.4
|
||||
pycryptodome==3.8.2
|
||||
pycryptodomex==3.8.2
|
||||
|
Loading…
Reference in New Issue
Block a user