wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 12:44:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
David Garske
2017-04-26 08:45:05 -07:00
parent 7db30ef550
commit 5a77eaa579
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/asn.c
View File

@@ -4686,7 +4686,7 @@ static int ConfirmSignature(SignatureCtx* sigCtx,
} }
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(encodedSig, heap, DYNAMIC_TYPE_TMP_BUFFER); XFREE(encodedSig, sigCtx->heap, DYNAMIC_TYPE_TMP_BUFFER);
#endif #endif
break; break;
} }

6
wolfcrypt/test/test.c
View File

@@ -12366,7 +12366,7 @@ static int pkcs7_load_certs_keys(byte* rsaCert, word32* rsaCertSz,
return -202; return -202;
XMEMCPY(rsaCert, client_cert_der_2048, sizeof_client_cert_der_2048); XMEMCPY(rsaCert, client_cert_der_2048, sizeof_client_cert_der_2048);
rsaCertSz = sizeof_client_cert_der_2048; *rsaCertSz = sizeof_client_cert_der_2048;
#else #else
certFile = fopen(clientCert, "rb"); certFile = fopen(clientCert, "rb");
if (!certFile) if (!certFile)
@@ -12377,13 +12377,13 @@ static int pkcs7_load_certs_keys(byte* rsaCert, word32* rsaCertSz,
#endif #endif
#ifdef USE_CERT_BUFFERS_1024 #ifdef USE_CERT_BUFFERS_1024
if (*rsaKeySz < sizeof_client_key_der_1024) if (*rsaPrivKeySz < sizeof_client_key_der_1024)
return -204; return -204;
XMEMCPY(rsaPrivKey, client_key_der_1024, sizeof_client_key_der_1024); XMEMCPY(rsaPrivKey, client_key_der_1024, sizeof_client_key_der_1024);
*rsaPrivKeySz = sizeof_client_key_der_1024; *rsaPrivKeySz = sizeof_client_key_der_1024;
#elif defined(USE_CERT_BUFFERS_2048) #elif defined(USE_CERT_BUFFERS_2048)
if (*rsaKeySz < sizeof_client_key_der_2048) if (*rsaPrivKeySz < sizeof_client_key_der_2048)
return -205; return -205;
XMEMCPY(rsaPrivKey, client_key_der_2048, sizeof_client_key_der_2048); XMEMCPY(rsaPrivKey, client_key_der_2048, sizeof_client_key_der_2048);