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

Fix for CID 299649 checking on if ctx is null

Browse Source
This commit is contained in:
JacobBarthelmeh
2023-10-27 15:28:42 -06:00
parent 29782449ec
commit 7d5491994e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ssl.c
View File

@@ -6464,7 +6464,8 @@ static int ProcessBufferTryDecodeRsa(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
#ifdef WOLF_PRIVATE_KEY_ID #ifdef WOLF_PRIVATE_KEY_ID
if ((ret != 0) && (devId != INVALID_DEVID if ((ret != 0) && (devId != INVALID_DEVID
#ifdef HAVE_PK_CALLBACKS #ifdef HAVE_PK_CALLBACKS
|| wolfSSL_CTX_IsPrivatePkSet(ctx) || ((ssl == NULL) ? wolfSSL_CTX_IsPrivatePkSet(ctx) :
wolfSSL_CTX_IsPrivatePkSet(ssl->ctx))
#endif #endif
)) { )) {
word32 nSz; word32 nSz;
@@ -6542,7 +6543,8 @@ static int ProcessBufferTryDecodeRsa(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
#ifdef WOLF_PRIVATE_KEY_ID #ifdef WOLF_PRIVATE_KEY_ID
if (ret != 0 && (devId != INVALID_DEVID if (ret != 0 && (devId != INVALID_DEVID
#ifdef HAVE_PK_CALLBACKS #ifdef HAVE_PK_CALLBACKS
|| wolfSSL_CTX_IsPrivatePkSet(ctx) || ((ssl == NULL) ? wolfSSL_CTX_IsPrivatePkSet(ctx) :
wolfSSL_CTX_IsPrivatePkSet(ssl->ctx))
#endif #endif
)) { )) {
/* if using crypto or PK callbacks, try public key decode */ /* if using crypto or PK callbacks, try public key decode */
@@ -6623,7 +6625,8 @@ static int ProcessBufferTryDecodeEcc(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
#ifdef WOLF_PRIVATE_KEY_ID #ifdef WOLF_PRIVATE_KEY_ID
if (ret != 0 && (devId != INVALID_DEVID if (ret != 0 && (devId != INVALID_DEVID
#ifdef HAVE_PK_CALLBACKS #ifdef HAVE_PK_CALLBACKS
|| wolfSSL_CTX_IsPrivatePkSet(ctx) || ((ssl == NULL) ? wolfSSL_CTX_IsPrivatePkSet(ctx) :
wolfSSL_CTX_IsPrivatePkSet(ssl->ctx))
#endif #endif
)) { )) {
/* if using crypto or PK callbacks, try public key decode */ /* if using crypto or PK callbacks, try public key decode */
@@ -6709,7 +6712,8 @@ static int ProcessBufferTryDecodeEd25519(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
#ifdef WOLF_PRIVATE_KEY_ID #ifdef WOLF_PRIVATE_KEY_ID
if (ret != 0 && (devId != INVALID_DEVID if (ret != 0 && (devId != INVALID_DEVID
#ifdef HAVE_PK_CALLBACKS #ifdef HAVE_PK_CALLBACKS
|| wolfSSL_CTX_IsPrivatePkSet(ctx) || ((ssl == NULL) ? wolfSSL_CTX_IsPrivatePkSet(ctx) :
wolfSSL_CTX_IsPrivatePkSet(ssl->ctx))
#endif #endif
)) { )) {
/* if using crypto or PK callbacks, try public key decode */ /* if using crypto or PK callbacks, try public key decode */
@@ -6788,7 +6792,8 @@ static int ProcessBufferTryDecodeEd448(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
#ifdef WOLF_PRIVATE_KEY_ID #ifdef WOLF_PRIVATE_KEY_ID
if (ret != 0 && (devId != INVALID_DEVID if (ret != 0 && (devId != INVALID_DEVID
#ifdef HAVE_PK_CALLBACKS #ifdef HAVE_PK_CALLBACKS
|| wolfSSL_CTX_IsPrivatePkSet(ctx) || ((ssl == NULL) ? wolfSSL_CTX_IsPrivatePkSet(ctx) :
wolfSSL_CTX_IsPrivatePkSet(ssl->ctx))
#endif #endif
)) { )) {
/* if using crypto or PK callbacks, try public key decode */ /* if using crypto or PK callbacks, try public key decode */