Merge branch 'samd21' of ssh://git.gag.com/scm/git/fw/altos into samd21

diff --git a/src/Makefile.defs b/src/Makefile.defs
index f9387b07184af04a7955f8237e58fcc5a3943e67..c2d5247cd1ea1cfcbf4129b2e7c291e2f87c3ed7 100644 (file)
--- a/src/Makefile.defs
+++ b/src/Makefile.defs
@@ -23,7 +23,7 @@ OPT=-Os -Wl,-Map=$(PROGNAME)-$(VERSION).map
 
 PICOLIBC_CFLAGS= \
        -specs=picolibc.specs \
-       -Wl,--gc-sections -ffunction-sections -fdata-sections \
+       -Wl,--gc-sections \
        $(PICOLIBC_PRINTF_CFLAGS)
 
 AO_CFLAGS=\

diff --git a/src/aes/ao_aes.c b/src/aes/ao_aes.c
index 0bc8188e3d2ae68c7eca2b78a214b473ce34b712..ce87e3a80bf491c09cd6f11bd760e30988c99dd2 100644 (file)
--- a/src/aes/ao_aes.c
+++ b/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)