Skip to content

Commit c7cbed0

Browse files
authored
Upgrade all crates to the 2024 edition and bump MSRV to 1.85 (#178)
1 parent 816cc88 commit c7cbed0

File tree

24 files changed

+113
-140
lines changed

24 files changed

+113
-140
lines changed

.github/workflows/belt-mac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
rust:
26-
- 1.81.0 # MSRV
26+
- 1.85.0 # MSRV
2727
- stable
2828
target:
2929
- thumbv7em-none-eabi
@@ -49,7 +49,7 @@ jobs:
4949
strategy:
5050
matrix:
5151
rust:
52-
- 1.81.0 # MSRV
52+
- 1.85.0 # MSRV
5353
- stable
5454
steps:
5555
- uses: actions/checkout@v4

.github/workflows/cbc-mac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
matrix:
2626
rust:
27-
- 1.81.0 # MSRV
27+
- 1.85.0 # MSRV
2828
- stable
2929
target:
3030
- thumbv7em-none-eabi
@@ -50,7 +50,7 @@ jobs:
5050
strategy:
5151
matrix:
5252
rust:
53-
- 1.81.0 # MSRV
53+
- 1.85.0 # MSRV
5454
- stable
5555
steps:
5656
- uses: actions/checkout@v4

.github/workflows/cmac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
rust:
26-
- 1.81.0 # MSRV
26+
- 1.85.0 # MSRV
2727
- stable
2828
target:
2929
- thumbv7em-none-eabi
@@ -49,7 +49,7 @@ jobs:
4949
strategy:
5050
matrix:
5151
rust:
52-
- 1.81.0 # MSRV
52+
- 1.85.0 # MSRV
5353
- stable
5454
steps:
5555
- uses: actions/checkout@v4

.github/workflows/hmac.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
matrix:
2626
rust:
27-
- 1.81.0 # MSRV
27+
- 1.85.0 # MSRV
2828
- stable
2929
target:
3030
- thumbv7em-none-eabi
@@ -39,6 +39,7 @@ jobs:
3939
- run: cargo build --no-default-features --release --target ${{ matrix.target }}
4040

4141
minimal-versions:
42+
if: false # TODO: temp disabled due to unpublished prerelease dependencies
4243
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
4344
with:
4445
working-directory: ${{ github.workflow }}
@@ -48,7 +49,7 @@ jobs:
4849
strategy:
4950
matrix:
5051
rust:
51-
- 1.81.0 # MSRV
52+
- 1.85.0 # MSRV
5253
- stable
5354
steps:
5455
- uses: actions/checkout@v4

.github/workflows/pmac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
rust:
26-
- 1.81.0 # MSRV
26+
- 1.85.0 # MSRV
2727
- stable
2828
target:
2929
- thumbv7em-none-eabi
@@ -49,7 +49,7 @@ jobs:
4949
strategy:
5050
matrix:
5151
rust:
52-
- 1.81.0 # MSRV
52+
- 1.85.0 # MSRV
5353
- stable
5454
steps:
5555
- uses: actions/checkout@v4

.github/workflows/retail-mac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
rust:
26-
- 1.81.0 # MSRV
26+
- 1.85.0 # MSRV
2727
- stable
2828
target:
2929
- thumbv7em-none-eabi
@@ -49,7 +49,7 @@ jobs:
4949
strategy:
5050
matrix:
5151
rust:
52-
- 1.81.0 # MSRV
52+
- 1.85.0 # MSRV
5353
- stable
5454
steps:
5555
- uses: actions/checkout@v4

.github/workflows/workspace.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: RustCrypto/actions/cargo-cache@master
1818
- uses: dtolnay/rust-toolchain@master
1919
with:
20-
toolchain: 1.81.0
20+
toolchain: 1.85.0
2121
components: clippy
2222
- run: cargo clippy --all -- -D warnings
2323

Cargo.lock

Lines changed: 29 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,17 @@ members = ["belt-mac", "cbc-mac", "cmac", "hmac", "pmac", "retail-mac"]
44

55
[profile.dev]
66
opt-level = 2
7+
8+
[patch.crates-io]
9+
# https://github.com/RustCrypto/hashes/pull/652
10+
md-5 = { git = "https://github.com/RustCrypto/hashes.git" }
11+
sha1 = { git = "https://github.com/RustCrypto/hashes.git" }
12+
sha2 = { git = "https://github.com/RustCrypto/hashes.git" }
13+
streebog = { git = "https://github.com/RustCrypto/hashes.git" }
14+
15+
# https://github.com/RustCrypto/block-ciphers/pull/472
16+
aes = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/edition-2024" }
17+
des = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/edition-2024" }
18+
belt-block = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/edition-2024" }
19+
kuznyechik = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/edition-2024" }
20+
magma = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/edition-2024" }

0 commit comments

Comments
 (0)