wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-02-03 22:35:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve issues with the openssl compatibility CRYPTO_malloc and CRYPTO_free.

Browse Source
This commit is contained in:
David Garske
2020-04-22 10:15:16 -07:00
parent 0cfde0794b
commit 36a556f927
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/test/test.c
View File

@@ -15614,16 +15614,12 @@ int openssl_test(void)
/* test malloc / free , 10 is an arbitrary amount of memory chosen */
{
byte* p;
p = (byte*)CRYPTO_malloc(10, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
p = (byte*)CRYPTO_malloc(10);
if (p == NULL) {
return -8400;
}
XMEMSET(p, 0, 10);
#ifdef WOLFSSL_QT
CRYPTO_free(p);
#else
CRYPTO_free(p, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
#endif
CRYPTO_free(p);
}
#ifndef NO_MD5

13
wolfssl/openssl/ssl.h
View File

@@ -125,17 +125,8 @@ typedef WOLFSSL_X509_VERIFY_PARAM X509_VERIFY_PARAM;
#define CONF_get1_default_config_file wolfSSL_CONF_get1_default_config_file
typedef STACK_OF(ACCESS_DESCRIPTION) AUTHORITY_INFO_ACCESS;
#ifdef WOLFSSL_QT
#if defined(NO_WOLFSSL_MEMORY)
#define CRYPTO_free(xp) XFREE(xp, NULL, NULL);
#else
#define CRYPTO_free(xp) { if((xp)) wolfSSL_Free((xp));}
#endif
#else
#define CRYPTO_free XFREE
#endif
#define CRYPTO_malloc XMALLOC
#define CRYPTO_free(xp) XFREE(xp, NULL, DYNAMIC_TYPE_TMP_BUFFER)
#define CRYPTO_malloc(sz) XMALLOC(sz, NULL, DYNAMIC_TYPE_TMP_BUFFER)
#define CRYPTO_EX_new WOLFSSL_CRYPTO_EX_new
#define CRYPTO_EX_dup WOLFSSL_CRYPTO_EX_dup
#define CRYPTO_EX_free WOLFSSL_CRYPTO_EX_free