upd ci odr check

Author: AnastasiaProkop

.github/workflows/secure_zero_odr.yml

@@ -1,31 +1,41 @@
-name: secure_zero ODR check
+name: ODR checks
 
 on:
   push
 
 jobs:
-  secure-zero-odr-test:
+  odr:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      - name: Install toolchain
+      - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y g++ make
+          sudo apt-get install -y build-essential
+
+      - name: Check inline API decorations
+        run: |
+          if rg --no-heading --line-number "^\s*inline[^{;]*HMAC_CPP_API" include; then
+            echo "Detected inline functions annotated with HMAC_CPP_API (expected failure)"
+          else
+            echo "No inline functions annotated with HMAC_CPP_API were found"
+            exit 1
+          fi
 
-      - name: Build secure_zero ODR test
+      - name: Build secure_zero conflict sample
         run: |
-          mkdir -p build-tests
-          g++ -std=c++17 -O2 -Wall -Wextra \
+          g++ -std=c++11 -Wall -Wextra -pedantic -DHMAC_CPP_STATIC -Iinclude \
             tests/odr/main.cpp \
-            tests/odr/tu_manual.cpp \
             tests/odr/tu_memsets.cpp \
-            -Iinclude \
-            -o build-tests/secure_zero_test
+            tests/odr/tu_manual.cpp \
+            tests/odr/stubs.cpp \
+            -o secure_zero_conflict
 
-      - name: Run secure_zero ODR test
+      - name: Expect secure_zero mismatch
         run: |
-          ./build-tests/secure_zero_test
+          if ./secure_zero_conflict; then
+            echo "secure_zero conflict binary unexpectedly succeeded"
+            exit 1
+          fi
+          echo "secure_zero conflict binary correctly reported mismatch"

tests/odr/stubs.cpp

@@ -0,0 +1,12 @@
+#include <cstring>
+#include <cstddef>
+
+extern "C" int memset_s(void* dest, size_t destsz, int ch, size_t count) {
+    (void)destsz;
+    std::memset(dest, ch, count);
+    return 0;
+}
+
+extern "C" void explicit_bzero(void* dest, size_t count) {
+    std::memset(dest, 0, count);
+}

tests/odr/tu_memsets.cpp

@@ -1,6 +1,8 @@
 #include <array>
 #include <cstddef>
 
+extern "C" int memset_s(void* dest, size_t destsz, int ch, size_t count);
+
 #define __STDC_WANT_LIB_EXT1__ 1
 #define __STDC_LIB_EXT1__ 1
 #undef HAVE_EXPLICIT_BZERO