wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

More fixups from cppcheck and clang-tidy.

Browse Source
This commit is contained in:
David Garske
2022-02-24 16:18:42 -08:00
parent 269ab86002
commit a39a1c1d87
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ssl.c
View File

@@ -5266,7 +5266,7 @@ int AddCA(WOLFSSL_CERT_MANAGER* cm, DerBuffer** pDer, int type, int verify)
#define SESSIONS_PER_ROW 3 #define SESSIONS_PER_ROW 3
#define SESSION_ROWS 11 #define SESSION_ROWS 11
#endif #endif
#define INVALID_SESSION_ROW -1 #define INVALID_SESSION_ROW (-1)
#ifdef NO_SESSION_CACHE_ROW_LOCK #ifdef NO_SESSION_CACHE_ROW_LOCK
#undef ENABLE_SESSION_CACHE_ROW_LOCK #undef ENABLE_SESSION_CACHE_ROW_LOCK
@@ -15511,6 +15511,7 @@ int wolfSSL_GetSessionFromCache(WOLFSSL* ssl, WOLFSSL_SESSION* output)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
#endif #endif
XMEMSET(bogusID, 0, sizeof(bogusID));
if (!IsAtLeastTLSv1_3(ssl->version) && ssl->arrays != NULL) if (!IsAtLeastTLSv1_3(ssl->version) && ssl->arrays != NULL)
id = ssl->arrays->sessionID; id = ssl->arrays->sessionID;
else if (ssl->session->haveAltSessionID) { else if (ssl->session->haveAltSessionID) {
@@ -15767,8 +15768,6 @@ int wolfSSL_SetSession(WOLFSSL* ssl, WOLFSSL_SESSION* session)
SESSION_ROW_UNLOCK(sessRow); SESSION_ROW_UNLOCK(sessRow);
sessRow = NULL; sessRow = NULL;
} }
/* Make sure we don't access this anymore */
session = NULL;
if (ret != WOLFSSL_SUCCESS) if (ret != WOLFSSL_SUCCESS)
return ret; return ret;
@@ -24095,10 +24094,10 @@ int wolfSSL_DupSession(const WOLFSSL_SESSION* input, WOLFSSL_SESSION* output,
} }
else { else {
tmp = (byte*)XREALLOC(ticBuff, input->ticketLen, tmp = (byte*)XREALLOC(ticBuff, input->ticketLen,
input->heap, DYNAMIC_TYPE_SESSION_TICK); output->heap, DYNAMIC_TYPE_SESSION_TICK);
if (tmp == NULL) { if (tmp == NULL) {
WOLFSSL_MSG("Failed to allocate memory for ticket"); WOLFSSL_MSG("Failed to allocate memory for ticket");
XFREE(ticBuff, input->heap, DYNAMIC_TYPE_SESSION_TICK); XFREE(ticBuff, output->heap, DYNAMIC_TYPE_SESSION_TICK);
output->ticket = NULL; output->ticket = NULL;
output->ticketLen = 0; output->ticketLen = 0;
output->ticketLenAlloc = 0; output->ticketLenAlloc = 0;
@@ -24142,7 +24141,7 @@ int wolfSSL_DupSession(const WOLFSSL_SESSION* input, WOLFSSL_SESSION* output,
} }
else { else {
if (ticBuff != NULL) if (ticBuff != NULL)
XFREE(ticBuff, input->heap, DYNAMIC_TYPE_SESSION_TICK); XFREE(ticBuff, output->heap, DYNAMIC_TYPE_SESSION_TICK);
output->ticket = output->_staticTicket; output->ticket = output->_staticTicket;
output->ticketLenAlloc = 0; output->ticketLenAlloc = 0;
} }

2
tests/api.c
View File

@@ -39320,6 +39320,8 @@ static void test_wolfSSL_SESSION(void)
#else #else
AssertIntEQ(wolfSSL_SESSION_has_ticket(sess), 0); AssertIntEQ(wolfSSL_SESSION_has_ticket(sess), 0);
#endif #endif
#else
(void)sess;
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA */
/* Retain copy of the session for later testing */ /* Retain copy of the session for later testing */

4
wolfssl/internal.h
View File

@@ -4611,13 +4611,13 @@ struct WOLFSSL {
*/ */
#ifdef WOLFSSL_HAVE_ERROR_QUEUE #ifdef WOLFSSL_HAVE_ERROR_QUEUE
#define CLEAR_ASN_NO_PEM_HEADER_ERROR(err) \ #define CLEAR_ASN_NO_PEM_HEADER_ERROR(err) \
err = wolfSSL_ERR_peek_last_error(); \ (err) = wolfSSL_ERR_peek_last_error(); \
if (ERR_GET_LIB(err) == ERR_LIB_PEM && \ if (ERR_GET_LIB(err) == ERR_LIB_PEM && \
ERR_GET_REASON(err) == PEM_R_NO_START_LINE) { \ ERR_GET_REASON(err) == PEM_R_NO_START_LINE) { \
wc_RemoveErrorNode(-1); \ wc_RemoveErrorNode(-1); \
} }
#else #else
#define CLEAR_ASN_NO_PEM_HEADER_ERROR(err) (void)err; #define CLEAR_ASN_NO_PEM_HEADER_ERROR(err) (void)(err);
#endif #endif
/* /*

3
wolfssl/ssl.h
View File

@@ -2852,7 +2852,8 @@ WOLFSSL_API int wolfSSL_make_eap_keys(WOLFSSL* ssl, void* key, unsigned int len,
WOLFSSL_API int wolfSSL_Unload_trust_peers(WOLFSSL* ssl); WOLFSSL_API int wolfSSL_Unload_trust_peers(WOLFSSL* ssl);
#endif #endif
WOLFSSL_API int wolfSSL_CTX_trust_peer_buffer(WOLFSSL_CTX* ctx, WOLFSSL_API int wolfSSL_CTX_trust_peer_buffer(WOLFSSL_CTX* ctx,
const unsigned char*, long, int); const unsigned char* in,
long sz, int format);
#endif #endif
WOLFSSL_API int wolfSSL_CTX_load_verify_buffer_ex(WOLFSSL_CTX* ctx, WOLFSSL_API int wolfSSL_CTX_load_verify_buffer_ex(WOLFSSL_CTX* ctx,
const unsigned char* in, long sz, int format, const unsigned char* in, long sz, int format,