diff --git a/.github/workflows/belt-ctr.yaml b/.github/workflows/belt-ctr.yaml index e2148bc..d07ccff 100644 --- 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 index 3a33005..9e064ab 100644 --- a/.github/workflows/cbc.yaml +++ b/.github/workflows/cbc.yaml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.56.0 # MSRV + - 1.72.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 index 4f3d56d..4a0bfe4 100644 --- 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.72.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 index c16d7c5..0400cab 100644 --- a/.github/workflows/cfb8.yaml +++ b/.github/workflows/cfb8.yaml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.56.0 # MSRV + - 1.72.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 index 7290124..6b38f02 100644 --- a/.github/workflows/ctr.yaml +++ b/.github/workflows/ctr.yaml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.56.0 # MSRV + - 1.72.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 index 89ed57d..0770610 100644 --- a/.github/workflows/ige.yaml +++ b/.github/workflows/ige.yaml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.56.0 # MSRV + - 1.72.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 index bce61c7..ea86914 100644 --- a/.github/workflows/ofb.yaml +++ b/.github/workflows/ofb.yaml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.56.0 # MSRV + - 1.72.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 index 3be5d86..0304220 100644 --- a/.github/workflows/pcbc.yaml +++ b/.github/workflows/pcbc.yaml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.56.0 # MSRV + - 1.72.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 index 8738ae1..aaf0a20 100644 --- 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 index a8f8f65..a3471cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,7 +5,7 @@ version = 3 [[package]] name = "aes" version = "0.9.0-pre" -source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo/bump-cipher/0.5.0-pre.3#bbc6d549f5abff8ce5301abf1f97d9c494ada85c" +source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo/bump-cipher/0.5.0-pre.4#bb94e5e71f5320fcaab727ad0c503cca5190da4c" dependencies = [ "cfg-if", "cipher", @@ -15,7 +15,7 @@ dependencies = [ [[package]] name = "belt-block" version = "0.2.0-pre" -source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo/bump-cipher/0.5.0-pre.3#bbc6d549f5abff8ce5301abf1f97d9c494ada85c" +source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo/bump-cipher/0.5.0-pre.4#bb94e5e71f5320fcaab727ad0c503cca5190da4c" dependencies = [ "cipher", ] @@ -80,8 +80,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cipher" -version = "0.5.0-pre.3" -source = "git+https://github.com/RustCrypto/traits.git#cce3b05861fe851b3ab2c57d8c14cfa27fee814e" +version = "0.5.0-pre.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84fba98785cecd0e308818a87c817576a40f99d8bab6405bf422bacd3efb6c1f" dependencies = [ "blobby", "crypto-common", @@ -174,7 +175,7 @@ dependencies = [ [[package]] name = "kuznyechik" version = "0.9.0-pre" -source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo/bump-cipher/0.5.0-pre.3#bbc6d549f5abff8ce5301abf1f97d9c494ada85c" +source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo/bump-cipher/0.5.0-pre.4#bb94e5e71f5320fcaab727ad0c503cca5190da4c" dependencies = [ "cipher", ] @@ -188,7 +189,7 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "magma" version = "0.10.0-pre" -source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo/bump-cipher/0.5.0-pre.3#bbc6d549f5abff8ce5301abf1f97d9c494ada85c" +source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo/bump-cipher/0.5.0-pre.4#bb94e5e71f5320fcaab727ad0c503cca5190da4c" dependencies = [ "cipher", ] diff --git a/Cargo.toml b/Cargo.toml index a3d616e..3595d92 100644 --- 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 index 6b1c594..1d540f1 100644 --- a/belt-ctr/Cargo.toml +++ b/belt-ctr/Cargo.toml @@ -5,7 +5,7 @@ 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" @@ -13,13 +13,13 @@ 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 index d83ed15..77443ff 100644 --- a/cbc/Cargo.toml +++ b/cbc/Cargo.toml @@ -5,7 +5,7 @@ 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" @@ -13,11 +13,11 @@ 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 index 0ea1945..182c855 100644 --- a/cfb-mode/Cargo.toml +++ b/cfb-mode/Cargo.toml @@ -5,7 +5,7 @@ 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" @@ -13,12 +13,12 @@ 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 index 6b2d56c..0415493 100644 --- a/cfb8/Cargo.toml +++ b/cfb8/Cargo.toml @@ -5,7 +5,7 @@ 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" @@ -13,11 +13,11 @@ 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] diff --git a/ctr/Cargo.toml b/ctr/Cargo.toml index 040a3be..a2ba849 100644 --- a/ctr/Cargo.toml +++ b/ctr/Cargo.toml @@ -5,7 +5,7 @@ description = "CTR block modes 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/ctr" repository = "https://github.com/RustCrypto/block-modes" @@ -13,13 +13,13 @@ 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" magma = "=0.10.0-pre" kuznyechik = "=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/ige/Cargo.toml b/ige/Cargo.toml index 24fe472..9a2020b 100644 --- a/ige/Cargo.toml +++ b/ige/Cargo.toml @@ -5,7 +5,7 @@ description = "Infinite Garble Extension (IGE) 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/ige" repository = "https://github.com/RustCrypto/block-modes" @@ -13,11 +13,11 @@ 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/ofb/Cargo.toml b/ofb/Cargo.toml index 65c2697..e222c2a 100644 --- a/ofb/Cargo.toml +++ b/ofb/Cargo.toml @@ -5,7 +5,7 @@ description = "Output Feedback][OFB] (OFB) 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/ofb" repository = "https://github.com/RustCrypto/block-modes" @@ -13,11 +13,11 @@ 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] diff --git a/pcbc/Cargo.toml b/pcbc/Cargo.toml index 781ea60..a2bd96a 100644 --- a/pcbc/Cargo.toml +++ b/pcbc/Cargo.toml @@ -5,7 +5,7 @@ description = "Propagating Cipher Block Chaining (PCBC) block cipher mode of ope 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/pcbc" repository = "https://github.com/RustCrypto/block-ciphers" @@ -13,11 +13,11 @@ 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]