Skip to content
This repository has been archived by the owner on Feb 3, 2021. It is now read-only.

Fix: switch from pycryptodome to pycryptodomex #564

Merged
merged 2 commits into from
May 21, 2018
Merged

Fix: switch from pycryptodome to pycryptodomex #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
027f91e
switch from pycryptodome to pycryptodomex
jafreck May 16, 2018
2c9304b
Merge branch 'master' into feature/pycryptomex-support
timotheeguerin May 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aztk/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion aztk/node_scripts/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
97 changes: 71 additions & 26 deletions aztk/node_scripts/Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions aztk/node_scripts/install/create_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
'''
Expand Down
2 changes: 1 addition & 1 deletion aztk/node_scripts/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion aztk/spark/models/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions aztk/utils/secure_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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={
Expand Down