Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
crypto: [OPENSSL_1_1, OPENSSL_3, BORINGSSL]
include:
- os: windows-latest
vcpkg-cmake-file: "$env:VCPKG_INSTALLATION_ROOT\\scripts\\buildsystems\\vcpkg.cmake"
Expand All @@ -37,10 +38,15 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: dependencies (ubuntu)
if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
sudo apt-get install nasm

- name: dependencies (macos)
if: ${{ matrix.os == 'macos-latest' }}
run: |
brew install llvm ninja
brew install llvm ninja nasm go
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"

Expand All @@ -52,8 +58,8 @@ jobs:
key: ${{ runner.os }}-${{ hashFiles( '**/vcpkg.json' ) }}

- name: configure to use clang-tidy and sanitizers
run: |
cmake -B "${{ env.CMAKE_BUILD_DIR }}" -DCLANG_TIDY=ON -DTESTING=ON -DSANITIZERS=ON -DCMAKE_TOOLCHAIN_FILE="${{ matrix.vcpkg-cmake-file}}" .
run: >
cmake -B "${{ env.CMAKE_BUILD_DIR }}" -DTESTING=ON -DCLANG_TIDY=ON -DSANITIZERS=ON -DCMAKE_TOOLCHAIN_FILE="${{ matrix.vcpkg-cmake-file}}" -DCRYPTO="${{ matrix.crypto }}" -DVCPKG_MANIFEST_DIR="alternatives/${{ matrix.crypto }}"

- name: build
run: |
Expand Down
7 changes: 6 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ option(TESTING "Build tests" OFF)
option(CLANG_TIDY "Perform linting with clang-tidy" OFF)
option(SANITIZERS "Enable sanitizers" OFF)

# Use -DCRYPTO=(OPENSSL_1_1 | OPENSSL_3) to configure crypto
# Use -DCRYPTO=(OPENSSL_1_1 | OPENSSL_3 | BORINGSSL) to configure crypto
if(NOT DEFINED CRYPTO)
set(CRYPTO "OPENSSL_3")
endif()
Expand Down Expand Up @@ -64,6 +64,11 @@ elseif(${CRYPTO} STREQUAL "OPENSSL_3")
find_package(OpenSSL 3 EXACT REQUIRED)
add_compile_definitions(OPENSSL_3)
set(CRYPTO_LIB OpenSSL::Crypto)
elseif(${CRYPTO} STREQUAL "BORINGSSL")
message(STATUS "Configuring with BoringSSL")
find_package(OpenSSL REQUIRED)
add_compile_definitions(BORINGSSL)
set(CRYPTO_LIB OpenSSL::Crypto)
else()
message(FATAL_ERROR "Please select a crypto back-end (OPENSSL_1_1 or OPENSSL_3) [${CRYPTO}]")
endif()
Expand Down
20 changes: 18 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ LIB=./build/libsframe.a
TEST_VECTOR_DIR=./build/test
TEST_BIN=./build/test/sframe_test

.PHONY: all tidy test clean cclean format
OPENSSL_1_1_MANIFEST=alternatives/OPENSSL_1_1
OPENSSL_3_MANIFEST=alternatives/OPENSSL_3
BORINGSSL_MANIFEST=alternatives/BORINGSSL

.PHONY: all dev dev1 devB tidy test clean cclean format

${LIB}: ${BUILD_DIR} src/* include/sframe/*
cmake --build ${BUILD_DIR} --target sframe
Expand All @@ -20,7 +24,19 @@ ${BUILD_DIR}: CMakeLists.txt test/CMakeLists.txt
cmake -B${BUILD_DIR} .

dev: CMakeLists.txt test/CMakeLists.txt
cmake -B${BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCLANG_TIDY=ON -DTESTING=ON -DSANITIZERS=ON .
cmake -B${BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DTESTING=ON \
-DCLANG_TIDY=ON -DSANITIZERS=ON \
-DCRYPTO=OPENSSL_3 -DVCPKG_MANIFEST_DIR=${OPENSSL_3_MANIFEST}

dev1: CMakeLists.txt test/CMakeLists.txt
cmake -B${BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DTESTING=ON \
-DCLANG_TIDY=ON -DSANITIZERS=ON \
-DCRYPTO=OPENSSL_1_1 -DVCPKG_MANIFEST_DIR=${OPENSSL_1_1_MANIFEST}

devB: CMakeLists.txt test/CMakeLists.txt
cmake -B${BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DTESTING=ON \
-DCLANG_TIDY=ON -DSANITIZERS=ON \
-DCRYPTO=BORINGSSL -DVCPKG_MANIFEST_DIR=${BORINGSSL_MANIFEST}

${TEST_BIN}: ${LIB} test/*
cmake --build ${BUILD_DIR} --target sframe_test
Expand Down
14 changes: 14 additions & 0 deletions alternatives/BORINGSSL/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "mlspp",
"version-string": "0.1",
"description": "Cisco MLS C++ library (BoringSSL 1.1)",
"dependencies": [
{
"name": "boringssl",
"version>=": "2023-10-13"
},
"doctest",
"nlohmann-json"
],
"builtin-baseline": "eb33d2f7583405fca184bcdf7fdd5828ec88ac05"
}
20 changes: 20 additions & 0 deletions alternatives/OPENSSL_1_1/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "mlspp",
"version-string": "0.1",
"description": "Cisco MLS C++ library",
"dependencies": [
{
"name": "openssl",
"version>=": "1.1.1n"
},
"doctest",
"nlohmann-json"
],
"builtin-baseline": "eb33d2f7583405fca184bcdf7fdd5828ec88ac05",
"overrides": [
{
"name": "openssl",
"version-string": "1.1.1n"
}
]
}
20 changes: 20 additions & 0 deletions alternatives/OPENSSL_3/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "mlspp",
"version-string": "0.1",
"description": "Cisco MLS C++ library (OpenSSL 3)",
"dependencies": [
{
"name": "openssl",
"version>=": "3.0.7"
},
"doctest",
"nlohmann-json"
],
"builtin-baseline": "eb33d2f7583405fca184bcdf7fdd5828ec88ac05",
"overrides": [
{
"name": "openssl",
"version": "3.0.7"
}
]
}
Loading
Loading