Skip to content

Commit

Permalink
ssh-key: bump elliptic curve and password hash deps; MSRV 1.65
Browse files Browse the repository at this point in the history
Bumps the following dependencies:

- `bcrypt-pbkdf` v0.10
- `dsa` v0.6
- `p256` v0.13
- `p384` v0.13
- `rand_core` v0.6.4 (for `CryptoRngCore`)
- `sec1` v0.7
  • Loading branch information
tarcieri committed Mar 5, 2023
1 parent 9694e79 commit a732c8a
Show file tree
Hide file tree
Showing 11 changed files with 99 additions and 69 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ssh-key.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
strategy:
matrix:
rust:
- 1.60.0 # MSRV
- 1.65.0 # MSRV
- stable
target:
- thumbv7em-none-eabi
Expand All @@ -80,7 +80,7 @@ jobs:
strategy:
matrix:
rust:
- 1.60.0 # MSRV
- 1.65.0 # MSRV
- stable
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.64.0
toolchain: 1.67.0
components: clippy
override: true
profile: minimal
Expand Down
120 changes: 75 additions & 45 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions ssh-key/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["authentication", "cryptography", "encoding", "no-std", "parser-im
keywords = ["crypto", "certificate", "openssh", "ssh", "sshsig"]
readme = "README.md"
edition = "2021"
rust-version = "1.60"
rust-version = "1.65"

[dependencies]
encoding = { package = "ssh-encoding", version = "0.1", features = ["base64", "pem", "sha2"], path = "../ssh-encoding" }
Expand All @@ -26,15 +26,15 @@ zeroize = { version = "1", default-features = false }
# optional dependencies
aes = { version = "0.8", optional = true, default-features = false }
ctr = { version = "0.9", optional = true, default-features = false }
bcrypt-pbkdf = { version = "0.9", optional = true, default-features = false }
bcrypt-pbkdf = { version = "0.10", optional = true, default-features = false, features = ["alloc"] }
bigint = { package = "num-bigint-dig", version = "0.8", optional = true, default-features = false }
dsa = { version = "0.5", optional = true, default-features = false }
dsa = { version = "0.6", optional = true, default-features = false }
ed25519-dalek = { version = "=2.0.0-pre.0", optional = true, default-features = false }
p256 = { version = "0.12", optional = true, default-features = false, features = ["ecdsa"] }
p384 = { version = "0.12", optional = true, default-features = false, features = ["ecdsa"] }
rand_core = { version = "0.6", optional = true, default-features = false }
p256 = { version = "0.13", optional = true, default-features = false, features = ["ecdsa"] }
p384 = { version = "0.13", optional = true, default-features = false, features = ["ecdsa"] }
rand_core = { version = "0.6.4", optional = true, default-features = false }
rsa = { version = "0.8", optional = true, default-features = false }
sec1 = { version = "0.3", optional = true, default-features = false, features = ["point"] }
sec1 = { version = "0.7", optional = true, default-features = false, features = ["point"] }
serde = { version = "1", optional = true }
sha1 = { version = "0.10", optional = true, default-features = false }

Expand Down
4 changes: 2 additions & 2 deletions ssh-key/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ functionality for a particular SSH key algorithm.

## Minimum Supported Rust Version

This crate requires **Rust 1.60** at a minimum.
This crate requires **Rust 1.65** at a minimum.

We may change the MSRV in the future, but it will be accompanied by a minor
version bump.
Expand All @@ -106,7 +106,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/ssh-key/badge.svg
[docs-link]: https://docs.rs/ssh-key/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.60+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.65+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/346919-SSH
[build-image]: https://github.com/RustCrypto/SSH/actions/workflows/ssh-key.yml/badge.svg
Expand Down
2 changes: 1 addition & 1 deletion ssh-key/src/certificate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ impl Certificate {
#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
pub fn read_file(path: &Path) -> Result<Self> {
let input = fs::read_to_string(path)?;
Self::from_openssh(&*input)
Self::from_openssh(&input)
}

/// Write OpenSSH certificate to a file.
Expand Down
Loading

0 comments on commit a732c8a

Please sign in to comment.