feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #2988 from miyazakh/peakmem

Browse Source 
added WOLFSSL_LEAVE for measuring peak memory script
This commit is contained in:
Chris Conlon
2020-05-22 15:37:30 -06:00
committed by GitHub
parent d27c023dd9 5dfc36d32a
commit 165fce7c57
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ssl.c
View File

@ -13610,6 +13610,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
word32 flags)
{
int verify;
int ret = WOLFSSL_FAILURE;
WOLFSSL_ENTER("wolfSSL_CTX_load_verify_buffer_ex");
@ -13618,11 +13619,13 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
verify = VERIFY_SKIP_DATE;
if (format == WOLFSSL_FILETYPE_PEM)
return ProcessChainBuffer(ctx, in, sz, format, CA_TYPE, NULL,
ret = ProcessChainBuffer(ctx, in, sz, format, CA_TYPE, NULL,
verify);
else
return ProcessBuffer(ctx, in, sz, format, CA_TYPE, NULL, NULL,
ret = ProcessBuffer(ctx, in, sz, format, CA_TYPE, NULL, NULL,
userChain, verify);
WOLFSSL_LEAVE("wolfSSL_CTX_load_verify_buffer_ex", ret);
return ret;
}
/* wolfSSL extension allows DER files to be loaded from buffers as well */
@ -13668,18 +13671,26 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
int wolfSSL_CTX_use_certificate_buffer(WOLFSSL_CTX* ctx,
const unsigned char* in, long sz, int format)
{
int ret = WOLFSSL_FAILURE;
WOLFSSL_ENTER("wolfSSL_CTX_use_certificate_buffer");
return ProcessBuffer(ctx, in, sz, format, CERT_TYPE, NULL, NULL, 0,
ret = ProcessBuffer(ctx, in, sz, format, CERT_TYPE, NULL, NULL, 0,
GET_VERIFY_SETTING_CTX(ctx));
WOLFSSL_LEAVE("wolfSSL_CTX_use_certificate_buffer", ret);
return ret;
}
int wolfSSL_CTX_use_PrivateKey_buffer(WOLFSSL_CTX* ctx,
const unsigned char* in, long sz, int format)
{
int ret = WOLFSSL_FAILURE;
WOLFSSL_ENTER("wolfSSL_CTX_use_PrivateKey_buffer");
return ProcessBuffer(ctx, in, sz, format, PRIVATEKEY_TYPE, NULL, NULL,
ret = ProcessBuffer(ctx, in, sz, format, PRIVATEKEY_TYPE, NULL, NULL,
0, GET_VERIFY_SETTING_CTX(ctx));
WOLFSSL_LEAVE("wolfSSL_CTX_use_PrivateKey_buffer", ret);
return ret;
}
#ifdef HAVE_PKCS11