Fix: switch from pycryptodome to pycryptodomex (#564)

Fix: switch from pycryptodome to pycryptodomex
Azure · May 21, 2018 · 19dde42 · 19dde42
1 parent 3d16cf3
commit 19dde42
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 37 deletions.
diff --git a/aztk/client.py b/aztk/client.py
@@ -12,7 +12,7 @@
 import aztk.models as models
 import azure.batch.models as batch_models
 from azure.batch.models import batch_error
-from Crypto.PublicKey import RSA
+from Cryptodome.PublicKey import RSA
 from aztk.internal import cluster_data
 
 class Client:

diff --git a/aztk/node_scripts/Pipfile b/aztk/node_scripts/Pipfile
@@ -8,7 +8,7 @@ azure-batch = "==4.1.3"
 azure-mgmt-batch = "==5.0.0"
 azure-mgmt-storage = "==1.5.0"
 azure-storage-blob = "==1.1.0"
-pycryptodome = "==3.4.7"
+pycryptodomex = "==3.6.1"
 PyYAML = "==3.12"
 
 [dev-packages]

diff --git a/aztk/node_scripts/Pipfile.lock b/aztk/node_scripts/Pipfile.lock
diff --git a/aztk/node_scripts/install/create_user.py b/aztk/node_scripts/install/create_user.py
@@ -1,8 +1,8 @@
 import os
 import azure.batch.models as batch_models
 import azure.batch.models.batch_error as batch_error
-from Crypto.PublicKey import RSA
-from Crypto.Cipher import AES, PKCS1_OAEP
+from Cryptodome.PublicKey import RSA
+from Cryptodome.Cipher import AES, PKCS1_OAEP
 from datetime import datetime, timezone, timedelta
 import yaml
 '''

diff --git a/aztk/node_scripts/requirements.txt b/aztk/node_scripts/requirements.txt
@@ -3,5 +3,5 @@ azure-mgmt-batch==5.0.0
 azure-mgmt-storage==1.5.0
 azure-storage-blob==1.1.0
 pyyaml==3.12
-pycryptodome==3.4.7
+pycryptodomex>=3.4
 
diff --git a/aztk/spark/models/models.py b/aztk/spark/models/models.py
@@ -1,5 +1,5 @@
 from typing import List
-from Crypto.PublicKey import RSA
+from Cryptodome.PublicKey import RSA
 import azure.batch.models as batch_models
 import aztk.models
 from aztk import error

diff --git a/aztk/utils/secure_utils.py b/aztk/utils/secure_utils.py
@@ -1,6 +1,6 @@
-from Crypto.PublicKey import RSA
-from Crypto.Random import get_random_bytes
-from Crypto.Cipher import AES, PKCS1_OAEP
+from Cryptodome.PublicKey import RSA
+from Cryptodome.Random import get_random_bytes
+from Cryptodome.Cipher import AES, PKCS1_OAEP
 
 def encrypt_password(ssh_pub_key, password):
     if not password:

diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@ azure-mgmt-batch==5.0.0
 azure-mgmt-storage==1.5.0
 azure-storage-blob==1.1.0
 pyyaml==3.12
-pycryptodome==3.4.7
+pycryptodomex>=3.4
 paramiko==2.4.0
 
 # Development

diff --git a/setup.py b/setup.py
@@ -46,7 +46,7 @@ def find_package_files(root, directory, dest=""):
         "azure-mgmt-storage==1.5.0",
         "azure-storage-blob==1.1.0",
         "pyyaml>=3.12",
-        "pycryptodome>=3.4",
+        "pycryptodomex>=3.4",
         "paramiko>=2.4",
     ],
     package_data={