From 5a77eaa5792df9a47042336ee0d859b2b8c8a582 Mon Sep 17 00:00:00 2001 From: David Garske Date: Wed, 26 Apr 2017 08:45:05 -0700 Subject: [PATCH] Fix issue with XFREE in asn.c using invalid heap pointer. Fix issue with bad variable names and missing asterisk in test.c `pkcs7_load_certs_keys`. --- wolfcrypt/src/asn.c | 2 +- wolfcrypt/test/test.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index c6b592fb5..a69f48860 100644 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -4686,7 +4686,7 @@ static int ConfirmSignature(SignatureCtx* sigCtx, } #ifdef WOLFSSL_SMALL_STACK - XFREE(encodedSig, heap, DYNAMIC_TYPE_TMP_BUFFER); + XFREE(encodedSig, sigCtx->heap, DYNAMIC_TYPE_TMP_BUFFER); #endif break; } diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index 8f3a5543b..ee52a128c 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -12366,7 +12366,7 @@ static int pkcs7_load_certs_keys(byte* rsaCert, word32* rsaCertSz, return -202; XMEMCPY(rsaCert, client_cert_der_2048, sizeof_client_cert_der_2048); - rsaCertSz = sizeof_client_cert_der_2048; + *rsaCertSz = sizeof_client_cert_der_2048; #else certFile = fopen(clientCert, "rb"); if (!certFile) @@ -12377,13 +12377,13 @@ static int pkcs7_load_certs_keys(byte* rsaCert, word32* rsaCertSz, #endif #ifdef USE_CERT_BUFFERS_1024 - if (*rsaKeySz < sizeof_client_key_der_1024) + if (*rsaPrivKeySz < sizeof_client_key_der_1024) return -204; XMEMCPY(rsaPrivKey, client_key_der_1024, sizeof_client_key_der_1024); *rsaPrivKeySz = sizeof_client_key_der_1024; #elif defined(USE_CERT_BUFFERS_2048) - if (*rsaKeySz < sizeof_client_key_der_2048) + if (*rsaPrivKeySz < sizeof_client_key_der_2048) return -205; XMEMCPY(rsaPrivKey, client_key_der_2048, sizeof_client_key_der_2048);