From 2e2591e41f31449bdb04f3b333fdbc8413a2053d Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 24 Oct 2022 10:09:14 -0600 Subject: [PATCH] fix from Keith for aes related FTBFS --- debian/changelog | 7 +++++++ debian/patches/aes-fix.patch | 38 ++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 46 insertions(+) create mode 100644 debian/patches/aes-fix.patch diff --git a/debian/changelog b/debian/changelog index 0f637bb5..539287cd 100644 --- 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 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 index 00000000..d8b5def7 --- /dev/null +++ b/debian/patches/aes-fix.patch @@ -0,0 +1,38 @@ +Description: + 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 +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: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +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 e69de29b..0d94e03e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +aes-fix.patch -- 2.47.2