Merge branch 'master' into master

RustCrypto · Jan 8, 2024 · 3a81c66 · 3a81c66
2 parents 0585434 + cbfdf1d
commit 3a81c66
Show file tree

Hide file tree

Showing 90 changed files with 1,959 additions and 1,562 deletions.
diff --git a/.github/workflows/aead.yml b/.github/workflows/aead.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -42,17 +42,18 @@ jobs:
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features rand_core
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features stream
 
-  minimal-versions:
-    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
-    with:
-        working-directory: ${{ github.workflow }}
+  # TODO(tarcieri): re-enable after next `crypto-common` release
+  #  minimal-versions:
+  #    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
+  #    with:
+  #        working-directory: ${{ github.workflow }}
 
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/async-signature.yml b/.github/workflows/async-signature.yml
@@ -3,14 +3,15 @@ name: async-signature
 on:
   pull_request:
     paths:
+      - "async-signature/**"
       - "signature/**"
       - "Cargo.*"
   push:
     branches: master
 
 defaults:
   run:
-    working-directory: signature/async
+    working-directory: async-signature
 
 env:
   CARGO_INCREMENTAL: 0
@@ -22,7 +23,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.75.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4
@@ -39,10 +40,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: RustCrypto/actions/cargo-cache@master
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly
-      - uses: RustCrypto/actions/cargo-hack-install@master
-      - run: rm ../../Cargo.toml
+      - uses: dtolnay/rust-toolchain@nightly
       - run: cargo update -Z minimal-versions
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: RustCrypto/actions/cargo-hack-install@master
+      - run: rm ../Cargo.toml
       - run: cargo hack test --release --feature-powerset
diff --git a/.github/workflows/cipher.yml b/.github/workflows/cipher.yml
@@ -3,6 +3,7 @@ name: cipher
 on:
   pull_request:
     paths:
+      - ".github/workflows/cipher.yml"
       - "cipher/**"
       - "Cargo.*"
   push:
@@ -22,7 +23,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -39,25 +40,24 @@ jobs:
       - run: cargo build --target ${{ matrix.target }} --features block-padding
 
   # TODO: use the reusable workflow after this crate will be part of the
-  # toot workspace
+  # root workspace
   minimal-versions:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: RustCrypto/actions/cargo-cache@master
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly
+      - uses: dtolnay/rust-toolchain@nightly
       - uses: RustCrypto/actions/cargo-hack-install@master
       - run: cargo update -Z minimal-versions
+      - uses: dtolnay/rust-toolchain@stable
       - run: cargo hack test --release --feature-powerset
 
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/crypto-common.yml b/.github/workflows/crypto-common.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -46,7 +46,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/crypto.yml b/.github/workflows/crypto.yml
@@ -67,14 +67,3 @@ jobs:
       - run: cargo test --no-default-features --release
       - run: cargo test --release
       - run: cargo test --all-features --release
-
-  clippy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: RustCrypto/actions/cargo-cache@master
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: 1.65.0
-          components: clippy
-      - run: cargo clippy --all --all-features -- -D warnings
diff --git a/.github/workflows/digest.yml b/.github/workflows/digest.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.57.0 # MSRV
+          - 1.71.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -34,21 +34,20 @@ jobs:
         with:
           toolchain: ${{ matrix.rust }}
           targets: ${{ matrix.target }}
-      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
-      - run: rm ../Cargo.toml
       - run: cargo build --target ${{ matrix.target }}
 
-  minimal-versions:
-    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
-    with:
-        working-directory: ${{ github.workflow }}
+  # TODO(tarcieri): re-enable after next `crypto-common` release
+  #minimal-versions:
+  #  uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
+  #  with:
+  #      working-directory: ${{ github.workflow }}
 
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         rust:
-          - 1.57.0 # MSRV
+          - 1.71.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/elliptic-curve.yml b/.github/workflows/elliptic-curve.yml
@@ -57,19 +57,17 @@ jobs:
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features arithmetic,serde
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features alloc,digest,ecdh,hazmat,hash2curve,jwk,pem,pkcs8,sec1,serde,voprf
 
-  # TODO: use the reusable workflow after this crate is re-added to the
-  # toplevel workspace
-  # minimal-versions:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - uses: RustCrypto/actions/cargo-cache@master
-  #     - uses: dtolnay/rust-toolchain@master
-  #       with:
-  #         toolchain: nightly
-  #     - uses: RustCrypto/actions/cargo-hack-install@master
-  #     - run: cargo update -Z minimal-versions
-  #     - run: cargo hack test --release --feature-powerset
+  minimal-versions:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: RustCrypto/actions/cargo-cache@master
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly
+      - uses: RustCrypto/actions/cargo-hack-install@master
+      - run: cargo update -Z minimal-versions
+      - run: cargo +stable build --release --all-features
 
   test:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/kem.yml b/.github/workflows/kem.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.61.0 # Next MSRV candidate
+          - 1.66.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -36,26 +36,12 @@ jobs:
           targets: ${{ matrix.target }}
       - run: cargo build --no-default-features --release --target ${{ matrix.target }}
 
-  # TODO: use the reusable workflow after this crate will be part of the
-  # toot workspace
-  # minimal-versions:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - uses: RustCrypto/actions/cargo-cache@master
-  #     - uses: dtolnay/rust-toolchain@master
-  #       with:
-  #         toolchain: nightly
-  #     - uses: RustCrypto/actions/cargo-hack-install@master
-  #     - run: cargo update -Z minimal-versions
-  #     - run: cargo hack test --release --feature-powerset
-
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         rust:
-          - 1.61.0 # Next MSRV candidate
+          - 1.66.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4
@@ -67,15 +53,3 @@ jobs:
       - run: cargo test --no-default-features --release
       - run: cargo test --release
       - run: cargo test --all-features --release
-
-  # build-only test of MSRV
-  # TODO: remove on MSRV bump higher than MSRV of `cc`
-  test-msrv:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: RustCrypto/actions/cargo-cache@master
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: 1.60.0
-      - run: cargo check --all-features
diff --git a/.github/workflows/signature.yml b/.github/workflows/signature.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
       - "signature/**"
+      - "signature-derive/**"
       - "Cargo.*"
   push:
     branches: master
@@ -23,7 +24,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.60.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -51,7 +52,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.60.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4
@@ -69,7 +70,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.60.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4
@@ -78,7 +79,7 @@ jobs:
         with:
           toolchain: ${{ matrix.rust }}
       - run: cargo test --release
-        working-directory: signature/derive
+        working-directory: signature_derive
 
   doc:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/universal-hash.yml b/.github/workflows/universal-hash.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -34,30 +34,27 @@ jobs:
         with:
           toolchain: ${{ matrix.rust }}
           targets: ${{ matrix.target }}
-      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
-      - run: rm ../Cargo.toml
       - run: cargo build --no-default-features --release --target ${{ matrix.target }}
 
-  minimal-versions:
-    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
-    with:
-        working-directory: ${{ github.workflow }}
+  # TODO(tarcieri): re-enable after next `crypto-common` release
+  #  minimal-versions:
+  #    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
+  #    with:
+  #        working-directory: ${{ github.workflow }}
 
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4
       - uses: RustCrypto/actions/cargo-cache@master
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-      # Isolate this crate from workspace which is otherwise MSRV 1.56 due to 2021 edition crates
-      - run: rm ../Cargo.toml
       - run: cargo check --all-features
       - run: cargo test --no-default-features --release
       - run: cargo test --release

diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml
@@ -26,9 +26,9 @@ jobs:
       - uses: RustCrypto/actions/cargo-cache@master
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.71.0
+          toolchain: 1.75.0
           components: clippy
-      - run: cargo clippy --all --all-features -- -D warnings
+      - run: cargo clippy --all --all-features --tests -- -D warnings
 
   rustfmt:
     runs-on: ubuntu-latest