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:
knobix 2019-11-13 13:50:43 +01:00
parent 5904f1f8ee
commit 5c5594520e
7 changed files with 10 additions and 9 deletions

View File

@ -81,4 +81,4 @@ py-gfm
# Extensive cryptographic library (fork of pycrypto) # Extensive cryptographic library (fork of pycrypto)
# https://github.com/Legrandin/pycryptodome # https://github.com/Legrandin/pycryptodome
pycryptodome pycryptodomex

View File

@ -1,6 +1,6 @@
import base64 import base64
from Crypto.PublicKey import RSA from Cryptodome.PublicKey import RSA
from django.db.models import Count from django.db.models import Count
from django.http import HttpResponseBadRequest from django.http import HttpResponseBadRequest
from rest_framework.exceptions import ValidationError from rest_framework.exceptions import ValidationError

View File

@ -1,5 +1,5 @@
from Crypto.Cipher import PKCS1_OAEP from Cryptodome.Cipher import PKCS1_OAEP
from Crypto.PublicKey import RSA from Cryptodome.PublicKey import RSA
from django import forms from django import forms
from taggit.forms import TagField from taggit.forms import TagField

View File

@ -1,9 +1,9 @@
import os import os
import sys import sys
from Crypto.Cipher import AES, PKCS1_OAEP from Cryptodome.Cipher import AES, PKCS1_OAEP
from Crypto.PublicKey import RSA from Cryptodome.PublicKey import RSA
from Crypto.Util import strxor from Cryptodome.Util import strxor
from django.conf import settings from django.conf import settings
from django.contrib.auth.hashers import make_password, check_password from django.contrib.auth.hashers import make_password, check_password
from django.contrib.auth.models import Group, User from django.contrib.auth.models import Group, User

View File

@ -1,6 +1,6 @@
import string import string
from Crypto.PublicKey import RSA from Cryptodome.PublicKey import RSA
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError

View File

@ -1,3 +1,4 @@
django-rest-swagger django-rest-swagger
psycopg2 psycopg2
pycrypto pycrypto
pycryptodome

View File

@ -19,4 +19,4 @@ netaddr==0.7.19
Pillow==6.2.0 Pillow==6.2.0
psycopg2-binary==2.8.3 psycopg2-binary==2.8.3
py-gfm==0.1.4 py-gfm==0.1.4
pycryptodome==3.8.2 pycryptodomex==3.8.2