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
14 changes: 13 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,19 @@ jobs:
- name: Run the container to execute the test script
uses: ./.github/actions/ci_script
with:
ci-flags: "build-test"
ci-flags: "build-and-test"

build-msrv:
name: MSRV - Build Parsec OpenSSL Provider
runs-on: ubuntu-latest
if: ${{ always() }}
needs: [build-and-export-test-docker]
steps:
- uses: actions/checkout@v3
- name: Run the container to execute the test script
uses: ./.github/actions/ci_script
with:
ci-flags: "build"

static-checks:
name: Run static checks
Expand Down
18 changes: 13 additions & 5 deletions ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ Continuous Integration test script

Usage: ./ci.sh --TEST
where TEST can be one of:
--build-test
--build
--build-and-test
--static-checks
"
}
Expand Down Expand Up @@ -40,13 +41,18 @@ fi

rustup update

BUILD_AND_TEST="False"
BUILD="False"
TEST="False"
STATIC_CHECKS="False"

while [ "$#" -gt 0 ]; do
case "$1" in
--build-test )
BUILD_AND_TEST="True"
--build )
BUILD="True"
;;
--build-and-test )
BUILD="True"
TEST="True"
;;
--static-checks )
STATIC_CHECKS="True"
Expand All @@ -58,15 +64,17 @@ while [ "$#" -gt 0 ]; do
shift
done

if [ "$BUILD_AND_TEST" == "True" ]; then
if [ "$BUILD" == "True" ]; then
echo "OpenSSL version being used:"
openssl version

# Build parsec provider shared library
pushd parsec-openssl-provider-shared/ &&
cargo build
popd
fi

if [ "$TEST" == "True" ]; then
pushd /tmp/parsec
./target/debug/parsec -c e2e_tests/provider_cfg/mbed-crypto/config.toml &
popd
Expand Down
2 changes: 1 addition & 1 deletion parsec-openssl-provider-shared/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ unsafe extern "C" fn OSSL_provider_init(

openssl_errors::openssl_errors! {
#[allow(clippy::empty_enum)]
library Error("parsec_openssl_provider_shared") {
pub library Error("parsec_openssl_provider_shared") {
functions {
PROVIDER_INIT("parsec_provider_init");
}
Expand Down
2 changes: 1 addition & 1 deletion parsec-openssl-provider/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ log = "0.4"
parsec-client = { git = "https://github.com/parallaxsecond/parsec-client-rust", tag="0.16.0" }
parsec-openssl2 = { path = "../parsec-openssl2" }
openssl-errors = "0.2.0"
env_logger = "0.11.2"
env_logger = "0.10.2"
4 changes: 2 additions & 2 deletions parsec-openssl-provider/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub unsafe fn parsec_provider_provider_init(
out: *mut *const OSSL_DISPATCH,
provctx: types::VOID_PTR_PTR,
) -> Result<(), parsec_openssl2::Error> {
env_logger::init();
let _ = env_logger::try_init();

let parsec_provider_teardown_ptr: ProviderTeardownPtr = parsec_provider_teardown;

Expand Down Expand Up @@ -93,7 +93,7 @@ pub unsafe fn parsec_provider_provider_init(

openssl_errors::openssl_errors! {
#[allow(clippy::empty_enum)]
library Error("parsec_openssl_provider") {
pub library Error("parsec_openssl_provider") {
functions {
PROVIDER_TEARDOWN("parsec_provider_teardown");
PROVIDER_GETTABLE_PARAMS("parsec_provider_gettable_params");
Expand Down