fix secure_zero odr

Author: AnastasiaProkop

.github/workflows/secure_zero_odr.yml

@@ -13,20 +13,15 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y build-essential
-
-      - name: Build secure_zero conflict sample
+          
+      - name: Build secure_zero ODR sample
         run: |
           g++ -std=c++11 -Wall -Wextra -pedantic -DHMAC_CPP_STATIC -Iinclude \
             tests/odr/main.cpp \
-            tests/odr/tu_memsets.cpp \
-            tests/odr/tu_manual.cpp \
-            tests/odr/stubs.cpp \
-            -o secure_zero_conflict
-
-      - name: Expect secure_zero mismatch
-        run: |
-          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/tu_memset.cpp \
+            tests/odr/tu_explicit.cpp \
+            tests/odr/platform_stubs.cpp \
+            -o secure_zero_odr
+            
+      - name: Run secure_zero ODR sample
+        run: ./secure_zero_odr

tests/odr/main.cpp

@@ -1,16 +1,18 @@
 #include <iostream>
 
-extern "C" int secure_zero_branch_memsets();
-extern "C" int secure_zero_branch_manual();
+extern "C" bool secure_zero_memset_s_branch();
+extern "C" bool secure_zero_explicit_bzero_branch();
 
 int main() {
-    const auto a = secure_zero_branch_memsets();
-    const auto b = secure_zero_branch_manual();
-    if (a == b) {
-        std::cout << "secure_zero branch matches across TUs: " << a << "\n";
-        return 0;
-    }
+    const bool memset_ok = secure_zero_memset_s_branch();
+    const bool explicit_ok = secure_zero_explicit_bzero_branch();
 
-    std::cout << "secure_zero branch mismatch across TUs: " << a << " vs " << b << "\n";
-    return 1;
+    if (!memset_ok || !explicit_ok) {
+        std::cout << "secure_zero failed: memset_s=" << memset_ok
+                  << ", explicit_bzero=" << explicit_ok << "\n";
+        return 1;
+	}
+	
+	std::cout << "secure_zero zeroed buffers across translation units\n";
+    return 0;
 }