Skip to content

Commit 10a1126

Browse files
authored
Merge pull request #8635 from SparkiDev/asm_thumb2_fix
AES Thumb2 ASM: fix td4 variable declarations
2 parents b7af89a + 0e8d3ad commit 10a1126

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

wolfcrypt/src/port/arm/thumb2-aes-asm_c.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1908,12 +1908,13 @@ void AES_ECB_decrypt(const unsigned char* in, unsigned char* out,
19081908
register word32* L_AES_Thumb2_td_ecb_c __asm__ ("r5") =
19091909
(word32*)L_AES_Thumb2_td_ecb;
19101910

1911-
register byte L_AES_Thumb2_td4_c __asm__ ("r6") = (byte)(word32)&L_AES_Thumb2_td4;
1911+
register byte* L_AES_Thumb2_td4_c __asm__ ("r6") =
1912+
(byte*)&L_AES_Thumb2_td4;
19121913

19131914
#else
19141915
register word32* L_AES_Thumb2_td_ecb_c = (word32*)L_AES_Thumb2_td_ecb;
19151916

1916-
register byte L_AES_Thumb2_td4_c = (byte)&L_AES_Thumb2_td4;
1917+
register byte* L_AES_Thumb2_td4_c = (byte*)&L_AES_Thumb2_td4;
19171918

19181919
#endif /* !WOLFSSL_NO_VAR_ASSIGN_REG */
19191920

@@ -2134,12 +2135,13 @@ void AES_CBC_decrypt(const unsigned char* in, unsigned char* out,
21342135
register word32* L_AES_Thumb2_td_ecb_c __asm__ ("r6") =
21352136
(word32*)L_AES_Thumb2_td_ecb;
21362137

2137-
register byte L_AES_Thumb2_td4_c __asm__ ("r7") = (byte)(word32)&L_AES_Thumb2_td4;
2138+
register byte* L_AES_Thumb2_td4_c __asm__ ("r7") =
2139+
(byte*)&L_AES_Thumb2_td4;
21382140

21392141
#else
21402142
register word32* L_AES_Thumb2_td_ecb_c = (word32*)L_AES_Thumb2_td_ecb;
21412143

2142-
register byte L_AES_Thumb2_td4_c = (byte)&L_AES_Thumb2_td4;
2144+
register byte* L_AES_Thumb2_td4_c = (byte*)&L_AES_Thumb2_td4;
21432145

21442146
#endif /* !WOLFSSL_NO_VAR_ASSIGN_REG */
21452147

0 commit comments

Comments
 (0)