Adds support for the SignatureBitStringEncoding trait (#328)

RustCrypto · May 4, 2023 · 7a58281 · 7a58281
1 parent d61b501
commit 7a58281
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,7 +24,8 @@ subtle = { version = "2.1.1", default-features = false }
 digest = { version = "0.10.5", default-features = false, features = ["alloc", "oid"] }
 pkcs1 = { version = "0.7.5", default-features = false, features = ["alloc", "pkcs8"] }
 pkcs8 = { version = "0.10.2", default-features = false, features = ["alloc"] }
-signature = { version = "2", default-features = false , features = ["digest", "rand_core"] }
+signature = { version = "2", default-features = false , features = ["alloc", "digest", "rand_core"] }
+spki = { version = "0.7.2", default-features = false, features = ["alloc"] }
 zeroize = { version = "1.5", features = ["alloc"] }
 
 # optional dependencies

diff --git a/src/pkcs1v15/signature.rs b/src/pkcs1v15/signature.rs
@@ -3,6 +3,10 @@ pub use ::signature::{
     DigestSigner, DigestVerifier, Error, Keypair, RandomizedDigestSigner, RandomizedSigner, Result,
     SignatureEncoding, Signer, Verifier,
 };
+use spki::{
+    der::{asn1::BitString, Result as DerResult},
+    SignatureBitStringEncoding,
+};
 
 use crate::algorithms::pad::uint_to_be_pad;
 use alloc::{boxed::Box, string::ToString};
@@ -22,6 +26,12 @@ impl SignatureEncoding for Signature {
     type Repr = Box<[u8]>;
 }
 
+impl SignatureBitStringEncoding for Signature {
+    fn to_bitstring(&self) -> DerResult<BitString> {
+        BitString::new(0, self.to_vec())
+    }
+}
+
 impl TryFrom<&[u8]> for Signature {
     type Error = signature::Error;
 

diff --git a/src/pss/signature.rs b/src/pss/signature.rs
@@ -3,6 +3,10 @@ pub use ::signature::{
     DigestSigner, DigestVerifier, Error, Keypair, RandomizedDigestSigner, RandomizedSigner, Result,
     SignatureEncoding, Signer, Verifier,
 };
+use spki::{
+    der::{asn1::BitString, Result as DerResult},
+    SignatureBitStringEncoding,
+};
 
 use crate::algorithms::pad::uint_to_be_pad;
 use alloc::{boxed::Box, string::ToString};
@@ -22,6 +26,12 @@ impl SignatureEncoding for Signature {
     type Repr = Box<[u8]>;
 }
 
+impl SignatureBitStringEncoding for Signature {
+    fn to_bitstring(&self) -> DerResult<BitString> {
+        BitString::new(0, self.to_vec())
+    }
+}
+
 impl TryFrom<&[u8]> for Signature {
     type Error = signature::Error;