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

Merge pull request #233 from toddouska/hint-types

Browse Source 
fix hint types for misuse of in_buffer and out_buffer
This commit is contained in:
JacobBarthelmeh
2015-12-30 09:34:25 -07:00
parent 71218169c1 157486ce0d
commit 87e828bf17
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/io.c
View File

@@ -866,7 +866,7 @@ static int process_http_response(int sfd, byte** respBuf,
} }
} while (state != phr_http_end); } while (state != phr_http_end);
recvBuf = (byte*)XMALLOC(recvBufSz, NULL, DYNAMIC_TYPE_IN_BUFFER); recvBuf = (byte*)XMALLOC(recvBufSz, NULL, DYNAMIC_TYPE_OCSP);
if (recvBuf == NULL) { if (recvBuf == NULL) {
WOLFSSL_MSG("process_http_response couldn't create response buffer"); WOLFSSL_MSG("process_http_response couldn't create response buffer");
return -1; return -1;
@@ -936,7 +936,7 @@ int EmbedOcspLookup(void* ctx, const char* url, int urlSz,
* free this buffer. */ * free this buffer. */
int httpBufSz = SCRATCH_BUFFER_SIZE; int httpBufSz = SCRATCH_BUFFER_SIZE;
byte* httpBuf = (byte*)XMALLOC(httpBufSz, NULL, byte* httpBuf = (byte*)XMALLOC(httpBufSz, NULL,
DYNAMIC_TYPE_IN_BUFFER); DYNAMIC_TYPE_OCSP);
if (httpBuf == NULL) { if (httpBuf == NULL) {
WOLFSSL_MSG("Unable to create OCSP response buffer"); WOLFSSL_MSG("Unable to create OCSP response buffer");
@@ -962,7 +962,7 @@ int EmbedOcspLookup(void* ctx, const char* url, int urlSz,
} }
close(sfd); close(sfd);
XFREE(httpBuf, NULL, DYNAMIC_TYPE_IN_BUFFER); XFREE(httpBuf, NULL, DYNAMIC_TYPE_OCSP);
} }
} }
@@ -980,7 +980,7 @@ void EmbedOcspRespFree(void* ctx, byte *resp)
(void)ctx; (void)ctx;
if (resp) if (resp)
XFREE(resp, NULL, DYNAMIC_TYPE_IN_BUFFER); XFREE(resp, NULL, DYNAMIC_TYPE_OCSP);
} }

4
src/ocsp.c
View File

@@ -290,7 +290,7 @@ int CheckOcspRequest(WOLFSSL_OCSP* ocsp, OcspRequest* ocspRequest,
return 0; return 0;
} }
request = (byte*)XMALLOC(requestSz, NULL, DYNAMIC_TYPE_IN_BUFFER); request = (byte*)XMALLOC(requestSz, NULL, DYNAMIC_TYPE_OCSP);
if (request == NULL) { if (request == NULL) {
WOLFSSL_LEAVE("CheckCertOCSP", MEMORY_ERROR); WOLFSSL_LEAVE("CheckCertOCSP", MEMORY_ERROR);
return MEMORY_ERROR; return MEMORY_ERROR;
@@ -306,7 +306,7 @@ int CheckOcspRequest(WOLFSSL_OCSP* ocsp, OcspRequest* ocspRequest,
if (newStatus) XFREE(newStatus, NULL, DYNAMIC_TYPE_TMP_BUFFER); if (newStatus) XFREE(newStatus, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (ocspResponse) XFREE(ocspResponse, NULL, DYNAMIC_TYPE_TMP_BUFFER); if (ocspResponse) XFREE(ocspResponse, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(request, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(request, NULL, DYNAMIC_TYPE_OCSP);
WOLFSSL_LEAVE("CheckCertOCSP", MEMORY_ERROR); WOLFSSL_LEAVE("CheckCertOCSP", MEMORY_ERROR);
return MEMORY_E; return MEMORY_E;

20
src/ssl.c
View File

@@ -1031,7 +1031,7 @@ int wolfSSL_ALPN_GetPeerProtocol(WOLFSSL* ssl, char **list, word16 *listSz)
if (*listSz == 0) if (*listSz == 0)
return BUFFER_ERROR; return BUFFER_ERROR;
*list = (char *)XMALLOC((*listSz)+1, NULL, DYNAMIC_TYPE_OUT_BUFFER); *list = (char *)XMALLOC((*listSz)+1, NULL, DYNAMIC_TYPE_TLSX);
if (*list == NULL) if (*list == NULL)
return MEMORY_ERROR; return MEMORY_ERROR;
@@ -14110,7 +14110,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher,
if (cipherInfo != NULL) if (cipherInfo != NULL)
XFREE(cipherInfo, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(cipherInfo, NULL, DYNAMIC_TYPE_TMP_BUFFER);
*pem = (byte*)XMALLOC((*plen)+1, NULL, DYNAMIC_TYPE_OUT_BUFFER); *pem = (byte*)XMALLOC((*plen)+1, NULL, DYNAMIC_TYPE_KEY);
if (*pem == NULL) { if (*pem == NULL) {
WOLFSSL_MSG("malloc failed"); WOLFSSL_MSG("malloc failed");
XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
@@ -14120,7 +14120,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher,
if (XMEMCPY(*pem, tmp, *plen) == NULL) { if (XMEMCPY(*pem, tmp, *plen) == NULL) {
WOLFSSL_MSG("XMEMCPY failed"); WOLFSSL_MSG("XMEMCPY failed");
XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER); XFREE(pem, NULL, DYNAMIC_TYPE_KEY);
XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return SSL_FAILURE; return SSL_FAILURE;
} }
@@ -14164,7 +14164,7 @@ int wolfSSL_PEM_write_RSAPrivateKey(FILE *fp, WOLFSSL_RSA *rsa,
return SSL_FAILURE; return SSL_FAILURE;
} }
XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER); XFREE(pem, NULL, DYNAMIC_TYPE_KEY);
return SSL_SUCCESS; return SSL_SUCCESS;
} }
#endif /* NO_FILESYSTEM */ #endif /* NO_FILESYSTEM */
@@ -15492,7 +15492,7 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* ecc,
if (cipherInfo != NULL) if (cipherInfo != NULL)
XFREE(cipherInfo, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(cipherInfo, NULL, DYNAMIC_TYPE_TMP_BUFFER);
*pem = (byte*)XMALLOC((*plen)+1, NULL, DYNAMIC_TYPE_OUT_BUFFER); *pem = (byte*)XMALLOC((*plen)+1, NULL, DYNAMIC_TYPE_KEY);
if (*pem == NULL) { if (*pem == NULL) {
WOLFSSL_MSG("malloc failed"); WOLFSSL_MSG("malloc failed");
XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
@@ -15502,7 +15502,7 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* ecc,
if (XMEMCPY(*pem, tmp, *plen) == NULL) { if (XMEMCPY(*pem, tmp, *plen) == NULL) {
WOLFSSL_MSG("XMEMCPY failed"); WOLFSSL_MSG("XMEMCPY failed");
XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER); XFREE(pem, NULL, DYNAMIC_TYPE_KEY);
XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return SSL_FAILURE; return SSL_FAILURE;
} }
@@ -15545,7 +15545,7 @@ int wolfSSL_PEM_write_ECPrivateKey(FILE *fp, WOLFSSL_EC_KEY *ecc,
return SSL_FAILURE; return SSL_FAILURE;
} }
XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER); XFREE(pem, NULL, DYNAMIC_TYPE_KEY);
return SSL_SUCCESS; return SSL_SUCCESS;
} }
@@ -15667,7 +15667,7 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa,
if (cipherInfo != NULL) if (cipherInfo != NULL)
XFREE(cipherInfo, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(cipherInfo, NULL, DYNAMIC_TYPE_TMP_BUFFER);
*pem = (byte*)XMALLOC((*plen)+1, NULL, DYNAMIC_TYPE_OUT_BUFFER); *pem = (byte*)XMALLOC((*plen)+1, NULL, DYNAMIC_TYPE_KEY);
if (*pem == NULL) { if (*pem == NULL) {
WOLFSSL_MSG("malloc failed"); WOLFSSL_MSG("malloc failed");
XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
@@ -15677,7 +15677,7 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa,
if (XMEMCPY(*pem, tmp, *plen) == NULL) { if (XMEMCPY(*pem, tmp, *plen) == NULL) {
WOLFSSL_MSG("XMEMCPY failed"); WOLFSSL_MSG("XMEMCPY failed");
XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER); XFREE(pem, NULL, DYNAMIC_TYPE_KEY);
XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return SSL_FAILURE; return SSL_FAILURE;
} }
@@ -15720,7 +15720,7 @@ int wolfSSL_PEM_write_DSAPrivateKey(FILE *fp, WOLFSSL_DSA *dsa,
return SSL_FAILURE; return SSL_FAILURE;
} }
XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER); XFREE(pem, NULL, DYNAMIC_TYPE_KEY);
return SSL_SUCCESS; return SSL_SUCCESS;
} }

2
tests/api.c
View File

@@ -1449,7 +1449,7 @@ static void verify_ALPN_client_list(WOLFSSL* ssl)
AssertIntEQ(1, sizeof(alpn_list) == clistSz); AssertIntEQ(1, sizeof(alpn_list) == clistSz);
AssertIntEQ(0, XMEMCMP(alpn_list, clist, clistSz)); AssertIntEQ(0, XMEMCMP(alpn_list, clist, clistSz));
XFREE(clist, 0, DYNAMIC_TYPE_OUT_BUFFER); XFREE(clist, 0, DYNAMIC_TYPE_TLSX);
} }
static void test_wolfSSL_UseALPN_connection(void) static void test_wolfSSL_UseALPN_connection(void)