Fix unit test build errors under -Werror (#5686)

Co-authored-by: Carol Yeh <69044490+CarolYeh910@users.noreply.github.com>

Author: thulasiramk-2310

CMakeLists.txt

@@ -579,8 +579,11 @@ if (BUILD_TESTING)
         target_compile_options(${test_case_name} PRIVATE 
             -Wall -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized 
             -Wshadow  -Wcast-align -Wwrite-strings -Wformat-security
-            -Wno-deprecated-declarations -Wno-unknown-pragmas -Wno-deprecated -std=gnu99
+            -Wno-deprecated-declarations -Wno-unknown-pragmas -Wno-deprecated -std=gnu99 -Wno-missing-braces
         )
+        if (UNSAFE_TREAT_WARNINGS_AS_ERRORS)
+            target_compile_options(${test_case_name} PRIVATE -Werror)
+        endif()
         if (S2N_LTO)
             target_compile_options(${test_case_name} PRIVATE -flto)
         endif()

tests/unit/s2n_fork_generation_number_test.c

@@ -173,6 +173,7 @@ static int s2n_unit_test_fork_check_threads_first(uint64_t parent_process_fgn)
     return S2N_SUCCESS;
 }
 
+#if S2N_CLONE_SUPPORTED
 static int s2n_unit_test_clone_child_process(void *parent_process_fgn)
 {
     /* In child */
@@ -191,6 +192,7 @@ static int s2n_unit_test_clone_child_process(void *parent_process_fgn)
 
     exit(EXIT_SUCCESS);
 }
+#endif
 
 #define PROCESS_CHILD_STACK_SIZE (1024 * 1024) /* Suggested by clone() man page... */
 static int s2n_unit_test_clone(uint64_t parent_process_fgn)

tests/unit/s2n_handshake_type_test.c

@@ -13,6 +13,7 @@
  * permissions and limitations under the License.
  */
 
+#include <stdint.h>
 #include <sys/param.h>
 
 #include "s2n_test.h"
@@ -36,7 +37,7 @@ int main(int argc, char **argv)
     EXPECT_TRUE(S2N_FIRST_TLS12_HANDSHAKE_FLAG < S2N_LAST_TLS12_HANDSHAKE_FLAG);
     EXPECT_EQUAL(S2N_FIRST_TLS13_HANDSHAKE_FLAG, S2N_LAST_COMMON_HANDSHAKE_FLAG * 2);
     EXPECT_TRUE(S2N_FIRST_TLS13_HANDSHAKE_FLAG < S2N_LAST_TLS13_HANDSHAKE_FLAG);
-    EXPECT_EQUAL(MAX(S2N_LAST_TLS12_HANDSHAKE_FLAG, S2N_LAST_TLS13_HANDSHAKE_FLAG), S2N_HANDSHAKES_COUNT / 2);
+    EXPECT_EQUAL(MAX((uint32_t) S2N_LAST_TLS12_HANDSHAKE_FLAG, (uint32_t) S2N_LAST_TLS13_HANDSHAKE_FLAG), S2N_HANDSHAKES_COUNT / 2);
 
     /* Test s2n_handshake_type_reset */
     {

tests/unit/s2n_mem_usage_test.c

@@ -192,7 +192,7 @@ int main(int argc, char **argv)
 
     if (kbs_per_conn != expected_kbs_per_conn) {
         printf("\nExpected KB per connection: %i\n", expected_kbs_per_conn);
-        printf("\nActual KB per connection: %li\n", kbs_per_conn);
+        printf("\nActual KB per connection: %zi\n", kbs_per_conn);
         printf("This is a %.2f%% change\n",
                 (kbs_per_conn - expected_kbs_per_conn) * 100.0 / expected_kbs_per_conn);
 

tests/unit/s2n_random_test.c

@@ -72,7 +72,7 @@ struct random_communication {
 static void s2n_verify_child_exit_status(pid_t proc_pid, int expected_status)
 {
     int status = 0;
-#if defined(S2N_CLONE_SUPPORTED)
+#if S2N_CLONE_SUPPORTED
     EXPECT_EQUAL(waitpid(proc_pid, &status, __WALL), proc_pid);
 #else
     /* __WALL is not relevant when clone() is not supported
@@ -446,6 +446,7 @@ static S2N_RESULT s2n_fork_test(
     return S2N_RESULT_OK;
 }
 
+#if S2N_CLONE_SUPPORTED
 static int s2n_clone_tests_child_process(void *ipc)
 {
     struct random_communication *ipc_ptr = (struct random_communication *) ipc;
@@ -459,13 +460,14 @@ static int s2n_clone_tests_child_process(void *ipc)
      * statement because we are in a non-void return type function. */
     return EXIT_SUCCESS;
 }
+#endif
 
 #define PROCESS_CHILD_STACK_SIZE (1024 * 1024) /* Suggested by clone() man page... */
 static S2N_RESULT s2n_clone_tests(
         S2N_RESULT (*s2n_get_random_data_cb)(struct s2n_blob *blob),
         S2N_RESULT (*s2n_get_random_data_cb_clone)(struct s2n_blob *blob))
 {
-#if defined(S2N_CLONE_SUPPORTED)
+#if S2N_CLONE_SUPPORTED
 
     int proc_id = 0;
     int pipes[2];

tests/unit/s2n_safety_test.c

@@ -128,7 +128,7 @@ static int success_memcpy()
 
 static int failure_memcpy()
 {
-    char src[1024];
+    char src[1024] = { 0 };
     char *ptr = NULL;
 
     POSIX_CHECKED_MEMCPY(ptr, src, 1024);

tests/unit/s2n_tls12_handshake_test.c

@@ -107,8 +107,8 @@ int main(int argc, char **argv)
     {
         struct s2n_connection *conn = s2n_connection_new(S2N_CLIENT);
         conn->actual_protocol_version = S2N_TLS12;
-        EXPECT_EQUAL(ACTIVE_STATE_MACHINE(conn), state_machine);
-        EXPECT_EQUAL(ACTIVE_HANDSHAKES(conn), handshakes);
+        EXPECT_EQUAL(&ACTIVE_STATE_MACHINE(conn)[0], &state_machine[0]);
+        EXPECT_EQUAL(&ACTIVE_HANDSHAKES(conn)[0], &handshakes[0]);
         EXPECT_SUCCESS(s2n_connection_free(conn));
     };
 

tests/unit/s2n_tls13_handshake_state_machine_test.c

@@ -305,8 +305,8 @@ int main(int argc, char **argv)
         struct s2n_connection *conn = s2n_connection_new(S2N_CLIENT);
         conn->actual_protocol_version = S2N_TLS13;
         EXPECT_OK(s2n_conn_choose_state_machine(conn, S2N_TLS13));
-        EXPECT_EQUAL(ACTIVE_STATE_MACHINE(conn), tls13_state_machine);
-        EXPECT_EQUAL(ACTIVE_HANDSHAKES(conn), tls13_handshakes);
+        EXPECT_EQUAL(&ACTIVE_STATE_MACHINE(conn)[0], &tls13_state_machine[0]);
+        EXPECT_EQUAL(&ACTIVE_HANDSHAKES(conn)[0], &tls13_handshakes[0]);
         EXPECT_SUCCESS(s2n_connection_free(conn));
     };
 

tests/unit/s2n_x509_validator_test.c

@@ -20,12 +20,6 @@
 #include "testlib/s2n_testlib.h"
 #include "tls/s2n_certificate_keys.h"
 
-static int mock_time(void *data, uint64_t *timestamp)
-{
-    *timestamp = *(uint64_t *) data;
-    return 0;
-}
-
 static int fetch_expired_after_ocsp_timestamp(void *data, uint64_t *timestamp)
 {
     /* 2250-01-01 */
@@ -41,6 +35,11 @@ static int fetch_early_expired_after_ocsp_timestamp(void *data, uint64_t *timest
 }
 
 #if S2N_OCSP_STAPLING_SUPPORTED
+static int mock_time(void *data, uint64_t *timestamp)
+{
+    *timestamp = *(uint64_t *) data;
+    return 0;
+}
 static int fetch_invalid_before_ocsp_timestamp(void *data, uint64_t *timestamp)
 {
     /* 2015-02-27 */
@@ -128,7 +127,23 @@ static bool s2n_supports_large_time_t()
 static bool s2n_libcrypto_supports_2050()
 {
     ASN1_TIME *utc_time = ASN1_UTCTIME_set(NULL, 0);
-    time_t time_2050 = 2524608000;
+    if (!utc_time) {
+        return false;
+    }
+
+    /* The `32BitBuildAndUnit` job in s2nGeneralBatch runs on a 32-bit system
+     * where time_t cannot represent the year 2050 (2524608000) and triggers
+     * -Wconstant-conversion (treated as an error).
+     *
+     * The libcrypto used by the job (i386-linux-gnu) does support year 2050.
+     * Return true to skip the `X509_cmp_time` call.
+     */
+    if (sizeof(time_t) < 8) {
+        ASN1_STRING_free(utc_time);
+        return true;
+    }
+
+    time_t time_2050 = (time_t) 2524608000LL;
     int result = X509_cmp_time(utc_time, &time_2050);
     ASN1_STRING_free(utc_time);
     return (result != 0);