Low-severity security hardening across TLS, X.509, PKCS#7/12, DTLS 1.3, QUIC, and the sniffer

src/bio.c

@@ -2456,6 +2456,7 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
         bio = wolfSSL_BIO_new(wolfSSL_BIO_s_socket());
         if (bio) {
             const char* port;
+            int portVal = 0;
 #ifdef WOLFSSL_IPV6
             const char* ipv6Start = XSTRSTR(str, "[");
             const char* ipv6End = XSTRSTR(str, "]");
@@ -2466,8 +2467,13 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
 #endif
                 port = XSTRSTR(str, ":");
 
-            if (port != NULL)
-                bio->port = (word16)XATOI(port + 1);
+            if (port != NULL) {
+                portVal = XATOI(port + 1);
+                /* Reject out-of-range ports instead of truncating to word16. */
+                if ((portVal < 0) || (portVal > 65535))
+                    portVal = 0;
+                bio->port = (word16)portVal;
+            }
             else
                 port = str + XSTRLEN(str); /* point to null terminator */
 

src/internal.c

@@ -12867,6 +12867,8 @@ static int BuildMD5(WOLFSSL* ssl, Hashes* hashes, const byte* sender)
         }
     }
 
+    ForceZero(md5_result, WC_MD5_DIGEST_SIZE);
+
     WC_FREE_VAR_EX(md5, ssl->heap, DYNAMIC_TYPE_HASHCTX);
 
     return ret;
@@ -12912,6 +12914,8 @@ static int BuildSHA(WOLFSSL* ssl, Hashes* hashes, const byte* sender)
         }
     }
 
+    ForceZero(sha_result, WC_SHA_DIGEST_SIZE);
+
     WC_FREE_VAR_EX(sha, ssl->heap, DYNAMIC_TYPE_HASHCTX);
 
     return ret;
@@ -15355,7 +15359,7 @@ int SetupStoreCtxCallback(WOLFSSL_X509_STORE_CTX** store_pt,
         if (args->certIdx == 0) {
             FreeX509(&ssl->peerCert);
             InitX509(&ssl->peerCert, 0, ssl->heap);
-            if (CopyDecodedToX509(&ssl->peerCert, args->dCert) == 0)
+            if (CopyDecodedToX509(&ssl->peerCert, args->dCert) != 0)
                 WOLFSSL_MSG("Unable to copy to ssl->peerCert");
             store->current_cert = &ssl->peerCert; /* use existing X509 */
         }
@@ -23775,6 +23779,14 @@ static int CheckResumptionConsistency(WOLFSSL* ssl)
 static int DoChangeCipherSpecTls13(WOLFSSL* ssl)
 {
     word32 i = ssl->buffers.inputBuffer.idx;
+#ifdef WOLFSSL_DTLS13
+    if (ssl->options.dtls) {
+        /* CCS is not part of DTLS 1.3; discard the record without alerting so a
+         * spoofed CCS cannot tear down the handshake. */
+        ssl->buffers.inputBuffer.idx += ssl->curSize;
+        return 0;
+    }
+#endif
     if (ssl->options.handShakeState == HANDSHAKE_DONE) {
         SendAlert(ssl, alert_fatal, unexpected_message);
         WOLFSSL_ERROR_VERBOSE(UNKNOWN_RECORD_TYPE);
@@ -25226,6 +25238,8 @@ static int BuildMD5_CertVerify(const WOLFSSL* ssl, byte* digest)
         }
     }
 
+    ForceZero(md5_result, WC_MD5_DIGEST_SIZE);
+
     WC_FREE_VAR_EX(md5, ssl->heap, DYNAMIC_TYPE_HASHCTX);
 
     return ret;
@@ -25272,6 +25286,8 @@ static int BuildSHA_CertVerify(const WOLFSSL* ssl, byte* digest)
         }
     }
 
+    ForceZero(sha_result, WC_SHA_DIGEST_SIZE);
+
     WC_FREE_VAR_EX(sha, ssl->heap, DYNAMIC_TYPE_HASHCTX);
 
     return ret;
@@ -42548,15 +42564,28 @@ static int DefTicketEncCb(WOLFSSL* ssl, byte key_name[WOLFSSL_TICKET_NAME_SZ],
         /* Update AAD with index. */
         aad[WOLFSSL_TICKET_NAME_SZ - 1] |= keyIdx;
 
+#ifndef SINGLE_THREADED
+        /* Hold the lock over the key/expiry read so a concurrent regen can't swap the key mid-decrypt. */
+        if (wc_LockMutex(&keyCtx->mutex) != 0) {
+            WOLFSSL_MSG("Couldn't lock key context mutex");
+            return WOLFSSL_TICKET_RET_REJECT;
+        }
+#endif
         /* Check expirary */
         if (keyCtx->expirary[keyIdx] <= LowResTimer()) {
+#ifndef SINGLE_THREADED
+            wc_UnLockMutex(&keyCtx->mutex);
+#endif
             return WOLFSSL_TICKET_RET_REJECT;
         }
 
         /* Decrypt ticket data. */
         ret = TicketEncDec(keyCtx->key[keyIdx], WOLFSSL_TICKET_KEY_SZ, iv, aad,
                            aadSz, ticket, inLen, ticket, outLen, mac, ssl->heap,
                            0);
+#ifndef SINGLE_THREADED
+        wc_UnLockMutex(&keyCtx->mutex);
+#endif
         if (ret != 0) {
             return WOLFSSL_TICKET_RET_REJECT;
         }

src/ocsp.c

@@ -1159,7 +1159,7 @@ OcspResponse* wolfSSL_d2i_OCSP_RESPONSE_bio(WOLFSSL_BIO* bio,
             return NULL;
         dataAlloced = 1;
 
-        len = wolfSSL_BIO_read(bio, (char *)data, (int)flen);
+        len = wolfSSL_BIO_read(bio, (char *)data, (int)fcur);
     }
 #endif
     else

src/quic.c

@@ -1239,6 +1239,11 @@ int wolfSSL_quic_hkdf_expand(uint8_t* dest, size_t destlen,
 
     WOLFSSL_ENTER("wolfSSL_quic_hkdf_expand");
 
+    if (secretlen > INT_MAX || infolen > INT_MAX) {
+        ret = WOLFSSL_FAILURE;
+        goto cleanup;
+    }
+
     pctx = wolfSSL_EVP_PKEY_CTX_new_id(WC_NID_hkdf, NULL);
     if (pctx == NULL) {
         ret = WOLFSSL_FAILURE;
@@ -1279,6 +1284,11 @@ int wolfSSL_quic_hkdf(uint8_t* dest, size_t destlen,
 
     WOLFSSL_ENTER("wolfSSL_quic_hkdf");
 
+    if (secretlen > INT_MAX || saltlen > INT_MAX || infolen > INT_MAX) {
+        ret = WOLFSSL_FAILURE;
+        goto cleanup;
+    }
+
     pctx = wolfSSL_EVP_PKEY_CTX_new_id(WC_NID_hkdf, NULL);
     if (pctx == NULL) {
         ret = WOLFSSL_FAILURE;
@@ -1348,6 +1358,10 @@ int wolfSSL_quic_aead_encrypt(uint8_t* dest, WOLFSSL_EVP_CIPHER_CTX* ctx,
      * TODO: there is some fiddling in OpenSSL+quic in regard to CCM ciphers
      *       which we need to check.
      */
+    if (plainlen > INT_MAX || aadlen > INT_MAX) {
+        return WOLFSSL_FAILURE;
+    }
+
     if (wolfSSL_EVP_CipherInit(ctx, NULL, NULL, iv, 1) != WOLFSSL_SUCCESS
         || wolfSSL_EVP_CipherUpdate(
                 ctx, NULL, &len, aad, (int)aadlen) != WOLFSSL_SUCCESS
@@ -1373,7 +1387,7 @@ int wolfSSL_quic_aead_decrypt(uint8_t* dest, WOLFSSL_EVP_CIPHER_CTX* ctx,
     const uint8_t* tag;
 
     /* See rationale for wolfSSL_quic_aead_encrypt() on why this is here */
-    if (enclen > INT_MAX || ctx->authTagSz > (int)enclen) {
+    if (enclen > INT_MAX || aadlen > INT_MAX || ctx->authTagSz > (int)enclen) {
         return WOLFSSL_FAILURE;
     }
 

src/sniffer.c

@@ -4482,6 +4482,10 @@ static int ProcessCertificate(const byte* input, int* sslBytes,
     }
 #endif
 
+    if (OPAQUE24_LEN > *sslBytes) {
+        SetError(BAD_CERT_MSG_STR, error, session, FATAL_ERROR_STATE);
+        return WOLFSSL_FATAL_ERROR;
+    }
     ato24(input, &certChainSz);
     *sslBytes -= CERT_HEADER_SZ;
     input += CERT_HEADER_SZ;
@@ -4491,6 +4495,10 @@ static int ProcessCertificate(const byte* input, int* sslBytes,
         return WOLFSSL_FATAL_ERROR;
     }
 
+    if (OPAQUE24_LEN > *sslBytes) {
+        SetError(BAD_CERT_MSG_STR, error, session, FATAL_ERROR_STATE);
+        return WOLFSSL_FATAL_ERROR;
+    }
     ato24(input, &certSz);
     input += OPAQUE24_LEN;
     if (*sslBytes < (int)certSz) {

src/ssl.c

@@ -12361,7 +12361,13 @@ void* wolfSSL_GetHKDFExtractCtx(WOLFSSL* ssl)
     {
     #if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)
         WOLFSSL_ENTER("wolfSSL_set_verify_depth");
-        ssl->options.verifyDepth = (byte)depth;
+        /* Reject out-of-range depths; valid range is 0 to MAX_CHAIN_DEPTH. */
+        if ((ssl == NULL) || (depth < 0) || (depth > MAX_CHAIN_DEPTH)) {
+            WOLFSSL_MSG("Bad depth argument, too large or less than 0");
+        }
+        else {
+            ssl->options.verifyDepth = (byte)depth;
+        }
     #endif
     }
 
@@ -16065,6 +16071,7 @@ int wolfSSL_RAND_pseudo_bytes(unsigned char* buf, int num)
     (void)hash;
     (void)secret;
 #endif
+    ForceZero(secret, DRBG_SEED_LEN);
     return ret;
 }
 
@@ -16939,20 +16946,39 @@ int wolfSSL_FIPS_drbg_uninstantiate(WOLFSSL_DRBG_CTX *ctx)
 void wolfSSL_FIPS_drbg_free(WOLFSSL_DRBG_CTX *ctx)
 {
     if (ctx != NULL) {
+        int locked = 0;
         /* As safety check if free'ing the default drbg, then mark global NULL.
          * Technically the user should not call free on the default drbg. */
+    #ifndef WOLFSSL_MUTEX_INITIALIZER
+        /* wolfSSL_Cleanup may free the mutex before this runs. */
+        if ((globalRNGMutex_valid == 1) && (wc_LockMutex(&globalRNGMutex) == 0))
+    #else
+        if (wc_LockMutex(&globalRNGMutex) == 0)
+    #endif
+            locked = 1;
         if (ctx == gDrbgDefCtx) {
             gDrbgDefCtx = NULL;
         }
+        if (locked)
+            wc_UnLockMutex(&globalRNGMutex);
         wolfSSL_FIPS_drbg_uninstantiate(ctx);
         XFREE(ctx, NULL, DYNAMIC_TYPE_OPENSSL);
     }
 }
 WOLFSSL_DRBG_CTX* wolfSSL_FIPS_get_default_drbg(void)
 {
+    int locked = 0;
+#ifndef WOLFSSL_MUTEX_INITIALIZER
+    if ((globalRNGMutex_valid == 1) && (wc_LockMutex(&globalRNGMutex) == 0))
+#else
+    if (wc_LockMutex(&globalRNGMutex) == 0)
+#endif
+        locked = 1;
     if (gDrbgDefCtx == NULL) {
         gDrbgDefCtx = wolfSSL_FIPS_drbg_new(0, 0);
     }
+    if (locked)
+        wc_UnLockMutex(&globalRNGMutex);
     return gDrbgDefCtx;
 }
 void wolfSSL_FIPS_get_timevec(unsigned char* buf, unsigned long* pctr)

src/ssl_api_crl_ocsp.c

@@ -395,6 +395,9 @@ int wolfSSL_get_ocsp_producedDate(
     size_t producedDate_space,
     int *producedDateFormat)
 {
+    if (ssl == NULL)
+        return BAD_FUNC_ARG;
+
     if ((ssl->ocspProducedDateFormat != ASN_UTC_TIME) &&
         (ssl->ocspProducedDateFormat != ASN_GENERALIZED_TIME))
         return BAD_FUNC_ARG;
@@ -415,6 +418,9 @@ int wolfSSL_get_ocsp_producedDate(
 int wolfSSL_get_ocsp_producedDate_tm(WOLFSSL *ssl, struct tm *produced_tm) {
     int idx = 0;
 
+    if (ssl == NULL)
+        return BAD_FUNC_ARG;
+
     if ((ssl->ocspProducedDateFormat != ASN_UTC_TIME) &&
         (ssl->ocspProducedDateFormat != ASN_GENERALIZED_TIME))
         return BAD_FUNC_ARG;

src/ssl_api_pk.c

@@ -393,7 +393,7 @@ int wolfSSL_CTX_check_private_key(const WOLFSSL_CTX* ctx)
             res = check_cert_key(ctx->certificate, privateKey, altPrivateKey,
                 ctx->heap, ctx->privateKeyDevId, ctx->privateKeyLabel,
                 ctx->privateKeyId, ctx->altPrivateKeyDevId,
-                ctx->altPrivateKeyLabel, ctx->altPrivateKeyId) != 0;
+                ctx->altPrivateKeyLabel, ctx->altPrivateKeyId) == 1;
         }
     #ifdef WOLFSSL_BLIND_PRIVATE_KEY
         /* Dispose of the unblinded buffers. */

src/ssl_bn.c

@@ -326,23 +326,21 @@ const WOLFSSL_BIGNUM* wolfSSL_BN_value_one(void)
             wolfSSL_BN_free(one);
             one = NULL;
         }
-        else
+        else {
     #ifndef SINGLE_THREADED
-        /* Ensure global has not been set by another thread. */
-        if (bn_one == NULL)
-    #endif
-        {
+            void* expected = NULL;
+            /* Publish atomically so a losing thread frees only its own object,
+             * never a pointer already handed to another thread. */
+            if (!wolfSSL_Atomic_Ptr_CompareExchange((void* volatile*)&bn_one,
+                    &expected, one)) {
+                wolfSSL_BN_free(one);
+                one = (WOLFSSL_BIGNUM*)expected;
+            }
+    #else
             /* Set this big number as the global. */
             bn_one = one;
-        }
-    #ifndef SINGLE_THREADED
-        /* Check if another thread has set the global. */
-        if (bn_one != one) {
-            /* Dispose of this big number and return the global.  */
-            wolfSSL_BN_free(one);
-            one = bn_one;
-        }
     #endif
+        }
     }
 
     return one;

src/ssl_crypto.c

@@ -2880,6 +2880,8 @@ void wolfSSL_DES_ede3_cbc_encrypt(const unsigned char* input,
             }
         }
         wc_Des3Free(des3);
+
+        ForceZero(key, DES3_KEY_SIZE);
     }
 
     WC_FREE_VAR_EX(des3, NULL, DYNAMIC_TYPE_CIPHER);

src/ssl_misc.c

@@ -70,6 +70,11 @@ static int wolfssl_read_bio_file(WOLFSSL_BIO* bio, char** data)
 
             /* Update total read. */
             ret += sz;
+            /* Cap total like the direct-file path to avoid int overflow. */
+            if (ret > MAX_WOLFSSL_FILE_SIZE) {
+                sz = BUFFER_E;
+                break;
+            }
             /* Calculate remaining unused memory. */
             remaining = READ_BIO_FILE_CHUNK - (ret % READ_BIO_FILE_CHUNK);
             /* Check for space remaining. */

src/ssl_p7p12.c

@@ -903,6 +903,7 @@ int wolfSSL_PKCS7_encode_certs(PKCS7* pkcs7, WOLFSSL_STACK* certs,
 {
     int ret;
     WOLFSSL_PKCS7* p7;
+    WOLFSSL_STACK* certHead = certs;
     WOLFSSL_ENTER("wolfSSL_PKCS7_encode_certs");
 
     if (!pkcs7 || !certs || !out) {
@@ -912,10 +913,6 @@ int wolfSSL_PKCS7_encode_certs(PKCS7* pkcs7, WOLFSSL_STACK* certs,
 
     p7 = (WOLFSSL_PKCS7*)pkcs7;
 
-    /* take ownership of certs */
-    p7->certs = certs;
-    /* TODO: takes ownership even on failure below but not on above failure. */
-
     if (pkcs7->certList) {
         WOLFSSL_MSG("wolfSSL_PKCS7_encode_certs called multiple times on same "
                     "struct");
@@ -957,6 +954,9 @@ int wolfSSL_PKCS7_encode_certs(PKCS7* pkcs7, WOLFSSL_STACK* certs,
         certs = certs->next;
     }
 
+    /* certs are now incorporated into pkcs7; take ownership (earlier failures leave ownership with the caller). */
+    p7->certs = certHead;
+
     if (wc_PKCS7_SetSignerIdentifierType(pkcs7, DEGENERATE_SID) != 0) {
         WOLFSSL_MSG("wc_PKCS7_SetSignerIdentifierType error");
         return WOLFSSL_FAILURE;