From 32199b2e49dcb9ac3475b3f98ed33a8853832c8f Mon Sep 17 00:00:00 2001 From: martinl Date: Wed, 5 Aug 2020 22:58:43 +0300 Subject: [PATCH] Replace pycrypto with pycryptodome (#581) * replace pycrypto with pycryptodome * replace all instances with pycryptodome --- board/get_sdk.sh | 2 +- board/get_sdk_mac.sh | 2 +- requirements.txt | 2 +- setup.py | 2 +- tests/build/Dockerfile.panda_esp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/board/get_sdk.sh b/board/get_sdk.sh index 3a009a5..8496424 100755 --- a/board/get_sdk.sh +++ b/board/get_sdk.sh @@ -1,3 +1,3 @@ #!/bin/bash sudo apt-get install gcc-arm-none-eabi python-pip -sudo pip install libusb1 pycrypto requests +sudo pip install libusb1 pycryptodome requests diff --git a/board/get_sdk_mac.sh b/board/get_sdk_mac.sh index 24b93b5..2daba2a 100755 --- a/board/get_sdk_mac.sh +++ b/board/get_sdk_mac.sh @@ -4,4 +4,4 @@ sudo easy_install pip /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" brew tap ArmMbed/homebrew-formulae brew install python dfu-util arm-none-eabi-gcc -pip install --user libusb1 pycrypto requests +pip install --user libusb1 pycryptodome requests diff --git a/requirements.txt b/requirements.txt index 2f47971..68ddad3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ libusb1 == 1.6.6 numpy==1.17.2 hexdump>=3.3 -pycrypto==2.6.1 +pycryptodome==3.9.8 tqdm>=4.14.0 nose parameterized diff --git a/setup.py b/setup.py index ecb2699..a1272cb 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ setup( install_requires=[ 'libusb1 == 1.6.6', 'hexdump >= 3.3', - 'pycrypto >= 2.6.1', + 'pycryptodome >= 3.9.8', 'tqdm >= 4.14.0', 'requests' ], diff --git a/tests/build/Dockerfile.panda_esp b/tests/build/Dockerfile.panda_esp index 63c2cae..c4b4927 100644 --- a/tests/build/Dockerfile.panda_esp +++ b/tests/build/Dockerfile.panda_esp @@ -7,7 +7,7 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 -RUN pip3 install pycrypto==2.6.1 +RUN pip3 install pycryptodome==3.9.8 # Build esp toolchain RUN mkdir -p /panda/boardesp