From 3cd5dabd0b5c6d05e45b33a837a8e473851c9abb Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Tue, 14 Jun 2022 18:23:54 +0200
Subject: [PATCH] Fixes compilation, I have no idea if it still does what it
 should

---
 src/ssl.c                                      | 10 ++++++----
 wolfcrypt/src/random.c                         |  2 +-
 wolfssl/openssl/sha.h                          |  2 +-
 wolfssl/ssl.h                                  |  2 +-
 wolfssl/wolfcrypt/port/Espressif/esp32-crypt.h |  4 ++--
 wolfssl/wolfcrypt/wc_port.h                    |  2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/ssl.c b/src/ssl.c
index fc2aa63bf..9e5d9240f 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -15370,7 +15370,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
     {
         int ret;
 
-        typedef char sha_test[sizeof(SHA_CTX) >= sizeof(wc_Sha) ? 1 : -1];
+        typedef char sha_test[sizeof(WOLFSSL_SHA_CTX) >= sizeof(wc_Sha) ? 1 : -1];
         (void)sizeof(sha_test);
 
         WOLFSSL_ENTER("SHA_Init");
@@ -17181,7 +17181,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
 #endif
 #ifndef NO_SHA
             case WC_HASH_TYPE_SHA:
-                wolfSSL_SHA_Update((SHA_CTX*)&ctx->hash, data,
+                wolfSSL_SHA_Update((WOLFSSL_SHA_CTX*)&ctx->hash, data,
                                   (unsigned long)sz);
                 break;
 #endif
@@ -17237,7 +17237,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
 #endif
 #ifndef NO_SHA
             case WC_HASH_TYPE_SHA:
-                wolfSSL_SHA_Final(md, (SHA_CTX*)&ctx->hash);
+                wolfSSL_SHA_Final(md, (WOLFSSL_SHA_CTX*)&ctx->hash);
                 if (s) *s = WC_SHA_DIGEST_SIZE;
                 break;
 #endif
@@ -23526,9 +23526,11 @@ int wolfSSL_X509_VERIFY_PARAM_set1_host(WOLFSSL_X509_VERIFY_PARAM* pParam,
         nameSz = WOLFSSL_HOST_NAME_MAX-1;
 
     if (nameSz > 0)
+    {
         XMEMCPY(pParam->hostName, name, nameSz);
+    }
 
-        pParam->hostName[nameSz] = '\0';
+    pParam->hostName[nameSz] = '\0';
 
     return WOLFSSL_SUCCESS;
 }
diff --git a/wolfcrypt/src/random.c b/wolfcrypt/src/random.c
index 9913a5a62..7e6556908 100644
--- a/wolfcrypt/src/random.c
+++ b/wolfcrypt/src/random.c
@@ -2263,7 +2263,7 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
 
 #elif defined(WOLFSSL_ESPIDF)
     #if defined(WOLFSSL_ESPWROOM32) || defined(WOLFSSL_ESPWROOM32SE)
-        #include <esp_system.h>
+        #include <esp_random.h>
 
         int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
         {
diff --git a/wolfssl/openssl/sha.h b/wolfssl/openssl/sha.h
index 485cf96fc..497a8bab5 100644
--- a/wolfssl/openssl/sha.h
+++ b/wolfssl/openssl/sha.h
@@ -63,7 +63,7 @@ enum {
 };
 
 
-typedef WOLFSSL_SHA_CTX SHA_CTX;
+//typedef WOLFSSL_SHA_CTX SHA_CTX;
 
 #define SHA_Init wolfSSL_SHA_Init
 #define SHA_Update wolfSSL_SHA_Update
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index f9232768e..70932abfd 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -3250,7 +3250,7 @@ WOLFSSL_API void* wolfSSL_get_app_data( const WOLFSSL *ssl);
 WOLFSSL_API int wolfSSL_set_app_data(WOLFSSL *ssl, void *arg);
 WOLFSSL_API WOLFSSL_ASN1_OBJECT * wolfSSL_X509_NAME_ENTRY_get_object(WOLFSSL_X509_NAME_ENTRY *ne);
 WOLFSSL_API WOLFSSL_X509_NAME_ENTRY *wolfSSL_X509_NAME_get_entry(WOLFSSL_X509_NAME *name, int loc);
-WOLFSSL_API unsigned char *wolfSSL_SHA1(const unsigned char *d, size_t n, unsigned char *md);
+//WOLFSSL_API unsigned char *wolfSSL_SHA1(const unsigned char *d, size_t n, unsigned char *md);
 WOLFSSL_API unsigned char *wolfSSL_SHA256(const unsigned char *d, size_t n, unsigned char *md);
 WOLFSSL_API unsigned char *wolfSSL_SHA384(const unsigned char *d, size_t n, unsigned char *md);
 WOLFSSL_API unsigned char *wolfSSL_SHA512(const unsigned char *d, size_t n, unsigned char *md);
diff --git a/wolfssl/wolfcrypt/port/Espressif/esp32-crypt.h b/wolfssl/wolfcrypt/port/Espressif/esp32-crypt.h
index 433066af1..07b8cf3b9 100644
--- a/wolfssl/wolfcrypt/port/Espressif/esp32-crypt.h
+++ b/wolfssl/wolfcrypt/port/Espressif/esp32-crypt.h
@@ -37,8 +37,8 @@
 #include <freertos/FreeRTOS.h>
 #include "soc/dport_reg.h"
 #include "soc/hwcrypto_reg.h"
-#include "soc/cpu.h"
-#include "driver/periph_ctrl.h"
+//#include "soc/cpu.h"
+#include "esp_private/periph_ctrl.h"
 #if ESP_IDF_VERSION_MAJOR >= 4 && ESP_IDF_VERSION_MINOR >= 1
 #include <esp32/rom/ets_sys.h>
 #else
diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h
index 024bfd3bd..414dcd782 100644
--- a/wolfssl/wolfcrypt/wc_port.h
+++ b/wolfssl/wolfcrypt/wc_port.h
@@ -178,7 +178,7 @@
 #else /* MULTI_THREADED */
     /* FREERTOS comes first to enable use of FreeRTOS Windows simulator only */
     #if defined(FREERTOS)
-        typedef xSemaphoreHandle wolfSSL_Mutex;
+        typedef SemaphoreHandle_t wolfSSL_Mutex;
     #elif defined(FREERTOS_TCP)
         #include "FreeRTOS.h"
         #include "semphr.h"