mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Thumb2 ASM: indicated by WOLFSSL_ARMASM_THUMB2

Browse Source 
Detecting ARM or Thumb2 is not simple so making our own define that will
work: WOLFSSL_ARMASM_THUMB2 to indicate to use Thumb2 assembly code.
This commit is contained in:
Sean Parkinson 2024-10-16 13:56:44 +10:00
parent db6a2ccdca
commit 1ce90cc8a5
40 changed files with 77 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -3030,7 +3030,8 @@ then
;; ;;
armv7m*) armv7m*)
# QEMU doesn't work with armv7-m # QEMU doesn't work with armv7-m
AM_CPPFLAGS="$AM_CPPFLAGS -march=armv7-r -D__thumb__ -fomit-frame-pointer -DWOLFSSL_ARMASM_NO_HW_CRYPTO -DWOLFSSL_ARM_ARCH=7" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ARMASM_THUMB2"
AM_CPPFLAGS="$AM_CPPFLAGS -march=armv7-r -DWOLFSSL_ARMASM_THUMB2 -fomit-frame-pointer -DWOLFSSL_ARMASM_NO_HW_CRYPTO -DWOLFSSL_ARM_ARCH=7"
# Include options.h # Include options.h
AM_CCASFLAGS="$AM_CCASFLAGS -DEXTERNAL_OPTS_OPENVPN" AM_CCASFLAGS="$AM_CCASFLAGS -DEXTERNAL_OPTS_OPENVPN"
ENABLED_ARMASM_CRYPTO=no ENABLED_ARMASM_CRYPTO=no
@ -8388,7 +8389,8 @@ if test "$ENABLED_SP_ASM" = "yes" && test "$ENABLED_SP" = "yes"; then
;; ;;
*cortex* | *armv7m*) *cortex* | *armv7m*)
if test "$ENABLED_ARMASM" = "no"; then if test "$ENABLED_ARMASM" = "no"; then
AM_CPPFLAGS="$AM_CPPFLAGS -march=armv7-r -D__thumb__ -DWOLFSSL_ARM_ARCH=7" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ARMASM_THUMB2"
AM_CPPFLAGS="$AM_CPPFLAGS -march=armv7-r -DWOLFSSL_ARMASM_THUMB2 -DWOLFSSL_ARM_ARCH=7"
fi fi
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SP_ARM_CORTEX_M_ASM" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SP_ARM_CORTEX_M_ASM"
AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_SP_ARM_CORTEX_M_ASM" AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_SP_ARM_CORTEX_M_ASM"

5
wolfcrypt/src/port/arm/armv8-32-aes-asm.S
View File

@ -31,8 +31,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
#ifndef NO_AES #ifndef NO_AES
#ifdef HAVE_AES_DECRYPT #ifdef HAVE_AES_DECRYPT
@ -5306,7 +5305,7 @@ L_AES_GCM_encrypt_end:
.size AES_GCM_encrypt,.-AES_GCM_encrypt .size AES_GCM_encrypt,.-AES_GCM_encrypt
#endif /* HAVE_AESGCM */ #endif /* HAVE_AESGCM */
#endif /* !NO_AES */ #endif /* !NO_AES */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

5
wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c
View File

@ -32,8 +32,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#include <stdint.h> #include <stdint.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -4850,7 +4849,7 @@ void AES_GCM_encrypt(const unsigned char* in_p, unsigned char* out_p,
#endif /* HAVE_AESGCM */ #endif /* HAVE_AESGCM */
#endif /* !NO_AES */ #endif /* !NO_AES */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

5
wolfcrypt/src/port/arm/armv8-32-chacha-asm.S
View File

@ -31,8 +31,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
#ifdef HAVE_CHACHA #ifdef HAVE_CHACHA
.text .text
@ -515,7 +514,7 @@ L_chacha_arm32_over_done:
.size wc_chacha_use_over,.-wc_chacha_use_over .size wc_chacha_use_over,.-wc_chacha_use_over
#endif /* WOLFSSL_ARMASM_NO_NEON */ #endif /* WOLFSSL_ARMASM_NO_NEON */
#endif /* HAVE_CHACHA */ #endif /* HAVE_CHACHA */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

5
wolfcrypt/src/port/arm/armv8-32-chacha-asm_c.c
View File

@ -32,8 +32,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#include <stdint.h> #include <stdint.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -566,7 +565,7 @@ void wc_chacha_use_over(byte* over_p, byte* output_p, const byte* input_p,
#endif /* WOLFSSL_ARMASM_NO_NEON */ #endif /* WOLFSSL_ARMASM_NO_NEON */
#endif /* HAVE_CHACHA */ #endif /* HAVE_CHACHA */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

5
wolfcrypt/src/port/arm/armv8-32-curve25519.S
View File

@ -31,8 +31,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
#if defined(HAVE_CURVE25519) || defined(HAVE_ED25519) #if defined(HAVE_CURVE25519) || defined(HAVE_ED25519)
#if !defined(CURVE25519_SMALL) || !defined(ED25519_SMALL) #if !defined(CURVE25519_SMALL) || !defined(ED25519_SMALL)
@ -9181,7 +9180,7 @@ sc_muladd:
#endif /* !CURVE25519_SMALL || !ED25519_SMALL */ #endif /* !CURVE25519_SMALL || !ED25519_SMALL */
#endif /* HAVE_CURVE25519 || HAVE_ED25519 */ #endif /* HAVE_CURVE25519 || HAVE_ED25519 */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

5
wolfcrypt/src/port/arm/armv8-32-curve25519_c.c
View File

@ -32,8 +32,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#include <stdint.h> #include <stdint.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -9426,7 +9425,7 @@ void sc_muladd(byte* s_p, const byte* a_p, const byte* b_p, const byte* c_p)
#endif /* !CURVE25519_SMALL || !ED25519_SMALL */ #endif /* !CURVE25519_SMALL || !ED25519_SMALL */
#endif /* HAVE_CURVE25519 || HAVE_ED25519 */ #endif /* HAVE_CURVE25519 || HAVE_ED25519 */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

5
wolfcrypt/src/port/arm/armv8-32-kyber-asm.S
View File

@ -31,8 +31,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
#ifdef WOLFSSL_WC_KYBER #ifdef WOLFSSL_WC_KYBER
.text .text
@ -9434,7 +9433,7 @@ L_kyber_arm32_rej_uniform_done:
pop {r4, r5, r6, r7, r8, pc} pop {r4, r5, r6, r7, r8, pc}
.size kyber_arm32_rej_uniform,.-kyber_arm32_rej_uniform .size kyber_arm32_rej_uniform,.-kyber_arm32_rej_uniform
#endif /* WOLFSSL_WC_KYBER */ #endif /* WOLFSSL_WC_KYBER */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

5
wolfcrypt/src/port/arm/armv8-32-kyber-asm_c.c
View File

@ -32,8 +32,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#include <stdint.h> #include <stdint.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -9229,7 +9228,7 @@ unsigned int kyber_arm32_rej_uniform(sword16* p_p, unsigned int len_p,
} }
#endif /* WOLFSSL_WC_KYBER */ #endif /* WOLFSSL_WC_KYBER */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

5
wolfcrypt/src/port/arm/armv8-32-poly1305-asm.S
View File

@ -31,8 +31,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
#ifdef HAVE_POLY1305 #ifdef HAVE_POLY1305
.text .text
@ -349,7 +348,7 @@ poly1305_final:
pop {r4, r5, r6, r7, r8, r9, pc} pop {r4, r5, r6, r7, r8, r9, pc}
.size poly1305_final,.-poly1305_final .size poly1305_final,.-poly1305_final
#endif /* HAVE_POLY1305 */ #endif /* HAVE_POLY1305 */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

5
wolfcrypt/src/port/arm/armv8-32-poly1305-asm_c.c
View File

@ -32,8 +32,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#include <stdint.h> #include <stdint.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -385,7 +384,7 @@ void poly1305_final(Poly1305* ctx_p, byte* mac_p)
} }
#endif /* HAVE_POLY1305 */ #endif /* HAVE_POLY1305 */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

5
wolfcrypt/src/port/arm/armv8-32-sha256-asm.S
View File

@ -31,8 +31,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
#ifndef NO_SHA256 #ifndef NO_SHA256
#ifdef WOLFSSL_ARMASM_NO_NEON #ifdef WOLFSSL_ARMASM_NO_NEON
@ -2867,7 +2866,7 @@ L_SHA256_transform_neon_len_start:
.size Transform_Sha256_Len,.-Transform_Sha256_Len .size Transform_Sha256_Len,.-Transform_Sha256_Len
#endif /* WOLFSSL_ARMASM_NO_NEON */ #endif /* WOLFSSL_ARMASM_NO_NEON */
#endif /* !NO_SHA256 */ #endif /* !NO_SHA256 */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

5
wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c
View File

@ -32,8 +32,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#include <stdint.h> #include <stdint.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -2808,7 +2807,7 @@ void Transform_Sha256_Len(wc_Sha256* sha256_p, const byte* data_p, word32 len_p)
#endif /* WOLFSSL_ARMASM_NO_NEON */ #endif /* WOLFSSL_ARMASM_NO_NEON */
#endif /* !NO_SHA256 */ #endif /* !NO_SHA256 */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

5
wolfcrypt/src/port/arm/armv8-32-sha3-asm.S
View File

@ -31,8 +31,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
#ifdef WOLFSSL_SHA3 #ifdef WOLFSSL_SHA3
#ifndef WOLFSSL_ARMASM_NO_NEON #ifndef WOLFSSL_ARMASM_NO_NEON
@ -2395,7 +2394,7 @@ L_sha3_arm32_begin:
.size BlockSha3,.-BlockSha3 .size BlockSha3,.-BlockSha3
#endif /* WOLFSSL_ARMASM_NO_NEON */ #endif /* WOLFSSL_ARMASM_NO_NEON */
#endif /* WOLFSSL_SHA3 */ #endif /* WOLFSSL_SHA3 */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

5
wolfcrypt/src/port/arm/armv8-32-sha3-asm_c.c
View File

@ -32,8 +32,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#include <stdint.h> #include <stdint.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -2353,7 +2352,7 @@ void BlockSha3(word64* state_p)
#endif /* WOLFSSL_ARMASM_NO_NEON */ #endif /* WOLFSSL_ARMASM_NO_NEON */
#endif /* WOLFSSL_SHA3 */ #endif /* WOLFSSL_SHA3 */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

5
wolfcrypt/src/port/arm/armv8-32-sha512-asm.S
View File

@ -31,8 +31,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
#ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA512
#ifdef WOLFSSL_ARMASM_NO_NEON #ifdef WOLFSSL_ARMASM_NO_NEON
@ -9368,7 +9367,7 @@ L_SHA512_transform_neon_len_start:
.size Transform_Sha512_Len,.-Transform_Sha512_Len .size Transform_Sha512_Len,.-Transform_Sha512_Len
#endif /* !WOLFSSL_ARMASM_NO_NEON */ #endif /* !WOLFSSL_ARMASM_NO_NEON */
#endif /* WOLFSSL_SHA512 */ #endif /* WOLFSSL_SHA512 */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

5
wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c
View File

@ -32,8 +32,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \ #if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
defined(__THUMB_INTERWORK__))
#include <stdint.h> #include <stdint.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -9165,7 +9164,7 @@ void Transform_Sha512_Len(wc_Sha512* sha512_p, const byte* data_p, word32 len_p)
#endif /* !WOLFSSL_ARMASM_NO_NEON */ #endif /* !WOLFSSL_ARMASM_NO_NEON */
#endif /* WOLFSSL_SHA512 */ #endif /* WOLFSSL_SHA512 */
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */ #endif /* !__aarch64__ && !WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

4
wolfcrypt/src/port/arm/armv8-poly1305.c
View File

@ -1120,7 +1120,7 @@ int wc_Poly1305Final(Poly1305* ctx, byte* mac)
} }
#else #else
#ifdef __thumb__ #ifdef WOLFSSL_ARMASM_THUMB2
/* Process 16 bytes of message at a time. /* Process 16 bytes of message at a time.
* *
* @param [in] ctx Poly1305 context. * @param [in] ctx Poly1305 context.
@ -1226,7 +1226,7 @@ int wc_Poly1305Final(Poly1305* ctx, byte* mac)
for (; i < POLY1305_BLOCK_SIZE; i++) { for (; i < POLY1305_BLOCK_SIZE; i++) {
ctx->buffer[i] = 0; ctx->buffer[i] = 0;
} }
#ifdef __thumb__ #ifdef WOLFSSL_ARMASM_THUMB2
poly1305_blocks_thumb2_16(ctx, ctx->buffer, POLY1305_BLOCK_SIZE, poly1305_blocks_thumb2_16(ctx, ctx->buffer, POLY1305_BLOCK_SIZE,
0); 0);
#else #else

4
wolfcrypt/src/port/arm/thumb2-aes-asm.S
View File

@ -30,7 +30,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
.thumb .thumb
.syntax unified .syntax unified
@ -3360,7 +3360,7 @@ L_AES_GCM_encrypt_end:
.size AES_GCM_encrypt,.-AES_GCM_encrypt .size AES_GCM_encrypt,.-AES_GCM_encrypt
#endif /* HAVE_AESGCM */ #endif /* HAVE_AESGCM */
#endif /* !NO_AES */ #endif /* !NO_AES */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

4
wolfcrypt/src/port/arm/thumb2-aes-asm_c.c
View File

@ -31,7 +31,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifdef WOLFSSL_ARMASM_INLINE #ifdef WOLFSSL_ARMASM_INLINE
#ifdef __IAR_SYSTEMS_ICC__ #ifdef __IAR_SYSTEMS_ICC__
@ -3347,6 +3347,6 @@ void AES_GCM_encrypt(const unsigned char* in, unsigned char* out, unsigned long
#endif /* HAVE_AESGCM */ #endif /* HAVE_AESGCM */
#endif /* !NO_AES */ #endif /* !NO_AES */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

4
wolfcrypt/src/port/arm/thumb2-chacha-asm.S
View File

@ -30,7 +30,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
.thumb .thumb
.syntax unified .syntax unified
@ -566,7 +566,7 @@ L_chacha_thumb2_over_done:
/* Cycle Count = 108 */ /* Cycle Count = 108 */
.size wc_chacha_use_over,.-wc_chacha_use_over .size wc_chacha_use_over,.-wc_chacha_use_over
#endif /* HAVE_CHACHA */ #endif /* HAVE_CHACHA */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

4
wolfcrypt/src/port/arm/thumb2-chacha-asm_c.c
View File

@ -31,7 +31,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifdef WOLFSSL_ARMASM_INLINE #ifdef WOLFSSL_ARMASM_INLINE
#ifdef __IAR_SYSTEMS_ICC__ #ifdef __IAR_SYSTEMS_ICC__
@ -726,6 +726,6 @@ void wc_chacha_use_over(byte* over, byte* output, const byte* input, word32 len)
} }
#endif /* HAVE_CHACHA */ #endif /* HAVE_CHACHA */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

2
wolfcrypt/src/port/arm/thumb2-chacha.c
View File

@ -26,7 +26,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#if defined(WOLFSSL_ARMASM) && defined(__thumb__) #if defined(WOLFSSL_ARMASM) && defined(WOLFSSL_ARMASM_THUMB2)
#ifdef HAVE_CHACHA #ifdef HAVE_CHACHA
#include <wolfssl/wolfcrypt/chacha.h> #include <wolfssl/wolfcrypt/chacha.h>

4
wolfcrypt/src/port/arm/thumb2-curve25519.S
View File

@ -30,7 +30,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
.thumb .thumb
.syntax unified .syntax unified
@ -6476,7 +6476,7 @@ sc_muladd:
#endif /* !CURVE25519_SMALL || !ED25519_SMALL */ #endif /* !CURVE25519_SMALL || !ED25519_SMALL */
#endif /* HAVE_CURVE25519 || HAVE_ED25519 */ #endif /* HAVE_CURVE25519 || HAVE_ED25519 */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

4
wolfcrypt/src/port/arm/thumb2-curve25519_c.c
View File

@ -31,7 +31,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifdef WOLFSSL_ARMASM_INLINE #ifdef WOLFSSL_ARMASM_INLINE
#ifdef __IAR_SYSTEMS_ICC__ #ifdef __IAR_SYSTEMS_ICC__
@ -7105,6 +7105,6 @@ void sc_muladd(byte* s, const byte* a, const byte* b, const byte* c)
#endif /* !CURVE25519_SMALL || !ED25519_SMALL */ #endif /* !CURVE25519_SMALL || !ED25519_SMALL */
#endif /* HAVE_CURVE25519 || HAVE_ED25519 */ #endif /* HAVE_CURVE25519 || HAVE_ED25519 */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

4
wolfcrypt/src/port/arm/thumb2-kyber-asm.S
View File

@ -30,7 +30,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
.thumb .thumb
.syntax unified .syntax unified
@ -3894,7 +3894,7 @@ L_kyber_thumb2_rej_uniform_done:
/* Cycle Count = 225 */ /* Cycle Count = 225 */
.size kyber_thumb2_rej_uniform,.-kyber_thumb2_rej_uniform .size kyber_thumb2_rej_uniform,.-kyber_thumb2_rej_uniform
#endif /* WOLFSSL_WC_KYBER */ #endif /* WOLFSSL_WC_KYBER */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

4
wolfcrypt/src/port/arm/thumb2-kyber-asm_c.c
View File

@ -31,7 +31,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifdef WOLFSSL_ARMASM_INLINE #ifdef WOLFSSL_ARMASM_INLINE
#ifdef __IAR_SYSTEMS_ICC__ #ifdef __IAR_SYSTEMS_ICC__
@ -3846,6 +3846,6 @@ unsigned int kyber_thumb2_rej_uniform(sword16* p, unsigned int len, const byte*
} }
#endif /* WOLFSSL_WC_KYBER */ #endif /* WOLFSSL_WC_KYBER */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

4
wolfcrypt/src/port/arm/thumb2-poly1305-asm.S
View File

@ -30,7 +30,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
.thumb .thumb
.syntax unified .syntax unified
@ -360,7 +360,7 @@ poly1305_final:
/* Cycle Count = 82 */ /* Cycle Count = 82 */
.size poly1305_final,.-poly1305_final .size poly1305_final,.-poly1305_final
#endif /* HAVE_POLY1305 */ #endif /* HAVE_POLY1305 */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

4
wolfcrypt/src/port/arm/thumb2-poly1305-asm_c.c
View File

@ -31,7 +31,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifdef WOLFSSL_ARMASM_INLINE #ifdef WOLFSSL_ARMASM_INLINE
#ifdef __IAR_SYSTEMS_ICC__ #ifdef __IAR_SYSTEMS_ICC__
@ -417,6 +417,6 @@ void poly1305_final(Poly1305* ctx, byte* mac)
} }
#endif /* HAVE_POLY1305 */ #endif /* HAVE_POLY1305 */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

4
wolfcrypt/src/port/arm/thumb2-poly1305.c
View File

@ -27,7 +27,7 @@
#include <wolfssl/wolfcrypt/types.h> #include <wolfssl/wolfcrypt/types.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#ifdef __thumb__ #ifdef WOLFSSL_ARMASM_THUMB2
#ifdef HAVE_POLY1305 #ifdef HAVE_POLY1305
#include <wolfssl/wolfcrypt/poly1305.h> #include <wolfssl/wolfcrypt/poly1305.h>
@ -138,5 +138,5 @@ int wc_Poly1305Final(Poly1305* ctx, byte* mac)
} }
#endif /* HAVE_POLY1305 */ #endif /* HAVE_POLY1305 */
#endif /* __aarch64__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */

4
wolfcrypt/src/port/arm/thumb2-sha256-asm.S
View File

@ -30,7 +30,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
.thumb .thumb
.syntax unified .syntax unified
@ -1481,7 +1481,7 @@ L_SHA256_transform_len_start:
.size Transform_Sha256_Len,.-Transform_Sha256_Len .size Transform_Sha256_Len,.-Transform_Sha256_Len
#endif /* WOLFSSL_ARMASM_NO_NEON */ #endif /* WOLFSSL_ARMASM_NO_NEON */
#endif /* !NO_SHA256 */ #endif /* !NO_SHA256 */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

4
wolfcrypt/src/port/arm/thumb2-sha256-asm_c.c
View File

@ -31,7 +31,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifdef WOLFSSL_ARMASM_INLINE #ifdef WOLFSSL_ARMASM_INLINE
#ifdef __IAR_SYSTEMS_ICC__ #ifdef __IAR_SYSTEMS_ICC__
@ -1475,6 +1475,6 @@ void Transform_Sha256_Len(wc_Sha256* sha256, const byte* data, word32 len)
#endif /* WOLFSSL_ARMASM_NO_NEON */ #endif /* WOLFSSL_ARMASM_NO_NEON */
#endif /* !NO_SHA256 */ #endif /* !NO_SHA256 */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

4
wolfcrypt/src/port/arm/thumb2-sha3-asm.S
View File

@ -30,7 +30,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
.thumb .thumb
.syntax unified .syntax unified
@ -1167,7 +1167,7 @@ L_sha3_thumb2_begin:
/* Cycle Count = 1505 */ /* Cycle Count = 1505 */
.size BlockSha3,.-BlockSha3 .size BlockSha3,.-BlockSha3
#endif /* WOLFSSL_SHA3 */ #endif /* WOLFSSL_SHA3 */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

4
wolfcrypt/src/port/arm/thumb2-sha3-asm_c.c
View File

@ -31,7 +31,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifdef WOLFSSL_ARMASM_INLINE #ifdef WOLFSSL_ARMASM_INLINE
#ifdef __IAR_SYSTEMS_ICC__ #ifdef __IAR_SYSTEMS_ICC__
@ -1163,6 +1163,6 @@ void BlockSha3(word64* state)
} }
#endif /* WOLFSSL_SHA3 */ #endif /* WOLFSSL_SHA3 */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

4
wolfcrypt/src/port/arm/thumb2-sha512-asm.S
View File

@ -30,7 +30,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifndef WOLFSSL_ARMASM_INLINE #ifndef WOLFSSL_ARMASM_INLINE
.thumb .thumb
.syntax unified .syntax unified
@ -3668,7 +3668,7 @@ L_SHA512_transform_len_start:
.size Transform_Sha512_Len,.-Transform_Sha512_Len .size Transform_Sha512_Len,.-Transform_Sha512_Len
#endif /* WOLFSSL_ARMASM_NO_NEON */ #endif /* WOLFSSL_ARMASM_NO_NEON */
#endif /* WOLFSSL_SHA512 */ #endif /* WOLFSSL_SHA512 */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)

4
wolfcrypt/src/port/arm/thumb2-sha512-asm_c.c
View File

@ -31,7 +31,7 @@
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM
#if !defined(__aarch64__) && defined(__thumb__) #ifdef WOLFSSL_ARMASM_THUMB2
#ifdef WOLFSSL_ARMASM_INLINE #ifdef WOLFSSL_ARMASM_INLINE
#ifdef __IAR_SYSTEMS_ICC__ #ifdef __IAR_SYSTEMS_ICC__
@ -3590,6 +3590,6 @@ void Transform_Sha512_Len(wc_Sha512* sha512, const byte* data, word32 len)
#endif /* WOLFSSL_ARMASM_NO_NEON */ #endif /* WOLFSSL_ARMASM_NO_NEON */
#endif /* WOLFSSL_SHA512 */ #endif /* WOLFSSL_SHA512 */
#endif /* !__aarch64__ && __thumb__ */ #endif /* WOLFSSL_ARMASM_THUMB2 */
#endif /* WOLFSSL_ARMASM */ #endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM_INLINE */ #endif /* WOLFSSL_ARMASM_INLINE */

2
wolfcrypt/src/wc_kyber_poly.c
View File

@ -3371,7 +3371,7 @@ static KYBER_NOINLINE void kyber_csubq_c(sword16* p)
#define kyber_csubq_c kyber_csubq_neon #define kyber_csubq_c kyber_csubq_neon
#elif defined(__thumb__) #elif defined(WOLFSSL_ARMASM_THUMB2)
#define kyber_csubq_c kyber_thumb2_csubq #define kyber_csubq_c kyber_thumb2_csubq

2
wolfssl/wolfcrypt/chacha.h
View File

@ -114,7 +114,7 @@ void wc_chacha_setiv(word32* x, const byte* iv, word32 counter);
void wc_chacha_setkey(word32* x, const byte* key, word32 keySz); void wc_chacha_setkey(word32* x, const byte* key, word32 keySz);
#endif #endif
#if defined(WOLFSSL_ARMASM_NO_NEON) || defined(__thumb__) #if defined(WOLFSSL_ARMASM_NO_NEON) || defined(WOLFSSL_ARMASM_THUMB2)
void wc_chacha_use_over(byte* over, byte* output, const byte* input, void wc_chacha_use_over(byte* over, byte* output, const byte* input,
word32 len); word32 len);
void wc_chacha_crypt_bytes(ChaCha* ctx, byte* c, const byte* m, word32 len); void wc_chacha_crypt_bytes(ChaCha* ctx, byte* c, const byte* m, word32 len);

2
wolfssl/wolfcrypt/poly1305.h
View File

@ -156,7 +156,7 @@ void poly1305_blocks_aarch64(Poly1305* ctx, const unsigned char *m,
size_t bytes); size_t bytes);
void poly1305_block_aarch64(Poly1305* ctx, const unsigned char *m); void poly1305_block_aarch64(Poly1305* ctx, const unsigned char *m);
#else #else
#if defined(__thumb__) #if defined(WOLFSSL_ARMASM_THUMB2)
#define poly1305_blocks poly1305_blocks_thumb2 #define poly1305_blocks poly1305_blocks_thumb2
#define poly1305_block poly1305_block_thumb2 #define poly1305_block poly1305_block_thumb2

2
wolfssl/wolfcrypt/wc_kyber.h
View File

@ -310,7 +310,7 @@ WOLFSSL_LOCAL int kyber_cmp_neon(const byte* a, const byte* b, int sz);
WOLFSSL_LOCAL void kyber_csubq_neon(sword16* p); WOLFSSL_LOCAL void kyber_csubq_neon(sword16* p);
WOLFSSL_LOCAL void kyber_from_msg_neon(sword16* p, const byte* msg); WOLFSSL_LOCAL void kyber_from_msg_neon(sword16* p, const byte* msg);
WOLFSSL_LOCAL void kyber_to_msg_neon(byte* msg, sword16* p); WOLFSSL_LOCAL void kyber_to_msg_neon(byte* msg, sword16* p);
#elif defined(__thumb__) && defined(WOLFSSL_ARMASM) #elif defined(WOLFSSL_ARMASM_THUMB2) && defined(WOLFSSL_ARMASM)
#define kyber_ntt kyber_thumb2_ntt #define kyber_ntt kyber_thumb2_ntt
#define kyber_invntt kyber_thumb2_invntt #define kyber_invntt kyber_thumb2_invntt
#define kyber_basemul_mont kyber_thumb2_basemul_mont #define kyber_basemul_mont kyber_thumb2_basemul_mont