Series of changes from wire.com

Cargo.toml

@@ -17,6 +17,8 @@ debug = true
 cms        = { git = "https://github.com/RustCrypto/formats.git" }
 x509-ocsp  = { git = "https://github.com/RustCrypto/formats.git" }
 x509-cert  = { git = "https://github.com/RustCrypto/formats.git" }
+# FIXME: https://github.com/dalek-cryptography/curve25519-dalek/pull/676
+ed25519-dalek = { git = "https://github.com/dalek-cryptography/curve25519-dalek.git", branch = "rustcrypto-new-releases" }
 
 [patch.'https://github.com/carl-wallace/pqckeys']
 pqckeys = { git = "https://github.com/baloo/pqckeys.git", branch = "baloo/pre-releases" }

certval/Cargo.toml

@@ -30,9 +30,11 @@ pem-rfc7468 = { version="1.0.0-pre.0", features = ["alloc"]}
 pkiprocmacros = { path = "../pkiprocmacros"}
 
 ecdsa = {version = "0.17.0-pre.7", default-features = false, features = ["der"]}
-p256 = {version = "0.14.0-pre.1", default-features = false, features = ["ecdsa", "ecdsa-core"]}
+p256 = {version = "0.14.0-pre.1", default-features = false, features = ["ecdsa"]}
 p384 = {version = "0.14.0-pre.1", default-features = false, features = ["ecdsa"]}
-rsa = {version = "0.10.0-pre.2", default-features = false}
+p521 = {version = "0.14.0-pre.1", default-features = false, features = ["ecdsa"]}
+ed25519-dalek = { version = "2.2.0-pre", default-features = false, features = ["fast", "zeroize", "pkcs8"] }
+rsa = {version = "0.10.0-pre.2", default-features = false, optional=true}
 sha1 = {version = "0.11.0-pre.4", default-features = false}
 sha2 = {version = "0.11.0-pre.4", default-features = false, features = ["oid"] }
 
@@ -51,7 +53,6 @@ log = {version = "0.4.20", default-features = false}
 ndarray = {version = "0.15.6", optional = true, default-features = false}
 reqwest = { version = "0.11.22", features = ["blocking"], optional = true}
 serde_json = {version = "1.0.108", optional = true, default-features = false, features = ["alloc"] }
-tokio = { version = "1.33.0", features = ["full", "time", "rt-multi-thread"], optional = true }
 url = {version = "2.4.1", optional = true}
 walkdir = { version = "2.4.0", optional = true}
 
@@ -72,6 +73,9 @@ webpki-roots = {version = "0.25.1", optional = true}
 tempfile = "3.8.1"
 hex-literal = "0.4.1"
 tokio-test = "0.4.2"
+pretty_env_logger = "0.5"
+tokio = { version = "1.33.0", features = ["full", "macros", "time", "rt-multi-thread"] }
+
 
 # There are five feature gates:
 #   - no-default-features (i.e., no-std) provides full path validation without file system support, network or thread safety (and no revocation support)
@@ -83,11 +87,12 @@ tokio-test = "0.4.2"
 # webpki can be paired with any other feature and simply adds a means of initializing a TaSource from the webpki-roots crate
 [features]
 default = ["remote", "webpki"]
-revocation = ["ndarray"]
-std = ["ndarray", "tokio", "base64ct", "walkdir", "url", "serde_json", "serde/rc",  "flagset/serde", "regex", "lazy_static/spin", "bitvec", "cidr", "der/std"]
+revocation = ["dep:ndarray", "serde/std", "serde/rc", "dep:url", "dep:regex"]
+std = ["dep:ndarray", "dep:base64ct", "dep:walkdir", "ed25519-dalek/std", "dep:url", "dep:serde_json", "serde/rc",  "flagset/serde", "dep:regex", "lazy_static/spin", "dep:bitvec", "dep:cidr", "der/std"]
 remote = ["revocation", "std", "reqwest", "lazy_static/spin"]
 pqc = ["pqcrypto-internals", "pqcrypto-dilithium", "pqcrypto-falcon", "pqcrypto-sphincsplus", "pqcrypto", "pqcrypto-traits", "pqckeys"]
 webpki = ["webpki-roots"]
+rsa = ["dep:rsa"]
 
 [package.metadata.docs.rs]
 all-features = true