Strengthen regression tests for group and shared-cipher API guards

Author: ColtonWilley

tests/api/test_tls.c

@@ -1123,25 +1123,25 @@ int test_wolfSSL_alert_type_string(void)
 int test_wolfSSL_get_shared_ciphers(void)
 {
     EXPECT_DECLS;
-#if !defined(WOLFSSL_NO_TLS12) && !defined(NO_TLS)
-#ifndef NO_WOLFSSL_CLIENT
+#if !defined(NO_TLS) && !defined(NO_WOLFSSL_CLIENT)
     WOLFSSL_CTX* ctx = NULL;
     WOLFSSL*     ssl = NULL;
     char         buf[32];
 
-    ExpectNotNull(ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method()));
+    ExpectNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));
     ExpectNotNull(ssl = wolfSSL_new(ctx));
 
-    /* NULL ssl - pre-existing guard; pins the contract. */
     ExpectNull(wolfSSL_get_shared_ciphers(NULL, buf, sizeof(buf)));
-    /* NULL buf - primary regression case (pre-fix: XMEMCPY(NULL, ...) crash). */
     ExpectNull(wolfSSL_get_shared_ciphers(ssl, NULL, sizeof(buf)));
-    /* len == 0 - pre-existing guard; pins the contract. */
     ExpectNull(wolfSSL_get_shared_ciphers(ssl, buf, 0));
+#ifndef NO_ERROR_STRINGS
+    ExpectPtrEq(wolfSSL_get_shared_ciphers(ssl, buf, sizeof(buf)), buf);
+#else
+    ExpectNull(wolfSSL_get_shared_ciphers(ssl, buf, sizeof(buf)));
+#endif
 
     wolfSSL_free(ssl);
     wolfSSL_CTX_free(ctx);
-#endif /* NO_WOLFSSL_CLIENT */
 #endif
     return EXPECT_RESULT();
 }

tests/api/test_tls13.c

@@ -587,10 +587,11 @@ int test_tls13_apis(void)
 #endif
     ExpectIntEQ(wolfSSL_CTX_set_groups(clientCtx, groups,
         WOLFSSL_MAX_GROUP_COUNT + 1), WC_NO_ERR_TRACE(BAD_FUNC_ARG));
-    ExpectIntEQ(wolfSSL_CTX_set_groups(clientCtx, groups, -1),
-        WC_NO_ERR_TRACE(BAD_FUNC_ARG));
     ExpectIntEQ(wolfSSL_CTX_set_groups(clientCtx, groups, numGroups),
         WOLFSSL_SUCCESS);
+    ExpectIntEQ(wolfSSL_CTX_set_groups(clientCtx, groups, -1),
+        WC_NO_ERR_TRACE(BAD_FUNC_ARG));
+    ExpectIntEQ(clientCtx->numGroups, numGroups);
     ExpectIntEQ(wolfSSL_CTX_set_groups(clientCtx, bad_groups, numGroups),
         WC_NO_ERR_TRACE(BAD_FUNC_ARG));
 #endif
@@ -616,10 +617,11 @@ int test_tls13_apis(void)
 #endif
     ExpectIntEQ(wolfSSL_set_groups(clientSsl, groups,
         WOLFSSL_MAX_GROUP_COUNT + 1), WC_NO_ERR_TRACE(BAD_FUNC_ARG));
-    ExpectIntEQ(wolfSSL_set_groups(clientSsl, groups, -1),
-        WC_NO_ERR_TRACE(BAD_FUNC_ARG));
     ExpectIntEQ(wolfSSL_set_groups(clientSsl, groups, numGroups),
         WOLFSSL_SUCCESS);
+    ExpectIntEQ(wolfSSL_set_groups(clientSsl, groups, -1),
+        WC_NO_ERR_TRACE(BAD_FUNC_ARG));
+    ExpectIntEQ(clientSsl->numGroups, numGroups);
     ExpectIntEQ(wolfSSL_set_groups(clientSsl, bad_groups, numGroups),
         WC_NO_ERR_TRACE(BAD_FUNC_ARG));
 #endif
@@ -653,6 +655,16 @@ int test_tls13_apis(void)
         WC_NO_ERR_TRACE(WOLFSSL_FAILURE));
     ExpectIntEQ(wolfSSL_set1_groups(clientSsl, NULL, 1),
         WC_NO_ERR_TRACE(WOLFSSL_FAILURE));
+    ExpectIntEQ(wolfSSL_CTX_set1_groups(clientCtx, groups, numGroups),
+        WOLFSSL_SUCCESS);
+    ExpectIntEQ(wolfSSL_CTX_set1_groups(clientCtx, groups, -1),
+        WC_NO_ERR_TRACE(WOLFSSL_FAILURE));
+    ExpectIntEQ(clientCtx->numGroups, numGroups);
+    ExpectIntEQ(wolfSSL_set1_groups(clientSsl, groups, numGroups),
+        WOLFSSL_SUCCESS);
+    ExpectIntEQ(wolfSSL_set1_groups(clientSsl, groups, -1),
+        WC_NO_ERR_TRACE(WOLFSSL_FAILURE));
+    ExpectIntEQ(clientSsl->numGroups, numGroups);
 #endif
 #ifndef NO_WOLFSSL_CLIENT
 #ifndef WOLFSSL_NO_TLS12