Skip to content

Fix: F-7523 #11937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ohki-saito wants to merge 2 commits into
base: master
Choose a base branch
from
+105 −8
Draft

Fix: F-7523 #11937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d8fab5
Leave req and cid unchanged on failure in OCSP_request_add0_id
ohki-saito Oct 30, 2026
9563249
Guard OCSP allocation-failure test with allocator conditions
ohki-saito Oct 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/ocsp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1393,9 +1393,25 @@ int wolfSSL_i2d_OCSP_REQUEST(OcspRequest* request, unsigned char** data)
WOLFSSL_OCSP_ONEREQ* wolfSSL_OCSP_request_add0_id(OcspRequest *req,
WOLFSSL_OCSP_CERTID *cid)
{
byte* serial = NULL;

if (req == NULL || cid == NULL || cid->status == NULL)
return NULL;

/* Allocate before changing req so that it is unchanged on failure and the
* caller still owns cid. */
if (cid->status->serialSz > req->serialSz) {
serial = (byte*)XMALLOC((size_t)cid->status->serialSz,
req->heap, DYNAMIC_TYPE_OCSP_REQUEST);
if (serial == NULL)
return NULL;
}

if (serial != NULL) {
XFREE(req->serial, req->heap, DYNAMIC_TYPE_OCSP_REQUEST);
req->serial = serial;
}

if (req->cid != NULL)
wolfSSL_OCSP_CERTID_free((WOLFSSL_OCSP_CERTID*)req->cid);
/* Keep to free */
Expand All @@ -1404,13 +1420,6 @@ WOLFSSL_OCSP_ONEREQ* wolfSSL_OCSP_request_add0_id(OcspRequest *req,
XMEMCPY(req->issuerHash, cid->issuerHash, WC_MAX_DIGEST_SIZE);
XMEMCPY(req->issuerKeyHash, cid->issuerKeyHash, WC_MAX_DIGEST_SIZE);
req->hashAlg = (int)cid->hashAlgoOID;
if (cid->status->serialSz > req->serialSz) {
XFREE(req->serial, req->heap, DYNAMIC_TYPE_OCSP);
req->serial = (byte*)XMALLOC((size_t)cid->status->serialSz,
req->heap, DYNAMIC_TYPE_OCSP_REQUEST);
if (req->serial == NULL)
return NULL;
}
XMEMCPY(req->serial, cid->status->serial, (size_t)cid->status->serialSz);
req->serialSz = cid->status->serialSz;

Expand Down
90 changes: 89 additions & 1 deletion tests/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27643,6 +27643,60 @@ static time_t test_wolfSSL_OCSP_REQ_CTX_time_cb(time_t* t)
}
#endif

#if defined(OPENSSL_ALL) && defined(HAVE_OCSP) && \
defined(WOLFSSL_SIGNER_DER_CERT) && !defined(NO_FILESYSTEM) && \
!defined(WOLFSSL_SM2) && !defined(WOLFSSL_SM3) && \
defined(USE_WOLFSSL_MEMORY) && !defined(WOLFSSL_NO_MALLOC) && \
!defined(WOLFSSL_STATIC_MEMORY)

#define TEST_OCSP_OOM
static int ocsp_fail_next_alloc = 0;
static int ocsp_alloc_failed = 0;

#ifdef WOLFSSL_DEBUG_MEMORY
static void* ocsp_oom_malloc_cb(size_t size, const char* func,
unsigned int line)
{
(void)func;
(void)line;
#else
static void* ocsp_oom_malloc_cb(size_t size)
{
#endif
if (ocsp_fail_next_alloc) {
ocsp_fail_next_alloc = 0;
ocsp_alloc_failed = 1;
return NULL;
}
return malloc(size);
}

#ifdef WOLFSSL_DEBUG_MEMORY
static void ocsp_oom_free_cb(void* ptr, const char* func, unsigned int line)
{
(void)func;
(void)line;
#else
static void ocsp_oom_free_cb(void* ptr)
{
#endif
free(ptr);
}

#ifdef WOLFSSL_DEBUG_MEMORY
static void* ocsp_oom_realloc_cb(void* ptr, size_t size, const char* func,
unsigned int line)
{
(void)func;
(void)line;
#else
static void* ocsp_oom_realloc_cb(void* ptr, size_t size)
{
#endif
return realloc(ptr, size);
}
#endif

static int test_wolfSSL_OCSP_REQ_CTX(void)
{
EXPECT_DECLS;
Expand Down Expand Up @@ -27828,6 +27882,14 @@ static int test_wolfSSL_OCSP_REQ_CTX(void)
STACK_OF(X509_OBJECT) *str_objs = NULL;
X509_OBJECT *x509_obj = NULL;
STACK_OF(WOLFSSL_STRING) *skStr = NULL;
#ifdef TEST_OCSP_OOM
OCSP_CERTID *cid2 = NULL;
OCSP_REQUEST *req2 = NULL;
wolfSSL_Malloc_cb prev_mc = NULL;
wolfSSL_Free_cb prev_fc = NULL;
wolfSSL_Realloc_cb prev_rc = NULL;
int allocators_set = 0;
#endif

ExpectNotNull(bio1 = BIO_new(BIO_s_bio()));
ExpectNotNull(bio2 = BIO_new(BIO_s_bio()));
Expand Down Expand Up @@ -27869,6 +27931,29 @@ static int test_wolfSSL_OCSP_REQ_CTX(void)
ExpectNotNull(cid = OCSP_cert_to_id(EVP_sha1(), cert, issuer));
ExpectNotNull(OCSP_request_add0_id(req, cid));
ExpectIntEQ(OCSP_request_add1_nonce(req, NULL, -1), 1);
#ifdef TEST_OCSP_OOM
Comment on lines +27940 to +27941
/* A failed allocation must leave req unchanged and cid owned by the
* caller. */
ExpectNotNull(req2 = OCSP_REQUEST_new());
ExpectNotNull(cid2 = OCSP_cert_to_id(EVP_sha1(), cert, issuer));
ExpectIntEQ(wolfSSL_GetAllocators(&prev_mc, &prev_fc, &prev_rc), 0);
ExpectIntEQ(wolfSSL_SetAllocators(ocsp_oom_malloc_cb, ocsp_oom_free_cb,
ocsp_oom_realloc_cb), 0);
if (EXPECT_SUCCESS())
allocators_set = 1;
ocsp_alloc_failed = 0;
ocsp_fail_next_alloc = 1;
ExpectNull(OCSP_request_add0_id(req2, cid2));
ocsp_fail_next_alloc = 0;
if (allocators_set)
(void)wolfSSL_SetAllocators(prev_mc, prev_fc, prev_rc);
ExpectIntEQ(ocsp_alloc_failed, 1);
if (req2 != NULL) {
ExpectNull(req2->cid);
ExpectNull(req2->serial);
ExpectIntEQ(req2->serialSz, 0);
}
#endif

ExpectNull(OCSP_sendreq_new(bio1, "/\r\nX-Injected: yes", NULL, -1));
ExpectNull(OCSP_sendreq_new(bio1, "/\nX-Injected: yes", NULL, -1));
Expand Down Expand Up @@ -27904,7 +27989,10 @@ static int test_wolfSSL_OCSP_REQ_CTX(void)
ExpectIntEQ(wc_SetTimeCb(NULL), 0);
ExpectNotNull(rsp);
#endif

#ifdef TEST_OCSP_OOM
OCSP_CERTID_free(cid2);
OCSP_REQUEST_free(req2);
#endif
OCSP_REQ_CTX_free(ctx);
OCSP_REQUEST_free(req);
OCSP_RESPONSE_free(rsp);
Expand Down