From 113241ef1c371cce9d0bb4d92665bfd93c8b5b06 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Tue, 4 Jan 2022 09:31:49 -0500
Subject: Convert to PyCryptodome, drop ancient releases

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.
---
 Makefile                              | 6 +++---
 scripts/build-debian-control-files.py | 2 +-
 source/sw/libhal                      | 2 +-
 source/sw/pkcs11                      | 2 +-
 4 files changed, 6 insertions(+), 6 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
index f8c3655..6f0d823 160000
--- a/source/sw/libhal
+++ b/source/sw/libhal
@@ -1 +1 @@
-Subproject commit f8c3655b7af461555b89f7394c396b7ed7a267ee
+Subproject commit 6f0d8236b8622a68f42284ed1314d8acd86c89ed
diff --git a/source/sw/pkcs11 b/source/sw/pkcs11
index b424b2a..3d97567 160000
--- a/source/sw/pkcs11
+++ b/source/sw/pkcs11
@@ -1 +1 @@
-Subproject commit b424b2af8b3e5097eb7e829d2a728a1720d5d0bd
+Subproject commit 3d97567439d04b8e628be88793e5c555416198a4
-- 
cgit v1.2.3