Skip to content

Commit cc0d864

Browse files
authored
Merge branch 'master' into 64-bit-counter-support-newtype
2 parents b222fea + 1045d03 commit cc0d864

File tree

19 files changed

+114
-295
lines changed

19 files changed

+114
-295
lines changed

.github/workflows/benches.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ env:
1717

1818
jobs:
1919
build:
20+
if: false # TODO: temp disabled due to unpublished prerelease dependencies
2021
runs-on: ubuntu-latest
2122
steps:
22-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2324
- uses: RustCrypto/actions/cargo-cache@master
2425
- uses: dtolnay/rust-toolchain@master
2526
with:

.github/workflows/chacha20.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- thumbv7em-none-eabi
3232
- wasm32-unknown-unknown
3333
steps:
34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v5
3535
- uses: RustCrypto/actions/cargo-cache@master
3636
- uses: dtolnay/rust-toolchain@master
3737
with:
@@ -41,6 +41,7 @@ jobs:
4141
- run: cargo build --target ${{ matrix.target }} --features zeroize
4242

4343
minimal-versions:
44+
if: false # TODO: temp disabled due to unpublished prerelease dependencies
4445
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
4546
with:
4647
working-directory: ${{ github.workflow }}
@@ -65,7 +66,7 @@ jobs:
6566
- target: x86_64-unknown-linux-gnu
6667
rust: stable
6768
steps:
68-
- uses: actions/checkout@v4
69+
- uses: actions/checkout@v5
6970
- uses: RustCrypto/actions/cargo-cache@master
7071
- uses: dtolnay/rust-toolchain@master
7172
with:
@@ -99,7 +100,7 @@ jobs:
99100
- target: x86_64-unknown-linux-gnu
100101
rust: stable
101102
steps:
102-
- uses: actions/checkout@v4
103+
- uses: actions/checkout@v5
103104
- uses: RustCrypto/actions/cargo-cache@master
104105
- uses: dtolnay/rust-toolchain@master
105106
with:
@@ -133,7 +134,7 @@ jobs:
133134
- target: x86_64-unknown-linux-gnu
134135
rust: stable
135136
steps:
136-
- uses: actions/checkout@v4
137+
- uses: actions/checkout@v5
137138
- uses: RustCrypto/actions/cargo-cache@master
138139
- uses: dtolnay/rust-toolchain@master
139140
with:
@@ -167,7 +168,7 @@ jobs:
167168
- target: x86_64-unknown-linux-gnu
168169
rust: stable
169170
steps:
170-
- uses: actions/checkout@v4
171+
- uses: actions/checkout@v5
171172
- uses: RustCrypto/actions/cargo-cache@master
172173
- uses: dtolnay/rust-toolchain@master
173174
with:
@@ -202,7 +203,7 @@ jobs:
202203
# Cross mounts only current package, i.e. by default it ignores workspace's Cargo.toml
203204
working-directory: .
204205
steps:
205-
- uses: actions/checkout@v4
206+
- uses: actions/checkout@v5
206207
- uses: RustCrypto/actions/cargo-cache@master
207208
- run: ${{ matrix.deps }}
208209
- uses: dtolnay/rust-toolchain@master

.github/workflows/hc-256.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- thumbv7em-none-eabi
2929
- wasm32-unknown-unknown
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
@@ -39,6 +39,7 @@ jobs:
3939
- run: cargo build --target ${{ matrix.target }} --features zeroize
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 }}
@@ -51,7 +52,7 @@ jobs:
5152
- 1.85.0 # MSRV
5253
- stable
5354
steps:
54-
- uses: actions/checkout@v4
55+
- uses: actions/checkout@v5
5556
- uses: RustCrypto/actions/cargo-cache@master
5657
- uses: dtolnay/rust-toolchain@master
5758
with:

.github/workflows/rabbit.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- thumbv7em-none-eabi
2929
- wasm32-unknown-unknown
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
@@ -38,6 +38,7 @@ jobs:
3838
- run: cargo build --target ${{ matrix.target }} --features zeroize
3939

4040
minimal-versions:
41+
if: false # TODO: temp disabled due to unpublished prerelease dependencies
4142
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
4243
with:
4344
working-directory: ${{ github.workflow }}
@@ -50,7 +51,7 @@ jobs:
5051
- 1.85.0 # MSRV
5152
- stable
5253
steps:
53-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@v5
5455
- uses: RustCrypto/actions/cargo-cache@master
5556
- uses: dtolnay/rust-toolchain@master
5657
with:

.github/workflows/rc4.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- thumbv7em-none-eabi
2929
- wasm32-unknown-unknown
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
@@ -38,6 +38,7 @@ jobs:
3838
- run: cargo build --target ${{ matrix.target }} --features zeroize
3939

4040
minimal-versions:
41+
if: false # TODO: temp disabled due to unpublished prerelease dependencies
4142
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
4243
with:
4344
working-directory: ${{ github.workflow }}
@@ -50,7 +51,7 @@ jobs:
5051
- 1.85.0 # MSRV
5152
- stable
5253
steps:
53-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@v5
5455
- uses: RustCrypto/actions/cargo-cache@master
5556
- uses: dtolnay/rust-toolchain@master
5657
with:

.github/workflows/salsa20.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- thumbv7em-none-eabi
2929
- wasm32-unknown-unknown
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
@@ -38,6 +38,7 @@ jobs:
3838
- run: cargo build --target ${{ matrix.target }} --features zeroize
3939

4040
minimal-versions:
41+
if: false # TODO: temp disabled due to unpublished prerelease dependencies
4142
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
4243
with:
4344
working-directory: ${{ github.workflow }}
@@ -50,7 +51,7 @@ jobs:
5051
- 1.85.0 # MSRV
5152
- stable
5253
steps:
53-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@v5
5455
- uses: RustCrypto/actions/cargo-cache@master
5556
- uses: dtolnay/rust-toolchain@master
5657
with:

.github/workflows/workspace.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
clippy:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717
- uses: RustCrypto/actions/cargo-cache@master
1818
- uses: dtolnay/rust-toolchain@master
1919
with:
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout sources
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v5
2929
- name: Install stable toolchain
3030
uses: dtolnay/rust-toolchain@master
3131
with:

Cargo.lock

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

Cargo.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,11 @@ members = [
1010

1111
[profile.dev]
1212
opt-level = 2
13+
14+
[patch.crates-io]
15+
# https://github.com/RustCrypto/utils/pull/1187
16+
blobby = { git = "https://github.com/RustCrypto/utils" }
17+
# https://github.com/RustCrypto/traits/pull/1959
18+
cipher = { git = "https://github.com/RustCrypto/traits" }
19+
# https://github.com/RustCrypto/utils/pull/1201
20+
block-buffer = { git = "https://github.com/RustCrypto/utils" }

0 commit comments

Comments
 (0)