Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
166 changes: 86 additions & 80 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ ssh-cipher = { path = "./ssh-cipher" }
ssh-derive = { path = "./ssh-derive" }
ssh-encoding = { path = "./ssh-encoding" }
ssh-key = { path = "./ssh-key" }

curve25519-dalek = { git = "https://github.com/dalek-cryptography/curve25519-dalek" }
16 changes: 8 additions & 8 deletions ssh-cipher/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ cipher = "0.5.0-rc.6"
encoding = { package = "ssh-encoding", version = "0.3.0-rc.6" }

# optional dependencies
aead = { version = "0.6.0-rc.8", optional = true, default-features = false }
aes = { version = "0.9.0-rc.2", optional = true, default-features = false }
aes-gcm = { version = "0.11.0-rc.2", optional = true, default-features = false, features = ["aes"] }
cbc = { version = "0.2.0-rc.2", optional = true }
ctr = { version = "0.10.0-rc.2", optional = true, default-features = false }
chacha20 = { version = "0.10.0-rc.9", optional = true, default-features = false, features = ["cipher", "legacy"] }
des = { version = "0.9.0-rc.2", optional = true, default-features = false }
poly1305 = { version = "0.9.0-rc.3", optional = true, default-features = false }
aead = { version = "0.6.0-rc.10", optional = true, default-features = false }
aes = { version = "0.9.0-rc.4", optional = true, default-features = false }
aes-gcm = { version = "0.11.0-rc.3", optional = true, default-features = false, features = ["aes"] }
cbc = { version = "0.2.0-rc.3", optional = true }
ctr = { version = "0.10.0-rc.3", optional = true, default-features = false }
chacha20 = { version = "0.10.0-rc.10", optional = true, default-features = false, features = ["cipher", "legacy"] }
des = { version = "0.9.0-rc.3", optional = true, default-features = false }
poly1305 = { version = "0.9.0-rc.5", optional = true, default-features = false }
subtle = { version = "2", optional = true, default-features = false }
zeroize = { version = "1", optional = true, default-features = false }

Expand Down
4 changes: 2 additions & 2 deletions ssh-encoding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ rust-version = "1.85"

[dependencies]
base64ct = { version = "1.8", optional = true }
bigint = { package = "crypto-bigint", version = "0.7.0-rc.22", optional = true, default-features = false, features = ["alloc"] }
bigint = { package = "crypto-bigint", version = "0.7.0-rc.25", optional = true, default-features = false, features = ["alloc"] }
bytes = { version = "1", optional = true, default-features = false }
digest = { version = "0.11.0-rc.9", optional = true, default-features = false }
digest = { version = "0.11.0-rc.11", optional = true, default-features = false }
pem-rfc7468 = { version = "1", optional = true }
ssh-derive = { version = "0.3.0-rc.0", optional = true }
subtle = { version = "2", optional = true, default-features = false }
Expand Down
26 changes: 13 additions & 13 deletions ssh-key/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,30 @@ package = "ssh-encoding"
features = ["base64", "digest", "pem", "subtle", "zeroize"]

[dependencies]
sha2 = { version = "0.11.0-rc.4", default-features = false }
signature = { version = "3.0.0-rc.9", default-features = false }
sha2 = { version = "0.11.0-rc.5", default-features = false }
signature = { version = "3.0.0-rc.10", default-features = false }
subtle = { version = "2", default-features = false }
zeroize = { version = "1", default-features = false }

# optional dependencies
argon2 = { version = "0.6.0-rc.6", optional = true, default-features = false, features = ["alloc"] }
bcrypt-pbkdf = { version = "0.11.0-rc.3", optional = true, default-features = false, features = ["alloc"] }
dsa = { version = "0.7.0-rc.11", optional = true, default-features = false, features = ["hazmat"] }
argon2 = { version = "0.6.0-rc.7", optional = true, default-features = false, features = ["alloc"] }
bcrypt-pbkdf = { version = "0.11.0-rc.6", optional = true, default-features = false, features = ["alloc"] }
dsa = { version = "0.7.0-rc.12", optional = true, default-features = false, features = ["hazmat"] }
ed25519-dalek = { version = "=3.0.0-pre.5", optional = true, default-features = false }
hex = { version = "0.4", optional = true, default-features = false, features = ["alloc"] }
hmac = { version = "0.13.0-rc.4", optional = true }
p256 = { version = "0.14.0-rc.6", optional = true, default-features = false, features = ["ecdsa"] }
p384 = { version = "0.14.0-rc.6", optional = true, default-features = false, features = ["ecdsa"] }
p521 = { version = "0.14.0-rc.6", optional = true, default-features = false, features = ["ecdsa"] }
rand_core = { version = "0.10.0-rc-6", optional = true, default-features = false }
rsa = { version = "0.10.0-rc.14", optional = true, default-features = false, features = ["sha2"] }
hmac = { version = "0.13.0-rc.5", optional = true }
p256 = { version = "0.14.0-rc.7", optional = true, default-features = false, features = ["ecdsa"] }
p384 = { version = "0.14.0-rc.7", optional = true, default-features = false, features = ["ecdsa"] }
p521 = { version = "0.14.0-rc.7", optional = true, default-features = false, features = ["ecdsa"] }
rand_core = { version = "0.10", optional = true, default-features = false }
rsa = { version = "0.10.0-rc.15", optional = true, default-features = false, features = ["sha2"] }
sec1 = { version = "0.8.0-rc.13", optional = true, default-features = false, features = ["point"] }
serde = { version = "1.0.16", optional = true }
sha1 = { version = "0.11.0-rc.4", optional = true, default-features = false, features = ["oid"] }
sha1 = { version = "0.11.0-rc.5", optional = true, default-features = false, features = ["oid"] }

[dev-dependencies]
hex-literal = "1"
chacha20 = { version = "0.10.0-rc.9", features = ["rng"] }
chacha20 = { version = "0.10.0-rc.10", features = ["rng"] }

[features]
default = ["ecdsa", "rand_core", "std"]
Expand Down
2 changes: 1 addition & 1 deletion ssh-key/src/private/ecdsa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use rand_core::CryptoRng;
feature = "rand_core",
any(feature = "p256", feature = "p384", feature = "p521")
))]
use cipher::cipher::crypto_common::Generate;
use cipher::cipher::common::Generate;

/// Elliptic Curve Digital Signature Algorithm (ECDSA) private key.
#[derive(Clone)]
Expand Down
5 changes: 2 additions & 3 deletions ssh-key/src/public/ecdsa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,7 @@ macro_rules! impl_ecdsa_for_curve {
fn try_from(public_key: &EcdsaPublicKey) -> Result<$krate::ecdsa::VerifyingKey> {
match public_key {
EcdsaPublicKey::$curve(key) => {
$krate::ecdsa::VerifyingKey::from_encoded_point(key)
.map_err(|_| Error::Crypto)
$krate::ecdsa::VerifyingKey::from_sec1_point(key).map_err(|_| Error::Crypto)
}
_ => Err(Error::AlgorithmUnknown),
}
Expand All @@ -191,7 +190,7 @@ macro_rules! impl_ecdsa_for_curve {
#[cfg(feature = $feature)]
impl From<&$krate::ecdsa::VerifyingKey> for EcdsaPublicKey {
fn from(key: &$krate::ecdsa::VerifyingKey) -> EcdsaPublicKey {
EcdsaPublicKey::$curve(key.to_encoded_point(false))
EcdsaPublicKey::$curve(key.to_sec1_point(false))
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion ssh-key/src/signature.rs
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ impl Verifier<Signature> for public::SkEcdsaSha2NistP256 {
fn verify(&self, message: &[u8], signature: &Signature) -> signature::Result<()> {
let (signature_bytes, flags_and_counter) = split_sk_signature(signature)?;
let signature = p256_signature_from_openssh_bytes(signature_bytes)?;
p256::ecdsa::VerifyingKey::from_encoded_point(self.ec_point())?.verify(
p256::ecdsa::VerifyingKey::from_sec1_point(self.ec_point())?.verify(
&make_sk_signed_data(self.application(), flags_and_counter, message),
&signature,
)
Expand Down