From d23247b901babd2e7bf62159ded1a82d427eab95 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 29 May 2024 09:59:13 +1000 Subject: [PATCH] Tools: force pymonocypher version --- Tools/ardupilotwaf/chibios.py | 2 +- Tools/scripts/build_ci.sh | 2 +- Tools/scripts/signing/README.md | 2 +- Tools/scripts/signing/generate_keys.py | 2 +- Tools/scripts/signing/make_secure_bl.py | 2 +- Tools/scripts/signing/make_secure_fw.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Tools/ardupilotwaf/chibios.py b/Tools/ardupilotwaf/chibios.py index 6da05e0b84..50f098b61d 100644 --- a/Tools/ardupilotwaf/chibios.py +++ b/Tools/ardupilotwaf/chibios.py @@ -231,7 +231,7 @@ def sign_firmware(image, private_keyfile): try: import monocypher except ImportError: - Logs.error("Please install monocypher with: python3 -m pip install pymonocypher") + Logs.error("Please install monocypher with: python3 -m pip install pymonocypher==3.1.3.2") return None try: key = open(private_keyfile, 'r').read() diff --git a/Tools/scripts/build_ci.sh b/Tools/scripts/build_ci.sh index 732d2d71c6..0ebdb054e8 100755 --- a/Tools/scripts/build_ci.sh +++ b/Tools/scripts/build_ci.sh @@ -366,7 +366,7 @@ for t in $CI_BUILD_TARGET; do echo "Building signed firmwares" sudo apt-get update sudo apt-get install -y python3-dev - python3 -m pip install pymonocypher + python3 -m pip install pymonocypher==3.1.3.2 ./Tools/scripts/signing/generate_keys.py testkey $waf configure --board CubeOrange-ODID --signed-fw --private-key testkey_private_key.dat $waf copter diff --git a/Tools/scripts/signing/README.md b/Tools/scripts/signing/README.md index dc4032c009..1dc702bad8 100644 --- a/Tools/scripts/signing/README.md +++ b/Tools/scripts/signing/README.md @@ -12,7 +12,7 @@ firmware doesn't match any of the public keys in the bootloader. To generate a public/private key pair, run the following command: ``` - python3 -m pip install pymonocypher + python3 -m pip install pymonocypher==3.1.3.2 Tools/scripts/signing/generate_keys.py NAME ``` diff --git a/Tools/scripts/signing/generate_keys.py b/Tools/scripts/signing/generate_keys.py index 5da4388c30..3ff80baa98 100755 --- a/Tools/scripts/signing/generate_keys.py +++ b/Tools/scripts/signing/generate_keys.py @@ -9,7 +9,7 @@ import base64 try: import monocypher except ImportError: - print("Please install monocypher with: python3 -m pip install pymonocypher") + print("Please install monocypher with: python3 -m pip install pymonocypher==3.1.3.2") sys.exit(1) diff --git a/Tools/scripts/signing/make_secure_bl.py b/Tools/scripts/signing/make_secure_bl.py index bd60bee3c7..10c700d2ca 100755 --- a/Tools/scripts/signing/make_secure_bl.py +++ b/Tools/scripts/signing/make_secure_bl.py @@ -10,7 +10,7 @@ import base64 try: import monocypher except ImportError: - print("Please install monocypher with: python3 -m pip install pymonocypher") + print("Please install monocypher with: python3 -m pip install pymonocypher==3.1.3.2") sys.exit(1) # get command line arguments diff --git a/Tools/scripts/signing/make_secure_fw.py b/Tools/scripts/signing/make_secure_fw.py index 4e916090fc..fea837f580 100755 --- a/Tools/scripts/signing/make_secure_fw.py +++ b/Tools/scripts/signing/make_secure_fw.py @@ -10,7 +10,7 @@ import json, base64, zlib try: import monocypher except ImportError: - print("Please install monocypher with: python3 -m pip install pymonocypher") + print("Please install monocypher with: python3 -m pip install pymonocypher==3.1.3.2") sys.exit(1) key_len = 32