From e5426f85c974e689d816f25470fa51ab5561c84b Mon Sep 17 00:00:00 2001 From: David Garske Date: Tue, 28 Jan 2020 06:33:13 -0800 Subject: [PATCH 1/2] Fix for evp.c when being included directly due to improperly placed WOLFSSL_EVP_INCLUDED. Fix for `FREERTOS` to expose XREALLOC for normal math. --- wolfcrypt/src/evp.c | 3 ++- wolfssl/wolfcrypt/settings.h | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c index 11d1c229c..6a2f61651 100644 --- a/wolfcrypt/src/evp.c +++ b/wolfcrypt/src/evp.c @@ -2086,7 +2086,6 @@ int wolfSSL_EVP_read_pw_string(char* buf, int bufSz, const char* banner, int v) return 0; } #endif /* WOLFSSL_APACHE_HTTPD */ -#endif /* WOLFSSL_EVP_INCLUDED */ #if defined(OPENSSL_EXTRA) && !defined(NO_PWDBASED) && !defined(NO_SHA) int wolfSSL_PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, @@ -2139,3 +2138,5 @@ WOLFSSL_API int wolfSSL_PKCS5_PBKDF2_HMAC(const char *pass, int passlen, return WOLFSSL_FAILURE; } #endif /* OPENSSL_EXTRA && !NO_PWDBASED */ + +#endif /* WOLFSSL_EVP_INCLUDED */ diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 0add7cf3c..572b108b6 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -682,14 +682,15 @@ extern void uITRON4_free(void *p) ; #ifdef FREERTOS #include "FreeRTOS.h" - /* FreeRTOS pvPortRealloc() only in AVR32_UC3 port */ #if !defined(XMALLOC_USER) && !defined(NO_WOLFSSL_MEMORY) && \ !defined(WOLFSSL_STATIC_MEMORY) #define XMALLOC(s, h, type) pvPortMalloc((s)) #define XFREE(p, h, type) vPortFree((p)) #endif - #if defined(HAVE_ED25519) || defined(WOLFSSL_ESPIDF) - #define XREALLOC(p, n, h, t) wolfSSL_Realloc((p), (n)) + /* FreeRTOS pvPortRealloc() implementation can be found here: + https://github.com/wolfSSL/wolfssl-freertos/pull/3/files */ + #if !defined(USE_FAST_MATH) || defined(HAVE_ED25519) || defined(WOLFSSL_ESPIDF) + #define XREALLOC(p, n, h, t) pvPortRealloc((p), (n)) #endif #ifndef NO_WRITEV #define NO_WRITEV @@ -865,6 +866,8 @@ extern void uITRON4_free(void *p) ; #define XMALLOC(s, h, type) pvPortMalloc((s)) #define XFREE(p, h, type) vPortFree((p)) #endif + /* FreeRTOS pvPortRealloc() implementation can be found here: + https://github.com/wolfSSL/wolfssl-freertos/pull/3/files */ #if !defined(USE_FAST_MATH) || defined(HAVE_ED25519) #define XREALLOC(p, n, h, t) pvPortRealloc((p), (n)) #endif From ba49427cc46acf92e44ab5d25a0914c705d2e8ae Mon Sep 17 00:00:00 2001 From: David Garske Date: Thu, 30 Jan 2020 06:23:04 -0800 Subject: [PATCH 2/2] Cleanup include.am whitespace. --- certs/1024/include.am | 1 - certs/3072/include.am | 4 ++-- certs/4096/include.am | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/certs/1024/include.am b/certs/1024/include.am index 3280cc185..2dfbd84f9 100644 --- a/certs/1024/include.am +++ b/certs/1024/include.am @@ -24,4 +24,3 @@ EXTRA_DIST += \ certs/1024/rsa1024.der \ certs/1024/server-cert.der \ certs/1024/server-key.der - diff --git a/certs/3072/include.am b/certs/3072/include.am index e701837ed..5606dcce9 100644 --- a/certs/3072/include.am +++ b/certs/3072/include.am @@ -5,6 +5,6 @@ EXTRA_DIST += \ certs/3072/client-cert.der \ certs/3072/client-cert.pem \ - certs/3072/client-key.der \ + certs/3072/client-key.der \ certs/3072/client-key.pem \ - certs/3072/client-keyPub.der + certs/3072/client-keyPub.der diff --git a/certs/4096/include.am b/certs/4096/include.am index 0c8305299..259fa2213 100644 --- a/certs/4096/include.am +++ b/certs/4096/include.am @@ -5,5 +5,3 @@ EXTRA_DIST += \ certs/4096/client-cert.pem \ certs/4096/client-key.pem - -