Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace PyCrypto with PyCryptodome #91

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ See the [Google Drive setup instructions](https://github.com/gallantlab/cottonca

### Encryption

`cottoncandy`provides a transparent encryption interface for AWS S3 and Google Drive. This requires the `pycrypto` package.
`cottoncandy`provides a transparent encryption interface for AWS S3 and Google Drive. This requires the `pycryptodome` package.

**WARNING**: Encryption is an advance feature. Make sure to create a backup of the encryption keys (stored in `~/.config/cottoncandy/options.cfg`). If you lose your encryption keys you will not be able to recover your data!

Expand Down
2 changes: 1 addition & 1 deletion cottoncandy/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def generate_AES_key(bytes = 32):
from Crypto import Random
return Random.get_random_bytes(bytes)
except ImportError:
print('PyCrypto not install. Reading from /dev/random instead')
print('PyCrypto/PyCryptoDome not installed. Reading from /dev/random instead')
with open('/dev/random', 'r') as rand:
return rand.read(bytes)

Expand Down
2 changes: 1 addition & 1 deletion google_drive_setup_instructions.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
To set up Google Drive access, you need to jump through many hoops.

#### Python dependencies
You need to have `pydrive` and `pycrypto` installed.
You need to have `pydrive` and `pycryptodome` installed.

#### Google Drive API setup
1. Go to https://console.developers.google.com
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ boto3>=1.2.3, <=1.15
dask[array]
cloudpickle>=0.2.2
toolz>=0.7.4
pycrypto>=2.6.1
pycryptodome>=2.6.1
pydrive>=1.3.1
numcodecs>=0.5.5
six>=1.11.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def main(**kwargs):
include_package_data=True,
long_description=long_description,
install_requires=['six', 'botocore', 'boto3', 'python-dateutil',
'PyDrive', 'pycrypto'],
'PyDrive', 'pycryptodome'],
**kwargs)

if __name__ == "__main__":
Expand Down