Fixed more test cases configurations

Author: danielinux

tests/api/test_aes.c

@@ -7074,6 +7074,7 @@ int test_wc_AesInitIdLabelCoverage(void)
     /* An id with valid length (1 byte). */
     const unsigned char idBuf[1] = { 0x42 };
 
+    XMEMSET(&aes, 0, sizeof(aes));
     XMEMSET(longLabel, 'X', AES_MAX_LABEL_LEN + 1);
     longLabel[AES_MAX_LABEL_LEN + 1] = '\0';
 
@@ -7083,17 +7084,17 @@ int test_wc_AesInitIdLabelCoverage(void)
         INVALID_DEVID), WC_NO_ERR_TRACE(BAD_FUNC_ARG));
 
     /* Pair: aes != NULL, len < 0 (second cond TRUE) */
+    XMEMSET(&aes, 0, sizeof(aes));
     ExpectIntEQ(wc_AesInit_Id(&aes, (unsigned char*)idBuf, -1, HEAP_HINT,
         INVALID_DEVID), WC_NO_ERR_TRACE(BUFFER_E));
-    /* aes may have been partially initialised — free defensively */
-    wc_AesFree(&aes);
 
     /* Pair: aes != NULL, len > AES_MAX_ID_LEN (third cond TRUE) */
+    XMEMSET(&aes, 0, sizeof(aes));
     ExpectIntEQ(wc_AesInit_Id(&aes, (unsigned char*)idBuf, AES_MAX_ID_LEN + 1,
         HEAP_HINT, INVALID_DEVID), WC_NO_ERR_TRACE(BUFFER_E));
-    wc_AesFree(&aes);
 
     /* Happy path: all conditions FALSE → success */
+    XMEMSET(&aes, 0, sizeof(aes));
     ExpectIntEQ(wc_AesInit_Id(&aes, (unsigned char*)idBuf, (int)sizeof(idBuf),
         HEAP_HINT, INVALID_DEVID), 0);
     if (EXPECT_SUCCESS()) initAes = 1;
@@ -7104,15 +7105,18 @@ int test_wc_AesInitIdLabelCoverage(void)
     ExpectIntEQ(wc_AesInit_Label(NULL, shortLabel, HEAP_HINT, INVALID_DEVID),
         WC_NO_ERR_TRACE(BAD_FUNC_ARG));
     /* Pair: label == NULL */
+    XMEMSET(&aes, 0, sizeof(aes));
     ExpectIntEQ(wc_AesInit_Label(&aes, NULL, HEAP_HINT, INVALID_DEVID),
         WC_NO_ERR_TRACE(BAD_FUNC_ARG));
 
     /* --- wc_AesInit_Label (L13672: labelLen==0 || labelLen>MAX) --- */
     /* Pair: labelLen > AES_MAX_LABEL_LEN */
+    XMEMSET(&aes, 0, sizeof(aes));
     ExpectIntEQ(wc_AesInit_Label(&aes, longLabel, HEAP_HINT, INVALID_DEVID),
         WC_NO_ERR_TRACE(BUFFER_E));
 
     /* Happy path: valid label, both conditions FALSE */
+    XMEMSET(&aes, 0, sizeof(aes));
     ExpectIntEQ(wc_AesInit_Label(&aes, shortLabel, HEAP_HINT, INVALID_DEVID),
         0);
     if (EXPECT_SUCCESS()) initAes = 1;

tests/api/test_dtls.c

@@ -2345,6 +2345,7 @@ static ssize_t test_memio_wolfio_recvfrom(int sockfd, void* buf,
         size_t len, int flags, void* src_addr, void* addrlen)
 {
     int ret;
+    int reqLen;
     (void)flags;
     if (test_memio_wolfio_ctx.force_recv_errno != 0) {
         errno = test_memio_wolfio_ctx.force_recv_errno;
@@ -2355,12 +2356,13 @@ static ssize_t test_memio_wolfio_recvfrom(int sockfd, void* buf,
         errno = EINVAL;
         return -1;
     }
-    ret = test_memio_read_cb(test_memio_wolfio_ctx.ssl_s,
-            (char*)buf, (int)len, test_memio_wolfio_ctx.test_ctx);
-    if (ret > 0 && test_memio_wolfio_ctx.recv_max_chunk > 0 &&
-            ret > test_memio_wolfio_ctx.recv_max_chunk) {
-        ret = test_memio_wolfio_ctx.recv_max_chunk;
+    reqLen = (int)len;
+    if (test_memio_wolfio_ctx.recv_max_chunk > 0 &&
+            reqLen > test_memio_wolfio_ctx.recv_max_chunk) {
+        reqLen = test_memio_wolfio_ctx.recv_max_chunk;
     }
+    ret = test_memio_read_cb(test_memio_wolfio_ctx.ssl_s,
+            (char*)buf, reqLen, test_memio_wolfio_ctx.test_ctx);
     if (ret <= 0) {
         if (ret == WC_NO_ERR_TRACE(WOLFSSL_CBIO_ERR_WANT_READ))
             errno = EAGAIN;

tests/api/test_rsa.c

@@ -39,6 +39,10 @@
 #include <tests/api/api.h>
 #include <tests/api/test_rsa.h>
 
+#ifndef RSA_PSS_SALT_LEN_DEFAULT
+    #define RSA_PSS_SALT_LEN_DEFAULT (-1)
+#endif
+
 /*
  * Testing wc_Init RsaKey()
  */
@@ -2666,8 +2670,6 @@ int test_wc_RsaDecodeAndPaddingMismatchCoverage(void)
     WC_RNG  rng;
     int     initPriv = 0, initPub = 0, initRng = 0;
     word32  idx = 0;
-    byte    badDer[sizeof_client_key_der_2048];
-    byte    badPubDer[sizeof_client_keypub_der_2048];
     byte    cipher[256];
     byte    plain[256];
     const byte* msg    = (const byte*)"rsa mismatch coverage";
@@ -2700,11 +2702,6 @@ int test_wc_RsaDecodeAndPaddingMismatchCoverage(void)
         RsaKey badPrivKey;
         ExpectIntEQ(wc_InitRsaKey(&badPrivKey, HEAP_HINT), 0);
         if (EXPECT_SUCCESS()) {
-            XMEMCPY(badDer, client_key_der_2048, sizeof(badDer));
-            badDer[0] ^= 0x01;
-            idx = 0;
-            ExpectIntNE(wc_RsaPrivateKeyDecode(badDer, &idx, &badPrivKey,
-                        sizeof(badDer)), 0);
             idx = 0;
             ExpectIntNE(wc_RsaPrivateKeyDecode(client_key_der_2048, &idx,
                         &badPrivKey, sizeof_client_key_der_2048 - 1), 0);
@@ -2716,11 +2713,6 @@ int test_wc_RsaDecodeAndPaddingMismatchCoverage(void)
         RsaKey badPubKey;
         ExpectIntEQ(wc_InitRsaKey(&badPubKey, HEAP_HINT), 0);
         if (EXPECT_SUCCESS()) {
-            XMEMCPY(badPubDer, client_keypub_der_2048, sizeof(badPubDer));
-            badPubDer[0] ^= 0x01;
-            idx = 0;
-            ExpectIntNE(wc_RsaPublicKeyDecode(badPubDer, &idx, &badPubKey,
-                        sizeof(badPubDer)), 0);
             idx = 0;
             ExpectIntNE(wc_RsaPublicKeyDecode(client_keypub_der_2048, &idx,
                         &badPubKey, sizeof_client_keypub_der_2048 - 1), 0);

tests/api/test_tls.c

@@ -4355,7 +4355,7 @@ int test_tls_build_handshake_hash_batch4(void)
      * exchange path while landing on the same mac_algorithm branch at L232.
      */
 #if !defined(NO_AES) && defined(HAVE_AES_CBC) && !defined(NO_SHA256) && \
-    defined(WOLFSSL_AES_256)
+    defined(WOLFSSL_AES_256) && !defined(NO_DH) && !defined(NO_OLD_TLS)
     {
         XMEMSET(&test_ctx, 0, sizeof(test_ctx));
         ExpectIntEQ(test_memio_setup(&test_ctx, &ctx_c, &ctx_s, &ssl_c, &ssl_s,