chore: Merge branch 'release/4.16.0'

Cosmian · May 6, 2024 · 377efd4 · 377efd4
2 parents 54e843a + d3b22f5
commit 377efd4
Show file tree

Hide file tree

Showing 133 changed files with 34,560 additions and 1,404 deletions.
diff --git a/.cargo/audit.toml b/.cargo/audit.toml
diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
@@ -21,9 +21,9 @@ jobs:
         cargo build
         cd ../server
         cargo build
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build
-        cd ../..
+        cd ../../..
 
         # Check binaries
         target/debug/ckms -h
@@ -47,9 +47,9 @@ jobs:
         cargo build
         cd ../server
         cargo build
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build
-        cd ../..
+        cd ../../..
 
         # Check binaries
         target/debug/ckms -h
@@ -73,9 +73,9 @@ jobs:
         cargo build --features fips
         cd ../server
         cargo build --features fips
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build
-        cd ../..
+        cd ../../..
 
         # Check binaries
         target/debug/ckms -h
@@ -101,9 +101,9 @@ jobs:
         cargo build
         cd ../server
         cargo build
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build
-        cd ../..
+        cd ../../..
 
         # Check binaries
         target/debug/ckms -h
@@ -128,9 +128,9 @@ jobs:
         cargo build --features fips
         cd ../server
         cargo build --features fips
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build
-        cd ../..
+        cd ../../..
 
         # Check binaries
         target/debug/ckms -h
@@ -157,9 +157,9 @@ jobs:
         ldd ../../target/debug/ckms | grep ssl && exit 1
         cd ../server
         cargo build
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build
-        cd ../..
+        cd ../../..
 
         # Check binaries
         target/debug/ckms -h
@@ -185,12 +185,10 @@ jobs:
         cd crate/cli
         cargo build --target x86_64-pc-windows-gnu
 
-        # The `pkcs11` crate build FAILS on debug with:
-        # /usr/bin/x86_64-w64-mingw32-ld: error: export ordinal too large: 85394
         # build pkcs11 provider
-        # cd ../pkcs11
-        # cargo build --target x86_64-pc-windows-gnu
-        cd ../..
+        cd ../pkcs11/provider
+        cargo build --release --target x86_64-pc-windows-gnu
+        cd ../../..
 
         sudo mkdir -p /usr/local/openssl
         sudo chown -R $USER /usr/local/openssl
@@ -201,7 +199,7 @@ jobs:
       artifacts: |
         target/x86_64-pc-windows-gnu/debug/ckms.exe
         target/x86_64-pc-windows-gnu/debug/cosmian_kms_server.exe
-        # target/x86_64-pc-windows-gnu/debug/ckms_pkcs11.dll
+        target/x86_64-pc-windows-gnu/release/ckms_pkcs11.dll
 
   mac-tests:
     uses: ./.github/workflows/build_generic.yml
@@ -217,9 +215,9 @@ jobs:
         cd crate/cli
         cargo build --target x86_64-apple-darwin
         otool -L ../../target/x86_64-apple-darwin/debug/ckms | grep openssl && exit 1
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build --target x86_64-apple-darwin
-        cd ../server
+        cd ../../server
         cargo build --target x86_64-apple-darwin
         cd ../..
 

diff --git a/.github/workflows/build_all_release.yml b/.github/workflows/build_all_release.yml
@@ -21,9 +21,9 @@ jobs:
         cargo build --release
         cd ../server
         cargo build --release
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build --release
-        cd ../..
+        cd ../../..
 
         # Check binaries
         target/release/ckms -h
@@ -45,9 +45,9 @@ jobs:
         cargo build --release
         cd ../server
         cargo build --release
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build --release
-        cd ../..
+        cd ../../..
 
         # Check binaries
         target/release/ckms -h
@@ -69,9 +69,9 @@ jobs:
         cargo build --release --features fips
         cd ../server
         cargo build --release --features fips
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build --release
-        cd ../..
+        cd ../../..
 
         # Check binaries
         target/release/ckms -h
@@ -95,9 +95,9 @@ jobs:
         cargo build --release
         cd ../server
         cargo build --release
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build --release
-        cd ../..
+        cd ../../..
 
         # Check binaries
         target/release/ckms -h
@@ -120,9 +120,9 @@ jobs:
         cargo build --release --features fips
         cd ../server
         cargo build --release --features fips
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build --release
-        cd ../..
+        cd ../../..
 
         # Check binaries
         target/release/ckms -h
@@ -147,9 +147,9 @@ jobs:
         ldd ../../target/release/ckms | grep ssl && exit 1
         cd ../server
         cargo build --release
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build --release
-        cd ../..
+        cd ../../..
 
         # Check binaries
         target/release/ckms -h
@@ -174,9 +174,9 @@ jobs:
         cargo build --release --target x86_64-pc-windows-gnu
 
         # build pkcs11 provider
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build --release --target x86_64-pc-windows-gnu
-        cd ../..
+        cd ../../..
 
         sudo mkdir -p /usr/local/openssl
         sudo chown -R $USER /usr/local/openssl
@@ -203,9 +203,9 @@ jobs:
         cd crate/cli
         cargo build --release --target x86_64-apple-darwin
         otool -L ../../target/x86_64-apple-darwin/release/ckms | grep openssl && exit 1
-        cd ../pkcs11
+        cd ../pkcs11/provider
         cargo build --release --target x86_64-apple-darwin
-        cd ../server
+        cd ../../server
         cargo build --release --target x86_64-apple-darwin
         cd ../..
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,14 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: actions/cache@v3
-        with:
-          path: ~/.cargo/bin
-          key: ${{ runner.os }}-cargo-audit-v0.15.2
-      - uses: rustsec/audit-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: EmbarkStudios/cargo-deny-action@v1
 
   cargo-lint:
     uses: ./.github/workflows/clippy.yml
@@ -61,7 +54,7 @@ jobs:
             kms_path: .
             os: macos-12
           - archive_name: windows_tests
-            kms_path: .
+            kms_path: debug
             os: windows-2019
 
     steps:

diff --git a/.github/workflows/main_release.yml b/.github/workflows/main_release.yml
@@ -5,25 +5,18 @@ on:
   push:
     # any tags, including tags with / like v1.0/alpha
     tags:
-      - "**"
+      - '**'
   schedule:
     # every day at 3 AM
-    - cron: "00 3 * * *"
+    - cron: 00 3 * * *
 
 jobs:
   cargo-audit:
     name: Security Audit
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: actions/cache@v3
-        with:
-          path: ~/.cargo/bin
-          key: ${{ runner.os }}-cargo-audit-v0.15.2
-      - uses: rustsec/audit-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: EmbarkStudios/cargo-deny-action@v1
 
   cargo-lint:
     uses: ./.github/workflows/clippy.yml