cms: pull builder changes

Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
RustCrypto · Dec 13, 2023 · 41e0d7b · 41e0d7b
1 parent dc871c1
commit 41e0d7b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 30 deletions.
diff --git a/cms/src/builder.rs b/cms/src/builder.rs
@@ -35,7 +35,10 @@ use rsa::Pkcs1v15Encrypt;
 use sha2::digest;
 use signature::digest::DynDigest;
 use signature::{Keypair, Signer};
-use spki::{AlgorithmIdentifierOwned, DynSignatureAlgorithmIdentifier, SignatureBitStringEncoding};
+use spki::{
+    AlgorithmIdentifierOwned, DynSignatureAlgorithmIdentifier, EncodePublicKey,
+    SignatureBitStringEncoding,
+};
 use std::time::SystemTime;
 use std::vec;
 use x509_cert::attr::{Attribute, AttributeValue, Attributes};
@@ -96,8 +99,7 @@ type Result<T> = core::result::Result<T, Error>;
 /// - calculate the signature
 /// - set the signing time attribute
 /// - create a `SignerInfo` object
-pub struct SignerInfoBuilder<'s, S> {
-    signer: &'s S,
+pub struct SignerInfoBuilder<'s> {
     sid: SignerIdentifier,
     digest_algorithm: AlgorithmIdentifierOwned,
     signed_attributes: Option<Vec<Attribute>>,
@@ -106,24 +108,19 @@ pub struct SignerInfoBuilder<'s, S> {
     external_message_digest: Option<&'s [u8]>,
 }
 
-impl<'s, S> SignerInfoBuilder<'s, S>
-where
-    S: Keypair + DynSignatureAlgorithmIdentifier,
-{
+impl<'s> SignerInfoBuilder<'s> {
     /// Create a new `SignerInfoBuilder`. This is used for adding `SignerInfo`s to `SignedData`
     /// structures.
     /// The content to be signed can be stored externally. In this case `eContent` in
     /// `encapsulated_content_info` must be `None` and the message digest must be passed with
     /// `external_message_digest`. `digest_algorithm` must match the used digest algorithm.
     pub fn new(
-        signer: &'s S,
         sid: SignerIdentifier,
         digest_algorithm: AlgorithmIdentifierOwned,
         encapsulated_content_info: &'s EncapsulatedContentInfo,
         external_message_digest: Option<&'s [u8]>,
     ) -> Result<Self> {
         Ok(SignerInfoBuilder {
-            signer,
             sid,
             digest_algorithm,
             signed_attributes: None,
@@ -167,28 +164,27 @@ where
     }
 }
 
-impl<'s, S> Builder for SignerInfoBuilder<'s, S>
-where
-    S: Keypair + DynSignatureAlgorithmIdentifier,
-{
-    type Signer = S;
+impl<'s> Builder for SignerInfoBuilder<'s> {
     type Output = SignerInfo;
 
-    fn signer(&self) -> &Self::Signer {
-        self.signer
-    }
-
     /// Calculate the data to be signed
     /// [RFC 5652 § 5.4](https://datatracker.ietf.org/doc/html/rfc5652#section-5.4)
     /// If an `external_message_digest` is passed in, it is assumed, that we are signing external
     /// content (see RFC 5652 § 5.2). In this case, the `eContent` in `EncapsulatedContentInfo`
     /// must be `None`.
-    fn finalize(&mut self) -> der::Result<Vec<u8>> {
+    fn finalize<S>(
+        &mut self,
+        _signer: &S,
+    ) -> core::result::Result<Vec<u8>, x509_cert::builder::Error>
+    where
+        S: Keypair + DynSignatureAlgorithmIdentifier,
+        S::VerifyingKey: EncodePublicKey,
+    {
         let message_digest = match self.external_message_digest {
             Some(external_content_digest) => {
                 if self.encapsulated_content_info.econtent.is_some() {
                     // Encapsulated content must be empty, if external digest is given.
-                    return Err(der::Error::from(ErrorKind::Failed));
+                    return Err(der::Error::from(ErrorKind::Failed).into());
                 }
                 Some(external_content_digest.to_vec())
             }
@@ -201,7 +197,7 @@ where
                 Some(content) => {
                     let mut hasher = get_hasher(&self.digest_algorithm).ok_or_else(|| {
                         // Unsupported hash algorithm: {}, &self.digest_algorithm.oid.to_string()
-                        der::Error::from(ErrorKind::Failed)
+                        x509_cert::builder::Error::from(der::Error::from(ErrorKind::Failed))
                     })?;
                     // Only the octets comprising the value of the eContent
                     // OCTET STRING are input to the message digest algorithm, not the tag
@@ -245,7 +241,7 @@ where
                 // Check against `eContentType`
                 if signed_attributes_content_type.oid != econtent_type {
                     // Mismatch between content types: encapsulated content info <-> signed attributes.
-                    return Err(der::Error::from(ErrorKind::Failed));
+                    return Err(der::Error::from(ErrorKind::Failed).into());
                 }
             } else {
                 signed_attributes.push(
@@ -264,10 +260,15 @@ where
         Ok(signed_attributes_der)
     }
 
-    fn assemble(
+    fn assemble<S>(
         self,
         signature: BitString,
-    ) -> core::result::Result<Self::Output, x509_cert::builder::Error> {
+        signer: &S,
+    ) -> core::result::Result<Self::Output, x509_cert::builder::Error>
+    where
+        S: Keypair + DynSignatureAlgorithmIdentifier,
+        S::VerifyingKey: EncodePublicKey,
+    {
         let signed_attrs = self.signed_attributes.as_ref().map(|signed_attributes| {
             SignedAttributes::try_from(signed_attributes.to_owned()).unwrap()
         });
@@ -281,7 +282,7 @@ where
         let signature_value =
             SignatureValue::new(signature.raw_bytes()).map_err(x509_cert::builder::Error::from)?;
 
-        let signature_algorithm = self.signer.signature_algorithm_identifier()?;
+        let signature_algorithm = signer.signature_algorithm_identifier()?;
 
         Ok(SignerInfo {
             version: self.version(),
@@ -379,15 +380,17 @@ impl<'s> SignedDataBuilder<'s> {
     /// must not be changed after the first signer info was added.
     pub fn add_signer_info<S, Signature>(
         &mut self,
-        signer_info_builder: SignerInfoBuilder<'_, S>,
+        signer_info_builder: SignerInfoBuilder<'_>,
+        signer: &S,
     ) -> Result<&mut Self>
     where
         S: Keypair + DynSignatureAlgorithmIdentifier,
         S: Signer<Signature>,
+        S::VerifyingKey: EncodePublicKey,
         Signature: SignatureBitStringEncoding,
     {
         let signer_info = signer_info_builder
-            .build::<Signature>()
+            .build::<S, Signature>(signer)
             .map_err(|_| der::Error::from(ErrorKind::Failed))?;
         self.signer_infos.push(signer_info);
 

diff --git a/cms/tests/builder.rs b/cms/tests/builder.rs
@@ -104,7 +104,6 @@ fn test_build_signed_data() {
     };
     let external_message_digest = None;
     let signer_info_builder_1 = SignerInfoBuilder::new(
-        &signer,
         signer_identifier(1),
         digest_algorithm.clone(),
         &content,
@@ -119,7 +118,6 @@ fn test_build_signed_data() {
     };
     let external_message_digest_2 = None;
     let signer_info_builder_2 = SignerInfoBuilder::new(
-        &signer_2,
         signer_identifier(1),
         digest_algorithm_2.clone(),
         &content,
@@ -137,10 +135,14 @@ fn test_build_signed_data() {
         .expect("could not add a digest algorithm")
         .add_certificate(CertificateChoices::Certificate(certificate))
         .expect("error adding certificate")
-        .add_signer_info::<SigningKey<Sha256>, rsa::pkcs1v15::Signature>(signer_info_builder_1)
+        .add_signer_info::<SigningKey<Sha256>, rsa::pkcs1v15::Signature>(
+            signer_info_builder_1,
+            &signer,
+        )
         .expect("error adding RSA signer info")
         .add_signer_info::<ecdsa::SigningKey<NistP256>, p256::ecdsa::DerSignature>(
             signer_info_builder_2,
+            &signer_2,
         )
         .expect("error adding P256 signer info")
         .build()