Skip to content

Commit 4b63ec3

Browse files
tarcieritarcieri
authored
Bump cipher to v0.5.0-pre.1; MSRV 1.65 (#338)
This also bumps all of the crate versions to prereleases to denote the breaking change, however they will not have associated releases. The main change in this prerelease of `cipher` is a migration from `generic-array` to `hybrid-array`.
1 parent a8463f2 commit 4b63ec3

File tree

28 files changed

+158
-141
lines changed

28 files changed

+158
-141
lines changed

‎.github/workflows/chacha20.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
matrix:
2727
rust:
28-
- 1.56.0 # MSRV
28+
- 1.65.0 # MSRV
2929
- stable
3030
target:
3131
- thumbv7em-none-eabi
@@ -53,15 +53,15 @@ jobs:
5353
include:
5454
# 32-bit Linux
5555
- target: i686-unknown-linux-gnu
56-
rust: 1.56.0 # MSRV
56+
rust: 1.65.0 # MSRV
5757
deps: sudo apt update && sudo apt install gcc-multilib
5858
- target: i686-unknown-linux-gnu
5959
rust: stable
6060
deps: sudo apt update && sudo apt install gcc-multilib
6161

6262
# 64-bit Linux
6363
- target: x86_64-unknown-linux-gnu
64-
rust: 1.56.0 # MSRV
64+
rust: 1.65.0 # MSRV
6565
- target: x86_64-unknown-linux-gnu
6666
rust: stable
6767
steps:
@@ -86,15 +86,15 @@ jobs:
8686
include:
8787
# 32-bit Linux
8888
- target: i686-unknown-linux-gnu
89-
rust: 1.56.0 # MSRV
89+
rust: 1.65.0 # MSRV
9090
deps: sudo apt update && sudo apt install gcc-multilib
9191
- target: i686-unknown-linux-gnu
9292
rust: stable
9393
deps: sudo apt update && sudo apt install gcc-multilib
9494

9595
# 64-bit Linux
9696
- target: x86_64-unknown-linux-gnu
97-
rust: 1.56.0 # MSRV
97+
rust: 1.65.0 # MSRV
9898
- target: x86_64-unknown-linux-gnu
9999
rust: stable
100100
steps:
@@ -119,15 +119,15 @@ jobs:
119119
include:
120120
# 32-bit Linux
121121
- target: i686-unknown-linux-gnu
122-
rust: 1.56.0 # MSRV
122+
rust: 1.65.0 # MSRV
123123
deps: sudo apt update && sudo apt install gcc-multilib
124124
- target: i686-unknown-linux-gnu
125125
rust: stable
126126
deps: sudo apt update && sudo apt install gcc-multilib
127127

128128
# 64-bit Linux
129129
- target: x86_64-unknown-linux-gnu
130-
rust: 1.56.0 # MSRV
130+
rust: 1.65.0 # MSRV
131131
- target: x86_64-unknown-linux-gnu
132132
rust: stable
133133
steps:
@@ -152,15 +152,15 @@ jobs:
152152
include:
153153
# 32-bit Linux
154154
- target: i686-unknown-linux-gnu
155-
rust: 1.56.0 # MSRV
155+
rust: 1.65.0 # MSRV
156156
deps: sudo apt update && sudo apt install gcc-multilib
157157
- target: i686-unknown-linux-gnu
158158
rust: stable
159159
deps: sudo apt update && sudo apt install gcc-multilib
160160

161161
# 64-bit Linux
162162
- target: x86_64-unknown-linux-gnu
163-
rust: 1.56.0 # MSRV
163+
rust: 1.65.0 # MSRV
164164
- target: x86_64-unknown-linux-gnu
165165
rust: stable
166166
steps:
@@ -182,7 +182,7 @@ jobs:
182182
include:
183183
# ARM64
184184
- target: aarch64-unknown-linux-gnu
185-
rust: 1.56.0 # MSRV
185+
rust: 1.65.0 # MSRV
186186
- target: aarch64-unknown-linux-gnu
187187
rust: stable
188188

@@ -193,7 +193,7 @@ jobs:
193193

194194
# PPC32
195195
- target: powerpc-unknown-linux-gnu
196-
rust: 1.56.0 # MSRV
196+
rust: 1.65.0 # MSRV
197197
- target: powerpc-unknown-linux-gnu
198198
rust: stable
199199

‎.github/workflows/hc-256.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
rust:
25-
- 1.56.0 # MSRV
25+
- 1.65.0 # MSRV
2626
- stable
2727
target:
2828
- thumbv7em-none-eabi
@@ -48,7 +48,7 @@ jobs:
4848
strategy:
4949
matrix:
5050
rust:
51-
- 1.56.0 # MSRV
51+
- 1.65.0 # MSRV
5252
- stable
5353
steps:
5454
- uses: actions/checkout@v4

‎.github/workflows/rabbit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
rust:
25-
- 1.56.0 # MSRV
25+
- 1.65.0 # MSRV
2626
- stable
2727
target:
2828
- thumbv7em-none-eabi
@@ -47,7 +47,7 @@ jobs:
4747
strategy:
4848
matrix:
4949
rust:
50-
- 1.56.0 # MSRV
50+
- 1.65.0 # MSRV
5151
- stable
5252
steps:
5353
- uses: actions/checkout@v4

‎.github/workflows/rc4.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
rust:
25-
- 1.56.0 # MSRV
25+
- 1.65.0 # MSRV
2626
- stable
2727
target:
2828
- thumbv7em-none-eabi
@@ -47,7 +47,7 @@ jobs:
4747
strategy:
4848
matrix:
4949
rust:
50-
- 1.56.0 # MSRV
50+
- 1.65.0 # MSRV
5151
- stable
5252
steps:
5353
- uses: actions/checkout@v4

‎.github/workflows/salsa20.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
rust:
25-
- 1.56.0 # MSRV
25+
- 1.65.0 # MSRV
2626
- stable
2727
target:
2828
- thumbv7em-none-eabi
@@ -47,7 +47,7 @@ jobs:
4747
strategy:
4848
matrix:
4949
rust:
50-
- 1.56.0 # MSRV
50+
- 1.65.0 # MSRV
5151
- stable
5252
steps:
5353
- uses: actions/checkout@v4

‎Cargo.lock

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

‎Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[workspace]
2+
resolver = "2"
23
members = [
34
"chacha20",
45
"hc-256",

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ received any formal cryptographic and security reviews/audits.
2121
## Crates
2222
| Name | Crate name | Crates.io | Docs | MSRV | Security |
2323
|----------|------------|-----------|------|------|----------|
24-
| [ChaCha] | [`chacha20`] | [![crates.io](https://img.shields.io/crates/v/chacha20.svg)](https://crates.io/crates/chacha20) | [![Documentation](https://docs.rs/chacha20/badge.svg)](https://docs.rs/chacha20) | ![MSRV 1.56][msrv-1.56] | 💚 |
25-
| [HC-256] | [`hc-256`] | [![crates.io](https://img.shields.io/crates/v/hc-256.svg)](https://crates.io/crates/hc-256) | [![Documentation](https://docs.rs/hc-256/badge.svg)](https://docs.rs/hc-256) | ![MSRV 1.56][msrv-1.56] | [💛](https://link.springer.com/chapter/10.1007/978-3-642-04846-3_4) |
26-
| [Rabbit] | [`rabbit`] | [![crates.io](https://img.shields.io/crates/v/rabbit.svg)](https://crates.io/crates/rabbit) | [![Documentation](https://docs.rs/rabbit/badge.svg)](https://docs.rs/rabbit) | ![MSRV 1.56][msrv-1.56] | [💛](https://eprint.iacr.org/2013/780.pdf) |
27-
| [RC4] | [`rc4`] | [![crates.io](https://img.shields.io/crates/v/rc4.svg)](https://crates.io/crates/rc4) | [![Documentation](https://docs.rs/rc4/badge.svg)](https://docs.rs/rc4) | ![MSRV 1.56][msrv-1.56] | [💔](https://www.usenix.org/system/files/conference/usenixsecurity13/sec13-paper_alfardan.pdf) |
28-
| [Salsa20] | [`salsa20`] | [![crates.io](https://img.shields.io/crates/v/salsa20.svg)](https://crates.io/crates/salsa20) | [![Documentation](https://docs.rs/salsa20/badge.svg)](https://docs.rs/salsa20) | ![MSRV 1.56][msrv-1.56] | 💚 |
24+
| [ChaCha] | [`chacha20`] | [![crates.io](https://img.shields.io/crates/v/chacha20.svg)](https://crates.io/crates/chacha20) | [![Documentation](https://docs.rs/chacha20/badge.svg)](https://docs.rs/chacha20) | ![MSRV 1.65][msrv-1.65] | 💚 |
25+
| [HC-256] | [`hc-256`] | [![crates.io](https://img.shields.io/crates/v/hc-256.svg)](https://crates.io/crates/hc-256) | [![Documentation](https://docs.rs/hc-256/badge.svg)](https://docs.rs/hc-256) | ![MSRV 1.65][msrv-1.65] | [💛](https://link.springer.com/chapter/10.1007/978-3-642-04846-3_4) |
26+
| [Rabbit] | [`rabbit`] | [![crates.io](https://img.shields.io/crates/v/rabbit.svg)](https://crates.io/crates/rabbit) | [![Documentation](https://docs.rs/rabbit/badge.svg)](https://docs.rs/rabbit) | ![MSRV 1.65][msrv-1.65] | [💛](https://eprint.iacr.org/2013/780.pdf) |
27+
| [RC4] | [`rc4`] | [![crates.io](https://img.shields.io/crates/v/rc4.svg)](https://crates.io/crates/rc4) | [![Documentation](https://docs.rs/rc4/badge.svg)](https://docs.rs/rc4) | ![MSRV 1.65][msrv-1.65] | [💔](https://www.usenix.org/system/files/conference/usenixsecurity13/sec13-paper_alfardan.pdf) |
28+
| [Salsa20] | [`salsa20`] | [![crates.io](https://img.shields.io/crates/v/salsa20.svg)](https://crates.io/crates/salsa20) | [![Documentation](https://docs.rs/salsa20/badge.svg)](https://docs.rs/salsa20) | ![MSRV 1.65][msrv-1.65] | 💚 |
2929

3030
### Security Level Legend
3131

@@ -107,7 +107,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
107107
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
108108
[hazmat-image]: https://img.shields.io/badge/crypto-hazmat%E2%9A%A0-red.svg
109109
[hazmat-link]: https://github.com/RustCrypto/meta/blob/master/HAZMAT.md
110-
[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg
110+
[msrv-1.65]: https://img.shields.io/badge/rustc-1.65.0+-blue.svg
111111

112112
[//]: # (footnotes)
113113

‎benches/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.0.0"
44
authors = ["RustCrypto Developers"]
55
license = "Apache-2.0 OR MIT"
66
description = "Criterion benchmarks of the stream-cipher crates"
7-
edition = "2018"
7+
edition = "2021"
88
publish = false
99

1010
[workspace]

0 commit comments

Comments
 (0)