Skip to content

Commit f57a7b7

Browse files
committed
Fix SRTP KDF null-idx crash and X509 DER length hardening
- wolfcrypt/src/kdf.c: Add null idx guard to wc_SRTP_KDF, wc_SRTCP_KDF, wc_SRTP_KDF_kdr_to_idx, and wc_KDF_SRTP_label - src/x509.c: Add derCert->length > INT_MAX check in wolfSSL_X509_get_der and derSz <= 0 check in wolfSSL_i2d_X509
1 parent 5074cf3 commit f57a7b7

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

src/x509.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4406,6 +4406,10 @@ const byte* wolfSSL_X509_get_der(WOLFSSL_X509* x509, int* outSz)
44064406
if (x509 == NULL || x509->derCert == NULL || outSz == NULL)
44074407
return NULL;
44084408

4409+
if (x509->derCert->length > (word32)INT_MAX) {
4410+
return NULL;
4411+
}
4412+
44094413
*outSz = (int)x509->derCert->length;
44104414
return x509->derCert->buffer;
44114415
}
@@ -8676,7 +8680,7 @@ int wolfSSL_i2d_X509(WOLFSSL_X509* x509, unsigned char** out)
86768680
}
86778681

86788682
der = wolfSSL_X509_get_der(x509, &derSz);
8679-
if (der == NULL) {
8683+
if (der == NULL || derSz <= 0) {
86808684
WOLFSSL_LEAVE("wolfSSL_i2d_X509", MEMORY_E);
86818685
return MEMORY_E;
86828686
}

0 commit comments

Comments
 (0)