Skip to content

Commit 20821c9

Browse files
committed
[TA-100] Fix build breakage on TA100 builds
- atmel.c: restore the closing #endif for the outer WOLFSSL_ATMEL/ATECC/TA100 block. The previous "duplicate ATCA_TFLEX_SUPPORT" cleanup removed the real closer because the trailing-comment was misleading, leaving the file with an unterminated #if from line 35. - ecc.c: drop !defined(WOLFSSL_MICROCHIP_TA100) from the guard around wc_ecc_point_is_at_infinity. The function is generic (mp_iszero(x) && mp_iszero(y)) and call sites in _ecc_import_x963_ex2 and friends don't exclude TA100, so the TA100 build was failing to link.
1 parent 7a0b2da commit 20821c9

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

wolfcrypt/src/ecc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5302,7 +5302,6 @@ int wc_ecc_point_is_on_curve(ecc_point *p, int curve_idx)
53025302
}
53035303

53045304
#if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A) && \
5305-
!defined(WOLFSSL_MICROCHIP_TA100) && \
53065305
!defined(WOLFSSL_CRYPTOCELL) && \
53075306
(!defined(WOLF_CRYPTO_CB_ONLY_ECC) || defined(WOLFSSL_QNX_CAAM) || \
53085307
defined(WOLFSSL_IMXRT1170_CAAM))

wolfcrypt/src/port/atmel/atmel.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2031,3 +2031,6 @@ int wc_Microchip_AesGcmDecrypt(Aes* aes, byte* out, const byte* in, word32 sz,
20312031
authTagSz, authIn, authInSz, AES_DECRYPTION);
20322032
}
20332033
#endif /* WOLFSSL_MICROCHIP_TA100 && !NO_AES && HAVE_AESGCM */
2034+
2035+
#endif /* WOLFSSL_ATMEL || WOLFSSL_ATECC508A || WOLFSSL_ATECC608A ||
2036+
* WOLFSSL_ATECC_PKCB || WOLFSSL_MICROCHIP_TA100 */

0 commit comments

Comments
 (0)