Merge pull request #57 from cisco/fix-build

Get CI builds passing

Author: bifurcation

.github/workflows/build.yml

@@ -32,14 +32,15 @@ jobs:
     env:
       CMAKE_BUILD_DIR: ${{ github.workspace }}/build
       CMAKE_TEST_DIR: ${{ github.workspace }}/build/test
+      CMAKE_GENERATOR: "Ninja"
 
     steps:
     - uses: actions/checkout@v4
 
     - name: dependencies (macos)
       if: ${{ matrix.os == 'macos-latest' }}
       run: |
-        brew install llvm
+        brew install llvm ninja
         ln -s "/usr/local/opt/llvm/bin/clang-format" "/usr/local/bin/clang-format"
         ln -s "/usr/local/opt/llvm/bin/clang-tidy" "/usr/local/bin/clang-tidy"
 
@@ -60,5 +61,5 @@ jobs:
 
     - name: Unit tests
       run: |
-         cmake --build "${{ env.CMAKE_BUILD_DIR }}" --target "${{ matrix.ctest-target }}" --config Release
+        ctest --test-dir "${{ env.CMAKE_BUILD_DIR }}"
 

.github/workflows/style.yaml

@@ -14,5 +14,8 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: check clang-format
-      uses: jidicula/[email protected]
+      uses: jidicula/[email protected]
+      with:
+        clang-format-version: "17"
+        exclude-regex: "gsl-lite.hpp"
 

CMakeLists.txt

@@ -26,7 +26,7 @@ elseif(MSVC)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif()
 
-if (SANITIZERS AND (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"))
+if (SANITIZERS AND ((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")) AND NOT WIN32)
   set (SANITIZERS "-fsanitize=address -fsanitize=undefined")
   set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS}             ${SANITIZERS}")
   set (CMAKE_CXX_FLAGS            "${CMAKE_CXX_FLAGS}           ${SANITIZERS}")

include/sframe/sframe.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <gsl/gsl-lite.hpp>
+#include <optional>
 
 namespace sframe {
 

src/crypto.h

@@ -22,6 +22,8 @@ cipher_digest_size(CipherSuite suite);
 size_t
 cipher_key_size(CipherSuite suite);
 size_t
+cipher_enc_key_size(CipherSuite suite);
+size_t
 cipher_nonce_size(CipherSuite suite);
 
 ///

src/sframe.cpp

@@ -95,17 +95,17 @@ ContextBase::unprotect(const Header& header,
 }
 
 static auto
-from_ascii(const char* str)
+from_ascii(const char* str, size_t len)
 {
   const auto ptr = reinterpret_cast<const uint8_t*>(str);
-  return input_bytes(ptr, strlen(str));
+  return input_bytes(ptr, len);
 }
 
-static const auto base_label = from_ascii("SFrame 1.0 Secret ");
-static const auto key_label = from_ascii("key ");
-static const auto salt_label = from_ascii("salt ");
+static const auto base_label = from_ascii("SFrame 1.0 Secret ", 18);
+static const auto key_label = from_ascii("key ", 4);
+static const auto salt_label = from_ascii("salt ", 5);
 
-owned_bytes<32>
+static owned_bytes<32>
 sframe_key_label(CipherSuite suite, KeyID key_id)
 {
   auto label = owned_bytes<32>(base_label);
@@ -119,7 +119,7 @@ sframe_key_label(CipherSuite suite, KeyID key_id)
   return label;
 }
 
-owned_bytes<33>
+static owned_bytes<33>
 sframe_salt_label(CipherSuite suite, KeyID key_id)
 {
   auto label = owned_bytes<33>(base_label);

test/vectors.cpp

@@ -18,19 +18,19 @@ struct HexBytes
 };
 
 // Seems redundant, but works
-bool
+static bool
 operator==(const HexBytes& hex, const input_bytes& other)
 {
   return input_bytes(hex) == other;
 }
 
-bool
+static bool
 operator==(const input_bytes& other, const HexBytes& hex)
 {
   return hex == other;
 }
 
-void
+static void
 from_json(const json& j, HexBytes& b)
 {
   const auto hex = j.get<std::string>();
@@ -47,7 +47,7 @@ from_json(const json& j, HexBytes& b)
   }
 }
 
-void
+static void
 to_json(json& /* j */, const HexBytes& /* p */)
 {
   // Included just so that macros work