move signing to Signer trait

unavi-xyz · Oct 24, 2024 · 2bafea1 · 2bafea1
1 parent 1baf7ef
commit 2bafea1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/crates/xdid-method-key/src/keys/ed25519.rs b/crates/xdid-method-key/src/keys/ed25519.rs
@@ -1,7 +1,7 @@
 use jose_jwk::Jwk;
 use ring::{rand::SystemRandom, signature::KeyPair};
 
-use super::{DidKeyPair, KeyParser, Multicodec, PublicKey, SignError, WithMulticodec};
+use super::{DidKeyPair, KeyParser, Multicodec, PublicKey, SignError, Signer, WithMulticodec};
 
 pub struct Ed25519KeyPair {
     pair: ring::signature::Ed25519KeyPair,
@@ -24,7 +24,9 @@ impl DidKeyPair for Ed25519KeyPair {
     fn secret_bytes(&self) -> Box<[u8]> {
         todo!();
     }
+}
 
+impl Signer for Ed25519KeyPair {
     fn sign(&self, message: &[u8]) -> Result<Vec<u8>, SignError> {
         Ok(self.pair.sign(message).as_ref().to_vec())
     }

diff --git a/crates/xdid-method-key/src/keys/mod.rs b/crates/xdid-method-key/src/keys/mod.rs
@@ -14,7 +14,11 @@ pub mod p384;
 #[cfg(feature = "p521")]
 pub mod p521;
 
-pub trait DidKeyPair {
+pub trait Signer {
+    fn sign(&self, message: &[u8]) -> Result<Vec<u8>, SignError>;
+}
+
+pub trait DidKeyPair: Signer {
     /// Generate a new pair of keys.
     fn generate() -> Self;
 
@@ -24,8 +28,6 @@ pub trait DidKeyPair {
     fn public_bytes(&self) -> Box<[u8]>;
     /// Raw secret key bytes.
     fn secret_bytes(&self) -> Box<[u8]>;
-
-    fn sign(&self, message: &[u8]) -> Result<Vec<u8>, SignError>;
 }
 
 #[derive(Error, Debug)]

diff --git a/crates/xdid-method-key/src/keys/p256.rs b/crates/xdid-method-key/src/keys/p256.rs
@@ -9,7 +9,7 @@ use ring::{
     signature::{EcdsaKeyPair, ECDSA_P256_SHA256_ASN1_SIGNING},
 };
 
-use super::{DidKeyPair, KeyParser, Multicodec, PublicKey, SignError, WithMulticodec};
+use super::{DidKeyPair, KeyParser, Multicodec, PublicKey, SignError, Signer, WithMulticodec};
 
 pub struct P256KeyPair(SecretKey);
 
@@ -29,7 +29,9 @@ impl DidKeyPair for P256KeyPair {
     fn secret_bytes(&self) -> Box<[u8]> {
         self.0.to_bytes().to_vec().into()
     }
+}
 
+impl Signer for P256KeyPair {
     fn sign(&self, message: &[u8]) -> Result<Vec<u8>, SignError> {
         let rng = SystemRandom::new();
 

diff --git a/crates/xdid-method-key/src/keys/p384.rs b/crates/xdid-method-key/src/keys/p384.rs
@@ -9,7 +9,7 @@ use ring::{
     signature::{EcdsaKeyPair, ECDSA_P384_SHA384_ASN1_SIGNING},
 };
 
-use super::{DidKeyPair, KeyParser, Multicodec, PublicKey, SignError, WithMulticodec};
+use super::{DidKeyPair, KeyParser, Multicodec, PublicKey, SignError, Signer, WithMulticodec};
 
 pub struct P384KeyPair {
     secret: SecretKey,
@@ -31,7 +31,9 @@ impl DidKeyPair for P384KeyPair {
     fn secret_bytes(&self) -> Box<[u8]> {
         self.secret.to_bytes().to_vec().into()
     }
+}
 
+impl Signer for P384KeyPair {
     fn sign(&self, message: &[u8]) -> Result<Vec<u8>, SignError> {
         let rng = SystemRandom::new();
 

diff --git a/crates/xdid-method-key/src/keys/p521.rs b/crates/xdid-method-key/src/keys/p521.rs
@@ -9,7 +9,7 @@ use ring::{
     signature::{EcdsaKeyPair, ECDSA_P384_SHA384_ASN1_SIGNING},
 };
 
-use super::{DidKeyPair, KeyParser, Multicodec, PublicKey, SignError, WithMulticodec};
+use super::{DidKeyPair, KeyParser, Multicodec, PublicKey, SignError, Signer, WithMulticodec};
 
 pub struct P521KeyPair {
     secret: SecretKey,
@@ -31,7 +31,9 @@ impl DidKeyPair for P521KeyPair {
     fn secret_bytes(&self) -> Box<[u8]> {
         self.secret.to_bytes().to_vec().into()
     }
+}
 
+impl Signer for P521KeyPair {
     fn sign(&self, message: &[u8]) -> Result<Vec<u8>, SignError> {
         let rng = SystemRandom::new();