From a06a8b589c057cf565056c2d3c42bdb03c5d4322 Mon Sep 17 00:00:00 2001
From: Marco Oliverio <marco@wolfssl.com>
Date: Wed, 5 Feb 2025 18:56:36 +0000
Subject: [PATCH] ocsp: minors

---
 tests/api/test_ocsp.c | 17 +++++++++--------
 wolfcrypt/src/asn.c   |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/api/test_ocsp.c b/tests/api/test_ocsp.c
index 328a1551d..edff37ae9 100644
--- a/tests/api/test_ocsp.c
+++ b/tests/api/test_ocsp.c
@@ -145,10 +145,9 @@ int test_ocsp_response_parsing(void)
 
     /* Test response with unusable internal cert but that can be verified in CM
      */
-    conf.resp = (unsigned char*)
-        resp_bad_embedded_cert; // Response with wrong internal cert
+    conf.resp = (unsigned char*)resp_bad_embedded_cert;
     conf.respSz = sizeof(resp_bad_embedded_cert);
-    conf.ca0 = root_ca_cert_pem; // Root CA cert
+    conf.ca0 = root_ca_cert_pem;
     conf.ca0Sz = sizeof(root_ca_cert_pem);
     conf.ca1 = NULL;
     conf.ca1Sz = 0;
@@ -200,6 +199,7 @@ int test_ocsp_basic_verify(void)
     const unsigned char* ptr = NULL;
     OcspResponse* response = NULL;
     DecodedCert cert;
+    int expectedRet;
 
     wc_InitDecodedCert(&cert, ocsp_responder_cert_pem,
         sizeof(ocsp_responder_cert_pem), NULL);
@@ -329,12 +329,13 @@ int test_ocsp_basic_verify(void)
     ptr = (const unsigned char*)resp_bad_noauth;
     ExpectNotNull(response = wolfSSL_d2i_OCSP_RESPONSE(NULL, &ptr,
                       sizeof(resp_bad_noauth)));
-    ExpectIntEQ(wolfSSL_OCSP_basic_verify(response, certs, store, 0),
-#ifndef WOLFSSL_NO_OCSP_ISSUER_CHECK
-        WOLFSSL_FAILURE);
-#else
-        WOLFSSL_SUCCESS);
+
+    expectedRet = WOLFSSL_FAILURE;
+#ifdef WOLFSSL_NO_OCSP_ISSUER_CHECK
+    expectedRet = WOLFSSL_SUCCESS;
 #endif
+    ExpectIntEQ(wolfSSL_OCSP_basic_verify(response, certs, store, 0),
+        expectedRet);
     /* should pass with OCSP_NOCHECKS ...*/
     ExpectIntEQ(
         wolfSSL_OCSP_basic_verify(response, certs, store, OCSP_NOCHECKS),
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index ecb284562..3bfaeded2 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -37422,7 +37422,7 @@ static int DecodeBasicOcspResponse(byte* source, word32* ioIndex,
             sigValid = 1;
         }
         else {
-            WOLFSSL_MSG("OCSP Internal certificate can't verify the response\n");
+            WOLFSSL_MSG("OCSP Internal cert can't verify the response\n");
             /* try to verify the OCSP response with CA certs */
             ret = 0;
         }