forked from wolfSSL/wolfssl
Compare commits
1 Commits
devin/1739
...
fixes_with
Author | SHA1 | Date | |
---|---|---|---|
3cd5dabd0b |
10
src/ssl.c
10
src/ssl.c
@ -15370,7 +15370,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
|
|||||||
{
|
{
|
||||||
int ret;
|
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);
|
(void)sizeof(sha_test);
|
||||||
|
|
||||||
WOLFSSL_ENTER("SHA_Init");
|
WOLFSSL_ENTER("SHA_Init");
|
||||||
@ -17181,7 +17181,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
|
|||||||
#endif
|
#endif
|
||||||
#ifndef NO_SHA
|
#ifndef NO_SHA
|
||||||
case WC_HASH_TYPE_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);
|
(unsigned long)sz);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
@ -17237,7 +17237,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
|
|||||||
#endif
|
#endif
|
||||||
#ifndef NO_SHA
|
#ifndef NO_SHA
|
||||||
case WC_HASH_TYPE_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;
|
if (s) *s = WC_SHA_DIGEST_SIZE;
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
@ -23526,9 +23526,11 @@ int wolfSSL_X509_VERIFY_PARAM_set1_host(WOLFSSL_X509_VERIFY_PARAM* pParam,
|
|||||||
nameSz = WOLFSSL_HOST_NAME_MAX-1;
|
nameSz = WOLFSSL_HOST_NAME_MAX-1;
|
||||||
|
|
||||||
if (nameSz > 0)
|
if (nameSz > 0)
|
||||||
|
{
|
||||||
XMEMCPY(pParam->hostName, name, nameSz);
|
XMEMCPY(pParam->hostName, name, nameSz);
|
||||||
|
}
|
||||||
|
|
||||||
pParam->hostName[nameSz] = '\0';
|
pParam->hostName[nameSz] = '\0';
|
||||||
|
|
||||||
return WOLFSSL_SUCCESS;
|
return WOLFSSL_SUCCESS;
|
||||||
}
|
}
|
||||||
|
@ -2263,7 +2263,7 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
|
|||||||
|
|
||||||
#elif defined(WOLFSSL_ESPIDF)
|
#elif defined(WOLFSSL_ESPIDF)
|
||||||
#if defined(WOLFSSL_ESPWROOM32) || defined(WOLFSSL_ESPWROOM32SE)
|
#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)
|
int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
|
||||||
{
|
{
|
||||||
|
@ -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_Init wolfSSL_SHA_Init
|
||||||
#define SHA_Update wolfSSL_SHA_Update
|
#define SHA_Update wolfSSL_SHA_Update
|
||||||
|
@ -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 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_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 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_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_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);
|
WOLFSSL_API unsigned char *wolfSSL_SHA512(const unsigned char *d, size_t n, unsigned char *md);
|
||||||
|
@ -37,8 +37,8 @@
|
|||||||
#include <freertos/FreeRTOS.h>
|
#include <freertos/FreeRTOS.h>
|
||||||
#include "soc/dport_reg.h"
|
#include "soc/dport_reg.h"
|
||||||
#include "soc/hwcrypto_reg.h"
|
#include "soc/hwcrypto_reg.h"
|
||||||
#include "soc/cpu.h"
|
//#include "soc/cpu.h"
|
||||||
#include "driver/periph_ctrl.h"
|
#include "esp_private/periph_ctrl.h"
|
||||||
#if ESP_IDF_VERSION_MAJOR >= 4 && ESP_IDF_VERSION_MINOR >= 1
|
#if ESP_IDF_VERSION_MAJOR >= 4 && ESP_IDF_VERSION_MINOR >= 1
|
||||||
#include <esp32/rom/ets_sys.h>
|
#include <esp32/rom/ets_sys.h>
|
||||||
#else
|
#else
|
||||||
|
@ -178,7 +178,7 @@
|
|||||||
#else /* MULTI_THREADED */
|
#else /* MULTI_THREADED */
|
||||||
/* FREERTOS comes first to enable use of FreeRTOS Windows simulator only */
|
/* FREERTOS comes first to enable use of FreeRTOS Windows simulator only */
|
||||||
#if defined(FREERTOS)
|
#if defined(FREERTOS)
|
||||||
typedef xSemaphoreHandle wolfSSL_Mutex;
|
typedef SemaphoreHandle_t wolfSSL_Mutex;
|
||||||
#elif defined(FREERTOS_TCP)
|
#elif defined(FREERTOS_TCP)
|
||||||
#include "FreeRTOS.h"
|
#include "FreeRTOS.h"
|
||||||
#include "semphr.h"
|
#include "semphr.h"
|
||||||
|
Reference in New Issue
Block a user