Skip to content

Commit d2563f8

Browse files
committed
ssh-key: temporarily remove ed25519 feature
This makes it possible to publish a prerelease, which we otherwise can't do since we're sourcing `ed25519-dalek` from this git branch: dalek-cryptography/curve25519-dalek#676 This commit can be reverted immediately after we publish a crate release.
1 parent 0fa00bf commit d2563f8

File tree

7 files changed

+8
-70
lines changed

7 files changed

+8
-70
lines changed

Cargo.lock

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

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ opt-level = 2
1313

1414
[patch.crates-io]
1515
# https://github.com/dalek-cryptography/curve25519-dalek/pull/676
16-
ed25519-dalek = { git = "https://github.com/dalek-cryptography/curve25519-dalek.git", branch = "rustcrypto-new-releases" }
16+
#ed25519-dalek = { git = "https://github.com/dalek-cryptography/curve25519-dalek.git", branch = "rustcrypto-new-releases" }

ssh-key/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ zeroize = { version = "1", default-features = false }
2929
bcrypt-pbkdf = { version = "=0.11.0-pre.1", optional = true, default-features = false, features = ["alloc"] }
3030
bigint = { package = "num-bigint-dig", version = "0.8", optional = true, default-features = false }
3131
dsa = { version = "=0.7.0-pre.0", optional = true, default-features = false }
32-
ed25519-dalek = { version = "=2.2.0-pre", optional = true, default-features = false }
32+
#ed25519-dalek = { version = "=2.2.0-pre", optional = true, default-features = false }
3333
p256 = { version = "=0.14.0-pre.1", optional = true, default-features = false, features = ["ecdsa"] }
3434
p384 = { version = "=0.14.0-pre.1", optional = true, default-features = false, features = ["ecdsa"] }
3535
p521 = { version = "=0.14.0-pre.1", optional = true, default-features = false, features = ["ecdsa"] }
@@ -61,10 +61,10 @@ std = [
6161
"signature/std"
6262
]
6363

64-
crypto = ["ed25519", "p256", "p384", "p521", "rsa"] # NOTE: `dsa` is obsolete/weak
64+
crypto = ["p256", "p384", "p521", "rsa"] # ... "ed25519"] NOTE: `dsa` is obsolete/weak
6565
dsa = ["dep:bigint", "dep:dsa", "dep:sha1", "alloc", "signature/rand_core"]
6666
ecdsa = ["dep:sec1"]
67-
ed25519 = ["dep:ed25519-dalek", "rand_core"]
67+
#ed25519 = ["dep:ed25519-dalek", "rand_core"]
6868
encryption = [
6969
"dep:bcrypt-pbkdf",
7070
"alloc",

ssh-key/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
66
html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg"
77
)]
8+
#![allow(unexpected_cfgs)] // `ed25519` is temporarily disabled
89
#![forbid(unsafe_code)]
910
#![warn(
1011
clippy::alloc_instead_of_core,

ssh-key/tests/certificate.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//! OpenSSH certificate tests.
22
33
#![cfg(feature = "alloc")]
4+
#![allow(unexpected_cfgs)] // `ed25519` is temporarily disabled
45

56
use hex_literal::hex;
67
use ssh_key::{Algorithm, Certificate};

ssh-key/tests/certificate_builder.rs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
feature = "rand_core",
66
any(feature = "ed25519", feature = "p256")
77
))]
8+
#![allow(unexpected_cfgs)] // `ed25519` is temporarily disabled
89

910
use hex_literal::hex;
1011
use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};

ssh-key/tests/sshsig.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//! `sshsig` signature tests.
22
33
#![cfg(feature = "alloc")]
4+
#![allow(unexpected_cfgs)] // `ed25519` is temporarily disabled
45

56
use hex_literal::hex;
67
use ssh_key::{Algorithm, HashAlg, LineEnding, PublicKey, SshSig};

0 commit comments

Comments
 (0)