Skip to content

Commit 315ebf5

Browse files
authored
Merge pull request #9615 from SparkiDev/arm32_aes_block_inline
AES ARM32/Thumb2: option to inline block
2 parents 5f68ea0 + a1089ba commit 315ebf5

5 files changed

Lines changed: 43098 additions & 6966 deletions

File tree

configure.ac

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3389,6 +3389,13 @@ then
33893389
ENABLED_ARMASM_CRYPTO=no
33903390
;;
33913391
sha256-small)
3392+
case $host_cpu in
3393+
*arm*)
3394+
;;
3395+
*)
3396+
AC_MSG_ERROR([SHA256 small option only available on 32-bit ARM CPU.])
3397+
break;;
3398+
esac
33923399
ENABLED_ARMASM_SHA256_SMALL=yes
33933400
;;
33943401
sha512-crypto | sha3-crypto)
@@ -3458,8 +3465,25 @@ then
34583465
esac
34593466
ENABLED_ARMASM_BARRIER_DETECT=yes
34603467
;;
3468+
aes-block-dup)
3469+
case $host_cpu in
3470+
*arm*)
3471+
;;
3472+
*)
3473+
AC_MSG_ERROR([AES assembly option only available on 32-bit ARM CPU.])
3474+
break;;
3475+
esac
3476+
ENABLED_ARMASM_AES_BLOCK_INLINE=yes
3477+
;;
34613478
*)
3462-
AC_MSG_ERROR([Invalid choice of ARM asm inclusions (yes, sha512-crypto, sha3-crypto): $ENABLED_ARMASM.])
3479+
case $host_cpu in
3480+
*aarch64*)
3481+
AC_MSG_ERROR([Invalid choice of ARM asm inclusions (yes, inline, no-crypto, sha512-crypto, sha3-crypto, no-sha512-crypto, no-sha3-crypto, barrier-sb, barrier-detect): $ENABLED_ARMASM.])
3482+
break;;
3483+
*arm*)
3484+
AC_MSG_ERROR([Invalid choice of ARM asm inclusions (yes, inline, no-crypto, sha256-small, aes-block-dup): $ENABLED_ARMASM.])
3485+
break;;
3486+
esac
34633487
break;;
34643488
esac
34653489
done
@@ -3624,6 +3648,9 @@ fi
36243648
if test "$ENABLED_ARMASM_INLINE" = "yes"; then
36253649
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ARMASM_INLINE"
36263650
fi
3651+
if test "$ENABLED_ARMASM_AES_BLOCK_INLINE" = "yes"; then
3652+
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ARMASM_AES_BLOCK_INLINE"
3653+
fi
36273654

36283655
# RISC-V Assembly
36293656
AC_ARG_ENABLE([riscv-asm],

0 commit comments

Comments
 (0)