Add support for Ed448 signature verification and update dependencies

Author: stevefan1999-personal

Cargo.lock

@@ -44,6 +44,7 @@ signature = { version = "3.0.0-rc.3", default-features = false, optional = true
 typenum = { version = "1.18.0", features = ["no_std", "const-generics"] }
 x25519-dalek = { version = "3.0.0-pre.1", default-features = false, optional = true }
 x448 = { version = "0.14.0-pre.0", default-features = false, optional = true }
+ed448-goldilocks = { version = "0.14.0-pre.3", default-features = false, optional = true }
 
 # External groups
 pki-types = { package = "rustls-pki-types", version = "1.12.0", default-features = false }
@@ -84,9 +85,10 @@ tls12 = ["rustls/tls12"]
 
 # RustCrypto is preparing to migrate to core::error::Error
 # and in before most of the use case for std is just std::error::Error 
-std = ["alloc", "rustls/std"]
+std = ["alloc", "rustls/std", "ed448-goldilocks?/std"]
 alloc = [
     "ecdsa?/alloc",
+    "ed448-goldilocks?/alloc",
     "elliptic-curve?/alloc",
     "pkcs8?/alloc",
     "sec1?/alloc",
@@ -113,6 +115,7 @@ p256 = ["dep:p256", "nist", "p256/pkcs8"]
 p384 = ["dep:p384", "nist", "p384/pkcs8"]
 p521 = ["dep:p521", "nist"]
 ed25519 = ["dep:ed25519-dalek"]
+ed448 = ["dep:ed448-goldilocks"]
 
 ecdsa = ["dep:ecdsa", "verify", "signature", "rand", "der", "elliptic-curve"]
 ecdsa-p256 = ["ecdsa", "p256", "p256/ecdsa"]
@@ -122,7 +125,8 @@ ecdsa-full = ["ecdsa-p256", "ecdsa-p384", "ecdsa-p521"]
 
 eddsa = ["verify", "signature", "elliptic-curve"]
 eddsa-ed25519 = ["eddsa", "ed25519"]
-eddsa-full = ["eddsa-ed25519"]
+eddsa-ed448 = ["eddsa", "ed448"]
+eddsa-full = ["eddsa-ed25519", "eddsa-ed448"]
 
 kx = ["rand", "elliptic-curve"]
 kx-x448 = ["kx", "x448"]
@@ -150,6 +154,7 @@ sign-ecdsa-p384 = ["sign-ecdsa-nist", "ecdsa-p384"]
 sign-ecdsa-p521 = ["sign-ecdsa-nist", "ecdsa-p521"]
 sign-eddsa = ["sign"]
 sign-eddsa-ed25519 = ["sign-eddsa", "eddsa-ed25519"]
+sign-eddsa-ed448 = ["sign-eddsa", "eddsa-ed448", "ed448-goldilocks?/signing"]
 sign-rsa = ["sign", "rsa"]
 sign-rsa-pkcs1 = ["sign-rsa", "rsa-pkcs1"]
 sign-rsa-pss = ["sign-rsa", "rsa-pss"]
@@ -158,6 +163,7 @@ sign-full = [
     "sign-ecdsa-p384",
     "sign-ecdsa-p521",
     "sign-eddsa-ed25519",
+    "sign-eddsa-ed448",
     "sign-rsa-pkcs1",
     "sign-rsa-pss",
 ]
@@ -178,6 +184,7 @@ verify-ecdsa-p521-sha384 = ["verify-ecdsa-p521", "hash-sha384"]
 verify-ecdsa-p521-sha512 = ["verify-ecdsa-p521", "hash-sha512"]
 verify-eddsa = ["verify"]
 verify-eddsa-ed25519 = ["verify-eddsa", "eddsa-ed25519"]
+verify-eddsa-ed448 = ["verify-eddsa", "eddsa-ed448"]
 verify-rsa = ["verify"]
 verify-rsa-pkcs1 = ["verify-rsa", "rsa-pkcs1"]
 verify-rsa-pkcs1-sha256 = ["verify-rsa-pkcs1", "hash-sha256"]
@@ -198,6 +205,7 @@ verify-full = [
     "verify-ecdsa-p521-sha384",
     "verify-ecdsa-p521-sha512",
     "verify-eddsa-ed25519",
+    "verify-eddsa-ed448",
     "verify-rsa-pkcs1-sha256",
     "verify-rsa-pkcs1-sha384",
     "verify-rsa-pkcs1-sha512",
@@ -216,12 +224,13 @@ hash-full = ["hash-sha224", "hash-sha256", "hash-sha384", "hash-sha512"]
 # Formats
 der = ["dep:der", "sec1?/der"]
 sec1 = ["dep:sec1", "elliptic-curve?/sec1"]
-pem = ["elliptic-curve?/pem", "ecdsa?/pem"]
+pem = ["elliptic-curve?/pem", "ecdsa?/pem", "ed25519-dalek?/pem"]
 pkcs1 = ["dep:pkcs1", "rsa?/encoding"]
 pkcs8 = [
     "dep:pkcs8",
     "ecdsa?/pkcs8",
     "ed25519-dalek?/pkcs8",
+    "ed448-goldilocks?/pkcs8",
     "elliptic-curve?/pkcs8",
     "p256?/pkcs8",
     "p384?/pkcs8",

Cargo.toml

@@ -211,6 +211,8 @@ pub const ALGORITHMS: WebPkiSupportedAlgorithms = WebPkiSupportedAlgorithms {
             &[
                 #[cfg(feature = "eddsa-ed25519")]
                 eddsa::ed25519::ED25519,
+                // #[cfg(feature = "eddsa-ed448")]
+                // eddsa::ed448::ED448,
             ]
         }
 

src/verify.rs

@@ -1,2 +1,5 @@
-#[cfg(feature = "verify-eddsa-ed25519")]
-pub mod ed25519;
+#[cfg(feature = "verify-eddsa-ed25519")]
+pub mod ed25519;
+
+#[cfg(feature = "verify-eddsa-ed448")]
+pub mod ed448;

src/verify/eddsa.rs

@@ -0,0 +1,41 @@
+use ed448_goldilocks::{Signature, VerifyingKey};
+use pki_types::{AlgorithmIdentifier, InvalidSignature, SignatureVerificationAlgorithm};
+use signature::Verifier;
+
+#[derive(Debug)]
+pub struct Ed448Verify;
+
+impl Ed448Verify {
+    fn verify_inner(
+        public_key: &[u8],
+        message: &[u8],
+        signature: &[u8],
+    ) -> Result<(), crate::verify::Error> {
+        let public_key = public_key.try_into()?;
+        let signature = Signature::from_slice(signature)?;
+        let verifying_key = VerifyingKey::from_bytes(public_key)?;
+        verifying_key.verify(message, &signature)?;
+        Ok(())
+    }
+}
+
+impl SignatureVerificationAlgorithm for Ed448Verify {
+    fn public_key_alg_id(&self) -> AlgorithmIdentifier {
+        todo!()
+    }
+
+    fn signature_alg_id(&self) -> AlgorithmIdentifier {
+        todo!()
+    }
+
+    fn verify_signature(
+        &self,
+        public_key: &[u8],
+        message: &[u8],
+        signature: &[u8],
+    ) -> Result<(), InvalidSignature> {
+        Self::verify_inner(public_key, message, signature).map_err(|_| InvalidSignature)
+    }
+}
+
+pub const ED448: &dyn SignatureVerificationAlgorithm = &Ed448Verify;