Skip to content

Commit 2b370f8

Browse files
committed
ARM assembly fixes
armv8-32-aes-asm*: Fix #define protection around L_AES_ARM32_ecb_td4. armv8-curve25519_c.c: Fix definition of fe_invert_nct to match prototype.
1 parent ca5b484 commit 2b370f8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16847,6 +16847,7 @@ L_AES_decrypt_block_nr:
1684716847
.align 4
1684816848
L_AES_ARM32_td_ecb:
1684916849
.word L_AES_ARM32_td_data
16850+
#if defined(WOLFSSL_AES_DIRECT) || defined(WOLFSSL_AES_COUNTER) || defined(HAVE_AES_ECB)
1685016851
.text
1685116852
.type L_AES_ARM32_ecb_td4, %object
1685216853
.size L_AES_ARM32_ecb_td4, 256
@@ -17108,7 +17109,6 @@ L_AES_ARM32_ecb_td4:
1710817109
.byte 0x21
1710917110
.byte 0xc
1711017111
.byte 0x7d
17111-
#if defined(WOLFSSL_AES_DIRECT) || defined(WOLFSSL_AES_COUNTER) || defined(HAVE_AES_ECB)
1711217112
.text
1711317113
.align 4
1711417114
.globl AES_ECB_decrypt

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17300,6 +17300,8 @@ WC_OMIT_FRAME_POINTER void AES_decrypt_block(const word32* td, int nr,
1730017300

1730117301
#endif /* !WOLFSSL_ARMASM_AES_BLOCK_INLINE */
1730217302
static const word32* L_AES_ARM32_td_ecb = L_AES_ARM32_td_data;
17303+
#if defined(WOLFSSL_AES_DIRECT) || defined(WOLFSSL_AES_COUNTER) || \
17304+
defined(HAVE_AES_ECB)
1730317305
static const byte L_AES_ARM32_ecb_td4[] = {
1730417306
0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38,
1730517307
0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb,
@@ -17335,8 +17337,6 @@ static const byte L_AES_ARM32_ecb_td4[] = {
1733517337
0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d,
1733617338
};
1733717339

17338-
#if defined(WOLFSSL_AES_DIRECT) || defined(WOLFSSL_AES_COUNTER) || \
17339-
defined(HAVE_AES_ECB)
1734017340
void AES_ECB_decrypt(const unsigned char* in_p, unsigned char* out_p,
1734117341
unsigned long len_p, const unsigned char* ks_p, int nr_p);
1734217342
#ifndef WOLFSSL_NO_VAR_ASSIGN_REG

wolfcrypt/src/port/arm/armv8-curve25519_c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ void fe_cmov_table(fe* r, fe* base, signed char b)
471471
);
472472
}
473473

474-
void fe_invert_nct(word64* r, const word64* a)
474+
void fe_invert_nct(fe r, const fe a)
475475
{
476476
__asm__ __volatile__ (
477477
"mov x19, #-19\n\t"

0 commit comments

Comments
 (0)