Skip to content

Commit ac72edc

Browse files
committed
Migrate to rsa 0.6 and pre-release of chacha20poly1305
This brings us onto Rust Crypto crates with MSRV 1.56 or lower.
1 parent 8032c75 commit ac72edc

File tree

5 files changed

+52
-74
lines changed

5 files changed

+52
-74
lines changed

Cargo.lock

+47-68
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

age-core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ maintenance = { status = "experimental" }
2121
base64 = "0.13"
2222

2323
# - ChaCha20-Poly1305 from RFC 7539
24-
chacha20poly1305 = { version = "0.9", default-features = false, features = ["alloc"] }
24+
chacha20poly1305 = { version = "0.10.0-pre", default-features = false, features = ["alloc"] }
2525

2626
# - HKDF from RFC 5869 with SHA-256
2727
hkdf = "0.12"

age/Cargo.toml

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ age-core = { version = "0.7.1", path = "../age-core" }
2121
base64 = "0.13"
2222

2323
# - ChaCha20-Poly1305 from RFC 7539
24-
chacha20poly1305 = { version = "0.9", default-features = false, features = ["alloc"] }
24+
chacha20poly1305 = { version = "0.10.0-pre", default-features = false, features = ["alloc"] }
2525

2626
# - X25519 from RFC 7748
2727
x25519-dalek = "1"
@@ -45,8 +45,7 @@ bech32 = "0.8"
4545
# OpenSSH-specific dependencies:
4646
# - RSAES-OAEP from RFC 8017 with SHA-256 and MGF1
4747
num-traits = { version = "0.2", optional = true }
48-
rsa = { version = "0.5", optional = true }
49-
sha2_09 = { package = "sha2", version = "0.9" }
48+
rsa = { version = "0.6", optional = true }
5049

5150
# - Conversion of public keys from Ed25519 to X25519
5251
curve25519-dalek = { version = "3", optional = true }

age/src/ssh/identity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use nom::{
1414
};
1515
use rand::rngs::OsRng;
1616
use rsa::padding::PaddingScheme;
17-
use sha2_09::{Digest, Sha256, Sha512};
17+
use sha2::{Digest, Sha256, Sha512};
1818
use std::fmt;
1919
use std::io;
2020
use x25519_dalek::{PublicKey as X25519PublicKey, StaticSecret};

0 commit comments

Comments
 (0)