From 0c413e75c68b3bafd76fecce4be082fcd7bb7e34 Mon Sep 17 00:00:00 2001
From: Ruby Martin <ruby@wolfssl.com>
Date: Mon, 17 Feb 2025 11:37:28 -0700
Subject: [PATCH] add environment matrix to msys workflow

---
 .github/workflows/msys2.yml | 16 +++++++++++-----
 tests/api.c                 | 16 ++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index 5f38bbc00..266487ae9 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -13,21 +13,27 @@ concurrency:
 # END OF COMMON SECTION
 
 jobs:
-  msys2-ucrt64:
+  msys2:
     runs-on: windows-latest
     defaults:
       run:
         shell: msys2 {0}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { sys: ucrt64,  compiler: mingw-w64-ucrt-x86_64-gcc }
+          - { sys: mingw64, compiler: mingw-w64-x86_64-gcc }
+          - { sys: msys, compiler: gcc }
     steps:
       - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
-          path: wolfssl
-          msystem: UCRT64
+          msystem: ${{ matrix.sys }}
           update: true
-          install: git mingw-w64-ucrt-x86_64-gcc autotools base-devel autoconf
+          install: git ${{matrix.compiler}} autotools base-devel autoconf netcat
       - name: configure wolfSSL
-        run: ./autogen.sh && ./configure --enable-all --disable-crl-monitor
+        run: ./autogen.sh && ./configure CFLAGS="-DUSE_CERT_BUFFERS_2048 -DUSE_CERT_BUFFERS_256"
       - name: build wolfSSL
         run: make check
       - name: Display log
diff --git a/tests/api.c b/tests/api.c
index 3f1f787b0..47d9e27f9 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -69604,7 +69604,7 @@ static int test_wolfSSL_TXT_DB(void)
 
     /* Test index */
     ExpectIntEQ(TXT_DB_create_index(db, 3, NULL,
-        (wolf_sk_hash_cb)(MESSAGE_TYPE_CAST)TXT_DB_hash,
+        (wolf_sk_hash_cb)(long unsigned int)TXT_DB_hash,
         (wolf_lh_compare_cb)TXT_DB_cmp), 1);
     ExpectNotNull(TXT_DB_get_by_index(db, 3, (WOLFSSL_STRING*)fields));
     fields[3] = "12DA";
@@ -83752,10 +83752,10 @@ static void test_wolfSSL_dtls_plaintext_client(WOLFSSL* ssl)
     AssertIntGE(fd, 0);
     generateDTLSMsg(ch, sizeof(ch), 20, client_hello, 0);
     /* Server should ignore this datagram */
-    AssertIntEQ(send(fd, (MESSAGE_TYPE_CAST)ch, sizeof(ch), 0), sizeof(ch));
+    AssertIntEQ(send(fd, ch, sizeof(ch), 0), sizeof(ch));
     generateDTLSMsg(ch, sizeof(ch), 20, client_hello, 10000);
     /* Server should ignore this datagram */
-    AssertIntEQ(send(fd, (MESSAGE_TYPE_CAST)ch, sizeof(ch), 0), sizeof(ch));
+    AssertIntEQ(send(fd, ch, sizeof(ch), 0), sizeof(ch));
 
     AssertIntEQ(wolfSSL_write(ssl, msg, sizeof(msg)), sizeof(msg));
     AssertIntGT(wolfSSL_read(ssl, reply, sizeof(reply)),0);
@@ -83866,7 +83866,7 @@ static void test_wolfSSL_dtls12_fragments_spammer(WOLFSSL* ssl)
         delay.tv_nsec = 10000000; /* wait 0.01 seconds */
         c32toa(seq_number, b + seq_offset);
         c16toa(msg_number, b + msg_offset);
-        ret = (int)send(fd, (MESSAGE_TYPE_CAST)b, 55, 0);
+        ret = (int)send(fd, b, 55, 0);
         nanosleep(&delay, NULL);
     }
 }
@@ -83986,7 +83986,7 @@ static void test_wolfSSL_dtls_send_alert(WOLFSSL* ssl)
 
     fd = wolfSSL_get_wfd(ssl);
     AssertIntGE(fd, 0);
-    ret = (int)send(fd, (MESSAGE_TYPE_CAST)alert_msg, sizeof(alert_msg), 0);
+    ret = (int)send(fd, alert_msg, sizeof(alert_msg), 0);
     AssertIntGT(ret, 0);
 }
 
@@ -84057,7 +84057,7 @@ static void test_wolfSSL_send_bad_record(WOLFSSL* ssl)
 
     fd = wolfSSL_get_wfd(ssl);
     AssertIntGE(fd, 0);
-    ret = (int)send(fd, (MESSAGE_TYPE_CAST)bad_msg, sizeof(bad_msg), 0);
+    ret = (int)send(fd, bad_msg, sizeof(bad_msg), 0);
     AssertIntEQ(ret, sizeof(bad_msg));
     ret = wolfSSL_write(ssl, "badrecordtest", sizeof("badrecordtest"));
     AssertIntEQ(ret, sizeof("badrecordtest"));
@@ -84415,10 +84415,10 @@ static void test_wolfSSL_dtls_send_ch(WOLFSSL* ssl)
 
     fd = wolfSSL_get_wfd(ssl);
     AssertIntGE(fd, 0);
-    ret = (int)send(fd, (MESSAGE_TYPE_CAST)ch_msg, sizeof(ch_msg), 0);
+    ret = (int)send(fd, ch_msg, sizeof(ch_msg), 0);
     AssertIntGT(ret, 0);
     /* consume the HRR otherwise handshake will fail */
-    ret = (int)recv(fd, (MESSAGE_TYPE_CAST)ch_msg, sizeof(ch_msg), 0);
+    ret = (int)recv(fd, ch_msg, sizeof(ch_msg), 0);
     AssertIntGT(ret, 0);
 }