aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2022-01-04 09:31:49 -0500
committerRob Austein <sra@hactrn.net>2022-01-04 09:31:49 -0500
commit113241ef1c371cce9d0bb4d92665bfd93c8b5b06 (patch)
tree909a9ddd8517b904630a73c965171c9169c128c3
parent26f21d71459b005679d3a7d3091c741464268227 (diff)
Convert to PyCryptodome, drop ancient releasesHEADmaster
Debian Stretch and Ubuntu Xenial are pretty old and would be dropped soon anyway, but the main reason for dropping them now is so that the last set of binary packages we provide for them will predate the change from PyCrypto to PyCryptodome.
-rw-r--r--Makefile6
-rwxr-xr-xscripts/build-debian-control-files.py2
m---------source/sw/libhal0
m---------source/sw/pkcs110
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 9c6ae9f..e5dcfc1 100644
--- a/Makefile
+++ b/Makefile
@@ -42,9 +42,9 @@ REPO_UMASK := 002
PBUILDER_BASE := ${HOME}/pbuilder
PBUILDER_TARGETS := \
- $(addsuffix /amd64, debian/stretch debian/buster debian/bullseye ubuntu/xenial ubuntu/bionic ubuntu/focal) \
- $(addsuffix /i386, debian/stretch debian/buster debian/bullseye ubuntu/xenial ubuntu/bionic) \
- $(addsuffix /armhf, debian/stretch debian/buster debian/bullseye)
+ $(addsuffix /amd64, debian/buster debian/bullseye ubuntu/bionic ubuntu/focal) \
+ $(addsuffix /i386, debian/buster debian/bullseye ubuntu/bionic) \
+ $(addsuffix /armhf, debian/buster debian/bullseye)
# Where we upload the final results (if we do)
diff --git a/scripts/build-debian-control-files.py b/scripts/build-debian-control-files.py
index 46958ea..2000a7c 100755
--- a/scripts/build-debian-control-files.py
+++ b/scripts/build-debian-control-files.py
@@ -34,7 +34,7 @@ Architecture: any
Depends: python3,
python3-serial (>= 3.0),
python3-tornado (>= 4.0),
- python3-crypto,
+ python3-pycryptodome,
${{misc:Depends}},
${{python3:Depends}},
${{shlibs:Depends}}
diff --git a/source/sw/libhal b/source/sw/libhal
-Subproject f8c3655b7af461555b89f7394c396b7ed7a267e
+Subproject 6f0d8236b8622a68f42284ed1314d8acd86c89e
diff --git a/source/sw/pkcs11 b/source/sw/pkcs11
-Subproject b424b2af8b3e5097eb7e829d2a728a1720d5d0b
+Subproject 3d97567439d04b8e628be88793e5c555416198a