wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for building with Microchip. The min/max patch allows non PIC32MZ parts to build in MPLABX. The cryptoauthlib already defines SHA_BLOCK_SIZE, so undef to prevent redef error.

Browse Source
This commit is contained in:
David Garske
2020-10-30 12:46:14 -07:00
parent 931eea30f5
commit 0df5079f8b
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfssl/wolfcrypt/port/atmel/atmel.h
View File

@ -29,10 +29,8 @@
#if defined(WOLFSSL_ATECC508A) || defined(WOLFSSL_ATECC608A) || \ #if defined(WOLFSSL_ATECC508A) || defined(WOLFSSL_ATECC608A) || \
defined(WOLFSSL_ATECC_PKCB) defined(WOLFSSL_ATECC_PKCB)
#undef SHA_BLOCK_SIZE
#define SHA_BLOCK_SIZE SHA_BLOCK_SIZE_REMAP
#include <cryptoauthlib.h>
#undef SHA_BLOCK_SIZE #undef SHA_BLOCK_SIZE
#include <cryptoauthlib.h>
#endif #endif
/* ATECC508A/608A only supports ECC P-256 */ /* ATECC508A/608A only supports ECC P-256 */

5
wolfssl/wolfcrypt/settings.h
View File

@ -358,12 +358,13 @@
#define NO_FILESYSTEM #define NO_FILESYSTEM
#define USE_FAST_MATH #define USE_FAST_MATH
#define TFM_TIMING_RESISTANT #define TFM_TIMING_RESISTANT
#define WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MAX
#define NO_BIG_INT #define NO_BIG_INT
#endif #endif
#ifdef WOLFSSL_MICROCHIP_PIC32MZ #ifdef WOLFSSL_MICROCHIP_PIC32MZ
#define WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MAX
#ifndef NO_PIC32MZ_CRYPT #ifndef NO_PIC32MZ_CRYPT
#define WOLFSSL_PIC32MZ_CRYPT #define WOLFSSL_PIC32MZ_CRYPT
#endif #endif