Implement MultipartSigner/Verifier (#1221)

Author: daxpedda

bign256/Cargo.toml

@@ -33,7 +33,7 @@ pkcs8 = { version = "0.11.0-rc.3", optional = true }
 primefield = { version = "=0.14.0-pre.2", optional = true }
 primeorder = { version = "=0.14.0-pre.3", optional = true }
 sec1 = { version = "0.8.0-rc.1", optional = true }
-signature = { version = "3.0.0-pre.0", optional = true }
+signature = { version = "3.0.0-pre.1", optional = true }
 
 [dev-dependencies]
 criterion = "0.6"

bign256/src/ecdsa/signing.rs

@@ -25,7 +25,7 @@ use elliptic_curve::{
     point::AffineCoordinates,
     subtle::{Choice, ConstantTimeEq},
 };
-use signature::{Error, KeypairRef, Result, Signer, hazmat::PrehashSigner};
+use signature::{Error, KeypairRef, MultipartSigner, Result, Signer, hazmat::PrehashSigner};
 
 /// BignP256 secret key used for signing messages and producing signatures.
 ///
@@ -151,6 +151,12 @@ impl PrehashSigner<Signature> for SigningKey {
 
 impl Signer<Signature> for SigningKey {
     fn try_sign(&self, msg: &[u8]) -> Result<Signature> {
+        self.try_multipart_sign(&[msg])
+    }
+}
+
+impl MultipartSigner<Signature> for SigningKey {
+    fn try_multipart_sign(&self, msg: &[&[u8]]) -> Result<Signature> {
         // 1. Set 𝐻 ← ℎ(𝑋).
         let hash = self.verifying_key.hash_msg(msg);
         self.sign_prehash(&hash)

bign256/src/ecdsa/verifying.rs

@@ -31,7 +31,7 @@ use elliptic_curve::{
     group::GroupEncoding,
     ops::{LinearCombination, Reduce},
 };
-use signature::{Error, Result, Verifier, hazmat::PrehashVerifier};
+use signature::{Error, MultipartVerifier, Result, Verifier, hazmat::PrehashVerifier};
 
 use elliptic_curve::sec1::ToEncodedPoint;
 
@@ -84,9 +84,9 @@ impl VerifyingKey {
     /// Compute message hash `e` according to [STB 34.101.31-2020 § 7.8]
     ///
     /// [STB 34.101.31-2020 § 7.8]: https://apmi.bsu.by/assets/files/std/belt-spec371.pdf
-    pub(crate) fn hash_msg(&self, msg: &[u8]) -> Hash {
+    pub(crate) fn hash_msg(&self, msg: &[&[u8]]) -> Hash {
         let mut hasher = BeltHash::new();
-        hasher.update(msg);
+        msg.iter().for_each(|slice| hasher.update(slice));
         hasher.finalize_fixed()
     }
 
@@ -163,6 +163,12 @@ impl PrehashVerifier<Signature> for VerifyingKey {
 
 impl Verifier<Signature> for VerifyingKey {
     fn verify(&self, msg: &[u8], signature: &Signature) -> Result<()> {
+        self.multipart_verify(&[msg], signature)
+    }
+}
+
+impl MultipartVerifier<Signature> for VerifyingKey {
+    fn multipart_verify(&self, msg: &[&[u8]], signature: &Signature) -> Result<()> {
         // 4. Set 𝐻 ← ℎ(𝑋).
         let hash = self.hash_msg(msg);
         self.verify_prehash(&hash, signature)

k256/Cargo.toml

@@ -28,7 +28,7 @@ ecdsa-core = { version = "0.17.0-rc.0", package = "ecdsa", optional = true, defa
 hex-literal = { version = "1", optional = true }
 serdect = { version = "0.3", optional = true, default-features = false }
 sha2 = { version = "0.11.0-rc.0", optional = true, default-features = false }
-signature = { version = "3.0.0-rc.0", optional = true }
+signature = { version = "3.0.0-rc.1", optional = true }
 
 [dev-dependencies]
 blobby = "0.3"

k256/src/schnorr/signing.rs

@@ -13,7 +13,8 @@ use elliptic_curve::{
 };
 use sha2::{Digest, Sha256};
 use signature::{
-    DigestSigner, Error, KeypairRef, RandomizedDigestSigner, RandomizedSigner, Result, Signer,
+    DigestSigner, Error, KeypairRef, MultipartSigner, RandomizedDigestSigner,
+    RandomizedMultipartSigner, RandomizedSigner, Result, Signer,
     digest::{FixedOutput, consts::U32},
     hazmat::{PrehashSigner, RandomizedPrehashSigner},
 };
@@ -201,7 +202,19 @@ impl RandomizedSigner<Signature> for SigningKey {
         rng: &mut R,
         msg: &[u8],
     ) -> Result<Signature> {
-        self.try_sign_digest_with_rng(rng, Sha256::new_with_prefix(msg))
+        self.try_multipart_sign_with_rng(rng, &[msg])
+    }
+}
+
+impl RandomizedMultipartSigner<Signature> for SigningKey {
+    fn try_multipart_sign_with_rng<R: TryCryptoRng + ?Sized>(
+        &self,
+        rng: &mut R,
+        msg: &[&[u8]],
+    ) -> Result<Signature> {
+        let mut digest = Sha256::new();
+        msg.iter().for_each(|slice| digest.update(slice));
+        self.try_sign_digest_with_rng(rng, digest)
     }
 }
 
@@ -221,7 +234,15 @@ impl RandomizedPrehashSigner<Signature> for SigningKey {
 
 impl Signer<Signature> for SigningKey {
     fn try_sign(&self, msg: &[u8]) -> Result<Signature> {
-        self.try_sign_digest(Sha256::new_with_prefix(msg))
+        self.try_multipart_sign(&[msg])
+    }
+}
+
+impl MultipartSigner<Signature> for SigningKey {
+    fn try_multipart_sign(&self, msg: &[&[u8]]) -> Result<Signature> {
+        let mut digest = Sha256::new();
+        msg.iter().for_each(|slice| digest.update(slice));
+        self.try_sign_digest(digest)
     }
 }
 

k256/src/schnorr/verifying.rs

@@ -12,7 +12,9 @@ use sha2::{
     Digest, Sha256,
     digest::{FixedOutput, consts::U32},
 };
-use signature::{DigestVerifier, Error, Result, Verifier, hazmat::PrehashVerifier};
+use signature::{
+    DigestVerifier, Error, MultipartVerifier, Result, Verifier, hazmat::PrehashVerifier,
+};
 
 #[cfg(feature = "serde")]
 use serdect::serde::{Deserialize, Serialize, de, ser};
@@ -109,7 +111,15 @@ impl PrehashVerifier<Signature> for VerifyingKey {
 
 impl Verifier<Signature> for VerifyingKey {
     fn verify(&self, msg: &[u8], signature: &Signature) -> Result<()> {
-        self.verify_digest(Sha256::new_with_prefix(msg), signature)
+        self.multipart_verify(&[msg], signature)
+    }
+}
+
+impl MultipartVerifier<Signature> for VerifyingKey {
+    fn multipart_verify(&self, msg: &[&[u8]], signature: &Signature) -> Result<()> {
+        let mut digest = Sha256::new();
+        msg.iter().for_each(|slice| digest.update(slice));
+        self.verify_digest(digest, signature)
     }
 }
 

sm2/Cargo.toml

@@ -26,7 +26,7 @@ primefield = { version = "=0.14.0-pre.2", optional = true }
 primeorder = { version = "=0.14.0-pre.3", optional = true }
 rfc6979 = { version = "0.5.0-rc.0", optional = true }
 serdect = { version = "0.3", optional = true, default-features = false }
-signature = { version = "3.0.0-rc.0", optional = true, features = ["rand_core"] }
+signature = { version = "3.0.0-rc.1", optional = true, features = ["rand_core"] }
 sm3 = { version = "0.5.0-rc.0", optional = true, default-features = false }
 
 [dev-dependencies]

sm2/src/dsa/signing.rs

@@ -27,7 +27,8 @@ use elliptic_curve::{
     subtle::{Choice, ConstantTimeEq},
 };
 use signature::{
-    Error, KeypairRef, RandomizedSigner, Result, Signer,
+    Error, KeypairRef, MultipartSigner, RandomizedMultipartSigner, RandomizedSigner, Result,
+    Signer,
     hazmat::{PrehashSigner, RandomizedPrehashSigner},
     rand_core::TryCryptoRng,
 };
@@ -141,6 +142,16 @@ impl RandomizedSigner<Signature> for SigningKey {
         &self,
         rng: &mut R,
         msg: &[u8],
+    ) -> Result<Signature> {
+        self.try_multipart_sign_with_rng(rng, &[msg])
+    }
+}
+
+impl RandomizedMultipartSigner<Signature> for SigningKey {
+    fn try_multipart_sign_with_rng<R: TryCryptoRng + ?Sized>(
+        &self,
+        rng: &mut R,
+        msg: &[&[u8]],
     ) -> Result<Signature> {
         // A1: set M~=ZA || M
         let hash = self.verifying_key.hash_msg(msg);
@@ -150,6 +161,12 @@ impl RandomizedSigner<Signature> for SigningKey {
 
 impl Signer<Signature> for SigningKey {
     fn try_sign(&self, msg: &[u8]) -> Result<Signature> {
+        self.try_multipart_sign(&[msg])
+    }
+}
+
+impl MultipartSigner<Signature> for SigningKey {
+    fn try_multipart_sign(&self, msg: &[&[u8]]) -> Result<Signature> {
         // A1: set M~=ZA || M
         let hash = self.verifying_key.hash_msg(msg);
         self.sign_prehash(&hash)

sm2/src/dsa/verifying.rs

@@ -24,7 +24,7 @@ use elliptic_curve::{
     point::AffineCoordinates,
     sec1::ToEncodedPoint,
 };
-use signature::{Error, Result, Verifier, hazmat::PrehashVerifier};
+use signature::{Error, MultipartVerifier, Result, Verifier, hazmat::PrehashVerifier};
 use sm3::{Sm3, digest::Digest};
 
 #[cfg(feature = "alloc")]
@@ -124,10 +124,10 @@ impl VerifyingKey {
     /// Compute message hash `e` according to [draft-shen-sm2-ecdsa § 5.2.1]
     ///
     /// [draft-shen-sm2-ecdsa § 5.2.1]: https://datatracker.ietf.org/doc/html/draft-shen-sm2-ecdsa-02#section-5.2.1
-    pub(crate) fn hash_msg(&self, msg: &[u8]) -> Hash {
-        Sm3::new_with_prefix(self.identity_hash)
-            .chain_update(msg)
-            .finalize()
+    pub(crate) fn hash_msg(&self, msg: &[&[u8]]) -> Hash {
+        let mut hasher = Sm3::new_with_prefix(self.identity_hash);
+        msg.iter().for_each(|slice| hasher.update(slice));
+        hasher.finalize()
     }
 }
 
@@ -176,6 +176,12 @@ impl PrehashVerifier<Signature> for VerifyingKey {
 
 impl Verifier<Signature> for VerifyingKey {
     fn verify(&self, msg: &[u8], signature: &Signature) -> Result<()> {
+        self.multipart_verify(&[msg], signature)
+    }
+}
+
+impl MultipartVerifier<Signature> for VerifyingKey {
+    fn multipart_verify(&self, msg: &[&[u8]], signature: &Signature) -> Result<()> {
         // B3: set M'~=ZA || M'
         let hash = self.hash_msg(msg);
         self.verify_prehash(&hash, signature)