bump cipher to 0.5.0-pre.4

RustCrypto · Mar 5, 2024 · 743e93e · 743e93e
1 parent 7c22a35
commit 743e93e
Show file tree

Hide file tree

Showing 19 changed files with 70 additions and 57 deletions.
diff --git a/.github/workflows/belt-ctr.yaml b/.github/workflows/belt-ctr.yaml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.57.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -39,6 +39,8 @@ jobs:
       - run: cargo build --no-default-features --release --target ${{ matrix.target }}
 
   minimal-versions:
+    # disabled until belt-block gets published
+    if: false
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}
@@ -48,7 +50,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.57.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/cbc.yaml b/.github/workflows/cbc.yaml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -37,6 +37,8 @@ jobs:
       - run: cargo build --no-default-features --release --target ${{ matrix.target }}
 
   minimal-versions:
+    # disabled until belt-block gets published
+    if: false
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}
@@ -46,7 +48,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.72.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/cfb-mode.yaml b/.github/workflows/cfb-mode.yaml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -37,6 +37,8 @@ jobs:
       - run: cargo build --no-default-features --release --target ${{ matrix.target }}
 
   minimal-versions:
+    # disabled until aes gets published
+    if: false
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}
@@ -46,7 +48,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.72.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/cfb8.yaml b/.github/workflows/cfb8.yaml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -37,6 +37,8 @@ jobs:
       - run: cargo build --no-default-features --release --target ${{ matrix.target }}
 
   minimal-versions:
+    # disabled until aes gets published
+    if: false
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}
@@ -46,7 +48,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.72.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/ctr.yaml b/.github/workflows/ctr.yaml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -37,6 +37,8 @@ jobs:
       - run: cargo build --no-default-features --release --target ${{ matrix.target }}
 
   minimal-versions:
+    # disabled until aes gets published
+    if: false
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}
@@ -46,7 +48,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.72.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/ige.yaml b/.github/workflows/ige.yaml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -37,6 +37,8 @@ jobs:
       - run: cargo build --no-default-features --release --target ${{ matrix.target }}
 
   minimal-versions:
+    # disabled until aes gets published
+    if: false
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}
@@ -46,7 +48,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.72.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/ofb.yaml b/.github/workflows/ofb.yaml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -37,6 +37,8 @@ jobs:
       - run: cargo build --no-default-features --release --target ${{ matrix.target }}
 
   minimal-versions:
+    # disabled until aes gets published
+    if: false
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}
@@ -46,7 +48,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.72.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/pcbc.yaml b/.github/workflows/pcbc.yaml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -37,6 +37,8 @@ jobs:
       - run: cargo build --no-default-features --release --target ${{ matrix.target }}
 
   minimal-versions:
+    # disabled until aes gets published
+    if: false
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}
@@ -46,7 +48,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.72.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: RustCrypto/actions/cargo-cache@master
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.71.0
+          toolchain: 1.72.0
           components: clippy
       - run: cargo clippy --all --all-features -- -D warnings
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,13 +11,9 @@ members = [
 ]
 
 [patch.crates-io]
-# https://github.com/RustCrypto/block-ciphers/pull/411
-aes        = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.3" }
-belt-block = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.3" }
-kuznyechik = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.3" }
-magma      = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.3" }
-
-# Unreleased, but merged:
-# - https://github.com/RustCrypto/traits/pull/1511
-# - https://github.com/RustCrypto/traits/pull/1512
-cipher     = { git = "https://github.com/RustCrypto/traits.git" }
+# please re-enable the minimal-versions when you remove those patches.
+# https://github.com/RustCrypto/block-ciphers/pull/413
+aes        = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.4" }
+belt-block = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.4" }
+kuznyechik = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.4" }
+magma      = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.4" }
diff --git a/belt-ctr/Cargo.toml b/belt-ctr/Cargo.toml
@@ -5,21 +5,21 @@ description = "CTR block mode of operation specified by the BelT standard"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.65"
 readme = "README.md"
 documentation = "https://docs.rs/belt-ctr"
 repository = "https://github.com/RustCrypto/block-modes"
 keywords = ["crypto", "block-mode", "stream-cipher", "ciphers", "belt"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-cipher = "=0.5.0-pre.3"
+cipher = "=0.5.0-pre.4"
 belt-block = "=0.2.0-pre"
 
 [dev-dependencies]
 hex-literal = "0.4"
 belt-block = "=0.2.0-pre"
-cipher = { version = "=0.5.0-pre.3", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
 
 [features]
 alloc = ["cipher/alloc"]

diff --git a/cbc/Cargo.toml b/cbc/Cargo.toml
@@ -5,19 +5,19 @@ description = "Cipher Block Chaining (CBC) block cipher mode of operation"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.65"
 readme = "README.md"
 documentation = "https://docs.rs/cbc"
 repository = "https://github.com/RustCrypto/block-modes"
 keywords = ["crypto", "block-mode", "ciphers"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-cipher = "=0.5.0-pre.3"
+cipher = "=0.5.0-pre.4"
 
 [dev-dependencies]
 aes = "=0.9.0-pre"
-cipher = { version = "=0.5.0-pre.3", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
 hex-literal = "0.3.3"
 
 [features]

diff --git a/cfb-mode/Cargo.toml b/cfb-mode/Cargo.toml
@@ -5,20 +5,20 @@ description = "Cipher Feedback (CFB) block cipher mode of operation"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.65"
 readme = "README.md"
 documentation = "https://docs.rs/cfb-mode"
 repository = "https://github.com/RustCrypto/block-modes"
 keywords = ["crypto", "block-mode", "stream-cipher", "ciphers"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-cipher = "=0.5.0-pre.3"
+cipher = "=0.5.0-pre.4"
 
 [dev-dependencies]
 aes = "=0.9.0-pre"
 belt-block = "=0.2.0-pre"
-cipher = { version = "=0.5.0-pre.3", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
 hex-literal = "0.3"
 
 [features]

diff --git a/cfb8/Cargo.toml b/cfb8/Cargo.toml
@@ -5,19 +5,19 @@ description = "Cipher Feedback with eight bit feedback (CFB-8) block cipher mode
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.65"
 readme = "README.md"
 documentation = "https://docs.rs/cfb8"
 repository = "https://github.com/RustCrypto/block-modes"
 keywords = ["crypto", "block-mode", "stream-cipher", "ciphers"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-cipher = "=0.5.0-pre.3"
+cipher = "=0.5.0-pre.4"
 
 [dev-dependencies]
 aes = "=0.9.0-pre"
-cipher = { version = "=0.5.0-pre.3", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
 hex-literal = "0.3"
 
 [features]