Skip to content

Commit 017ac97

Browse files
committed
configure.ac: remove prohibition on ARM32 --enable-armasm with --enable-aesgcm-stream (current code in aes.c falls back to C gracefully in that case).
1 parent 492ff38 commit 017ac97

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

configure.ac

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,13 +1383,13 @@ then
13831383
esac
13841384
fi
13851385

1386-
# 32 bit armasm and RISC-V asm don't yet support WOLFSSL_AESGCM_STREAM. Disable
1386+
# RISC-V asm doesn't yet support WOLFSSL_AESGCM_STREAM. Disable
13871387
# implicit activation, and error on explicit activation.
1388-
if test "$enable_riscv_asm" = "yes" || (test "$enable_armasm" = "yes" && test "$host_cpu" != "aarch64" && test "$host_cpu" != "aarch64_be")
1388+
if test "$enable_riscv_asm" = "yes"
13891389
then
13901390
if test "$enable_aesgcm_stream" = "yes"
13911391
then
1392-
AC_MSG_ERROR([32 bit armasm and RISC-V asm don't yet support WOLFSSL_AESGCM_STREAM.])
1392+
AC_MSG_ERROR([RISC-V asm doesn't yet support WOLFSSL_AESGCM_STREAM.])
13931393
fi
13941394
enable_aesgcm_stream=no
13951395
fi
@@ -10689,11 +10689,9 @@ then
1068910689
if test "$ENABLED_AESGCM" = "no"
1069010690
then
1069110691
AC_MSG_ERROR([AES-GCM streaming is enabled but AES-GCM is disabled.])
10692-
elif test "$ENABLED_RISCV_ASM" = "yes" || \
10693-
(test "$ENABLED_ARMASM" = "yes" && \
10694-
test "$host_cpu" != "aarch64" && test "$host_cpu" != "aarch64_be")
10692+
elif test "$ENABLED_RISCV_ASM" = "yes"
1069510693
then
10696-
AC_MSG_ERROR([32 bit armasm and RISC-V asm don't yet support WOLFSSL_AESGCM_STREAM.])
10694+
AC_MSG_ERROR([RISC-V asm doesn't yet support WOLFSSL_AESGCM_STREAM.])
1069710695
else
1069810696
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AESGCM_STREAM"
1069910697
AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_AESGCM_STREAM"

0 commit comments

Comments
 (0)