fix from Keith for aes related FTBFS

diff --git a/debian/changelog b/debian/changelog
index 0f637bb58a6b6d0af3689260658f3a9b34084c1d..539287cdad86dd4ecaca541e8035ff773acf3025 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+altos (1.9.11-2) unstable; urgency=medium
+
+  * cherry pick patch from master that increases AES IV buffer to hold 
+    maximum AES state, closes: #1022301
+
+ -- Bdale Garbee <bdale@gag.com>  Mon, 24 Oct 2022 10:02:35 -0600
+
 altos (1.9.11-1) unstable; urgency=medium
 
   [ Bdale Garbee ]

diff --git a/debian/patches/aes-fix.patch b/debian/patches/aes-fix.patch
new file mode 100644 (file)
index 0000000..d8b5def
--- /dev/null
+++ b/debian/patches/aes-fix.patch
@@ -0,0 +1,38 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ altos (1.9.11-2) unstable; urgency=medium
+ .
+   * cherry pick patch from master that increases AES IV buffer to hold
+     maximum AES state, closes: #1022301
+Author: Bdale Garbee <bdale@gag.com>
+Bug-Debian: https://bugs.debian.org/1022301
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2022-10-24
+
+--- altos-1.9.11.orig/src/aes/ao_aes.c
++++ altos-1.9.11/src/aes/ao_aes.c
+@@ -362,7 +362,7 @@ uint8_t ao_aes_mutex;
+ static word32 key[16/4];
+ static roundkey       rkk;
+ 
+-static word32 iv[16/4];
++static word32 iv[32/4];
+ 
+ void
+ ao_aes_set_mode(enum ao_aes_mode mode)

diff --git a/debian/patches/series b/debian/patches/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0d94e03ed6f65e944b1335fa32e0c20df611060f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+aes-fix.patch