fix BIP-340 signatures for fixed sized messages

common/src/block.rs

@@ -86,8 +86,8 @@ impl HashableBlockData {
         bedrock_parent_id: MantleMsgId,
     ) -> Block {
         let data_bytes = borsh::to_vec(&self).unwrap();
-        let signature = nssa::Signature::new(signing_key, &data_bytes);
         let hash = OwnHasher::hash(&data_bytes);
+        let signature = nssa::Signature::new(signing_key, &hash.0);
         Block {
             header: BlockHeader {
                 block_id: self.block_id,

nssa/src/privacy_preserving_transaction/message.rs

@@ -118,6 +118,11 @@ impl Message {
             timestamp_validity_window: output.timestamp_validity_window,
         })
     }
+
+    #[must_use]
+    pub fn hash_message(&self) -> [u8; 32] {
+        Sha256::digest(self.to_bytes()).into()
+    }
 }
 
 #[cfg(test)]

nssa/src/privacy_preserving_transaction/witness_set.rs

@@ -14,12 +14,12 @@ pub struct WitnessSet {
 impl WitnessSet {
     #[must_use]
     pub fn for_message(message: &Message, proof: Proof, private_keys: &[&PrivateKey]) -> Self {
-        let message_bytes = message.to_bytes();
+        let message_hash = message.hash_message();
         let signatures_and_public_keys = private_keys
             .iter()
             .map(|&key| {
                 (
-                    Signature::new(key, &message_bytes),
+                    Signature::new(key, &message_hash),
                     PublicKey::new_from_private_key(key),
                 )
             })
@@ -32,9 +32,9 @@ impl WitnessSet {
 
     #[must_use]
     pub fn signatures_are_valid_for(&self, message: &Message) -> bool {
-        let message_bytes = message.to_bytes();
+        let message_hash = message.hash_message();
         for (signature, public_key) in self.signatures_and_public_keys() {
-            if !signature.is_valid_for(&message_bytes, public_key) {
+            if !signature.is_valid_for(&message_hash, public_key) {
                 return false;
             }
         }

nssa/src/public_transaction/message.rs

@@ -4,6 +4,7 @@ use nssa_core::{
     program::{InstructionData, ProgramId},
 };
 use serde::Serialize;
+use sha2::{Digest as _, Sha256};
 
 use crate::{AccountId, error::NssaError, program::Program};
 
@@ -63,4 +64,9 @@ impl Message {
             instruction_data,
         }
     }
+
+    #[must_use]
+    pub fn hash_message(&self) -> [u8; 32] {
+        Sha256::digest(self.to_bytes()).into()
+    }
 }

nssa/src/public_transaction/witness_set.rs

@@ -10,12 +10,12 @@ pub struct WitnessSet {
 impl WitnessSet {
     #[must_use]
     pub fn for_message(message: &Message, private_keys: &[&PrivateKey]) -> Self {
-        let message_bytes = message.to_bytes();
+        let message_hash = message.hash_message();
         let signatures_and_public_keys = private_keys
             .iter()
             .map(|&key| {
                 (
-                    Signature::new(key, &message_bytes),
+                    Signature::new(key, &message_hash),
                     PublicKey::new_from_private_key(key),
                 )
             })
@@ -27,9 +27,9 @@ impl WitnessSet {
 
     #[must_use]
     pub fn is_valid_for(&self, message: &Message) -> bool {
-        let message_bytes = message.to_bytes();
+        let message_hash = message.hash_message();
         for (signature, public_key) in self.signatures_and_public_keys() {
-            if !signature.is_valid_for(&message_bytes, public_key) {
+            if !signature.is_valid_for(&message_hash, public_key) {
                 return false;
             }
         }

nssa/src/signature/bip340_test_vectors.rs

@@ -4,7 +4,7 @@ pub struct TestVector {
     pub seckey: Option<PrivateKey>,
     pub pubkey: PublicKey,
     pub aux_rand: Option<[u8; 32]>,
-    pub message: Option<Vec<u8>>,
+    pub message: Option<[u8; 32]>,
     pub signature: Signature,
     pub verification_result: bool,
 }
@@ -15,19 +15,22 @@ pub struct TestVector {
 pub fn test_vectors() -> Vec<TestVector> {
     vec![
         TestVector {
-            seckey: Some(PrivateKey::try_new(hex_to_bytes(
-                "0000000000000000000000000000000000000000000000000000000000000003",
-            )).unwrap()),
+            seckey: Some(
+                PrivateKey::try_new(hex_to_bytes(
+                    "0000000000000000000000000000000000000000000000000000000000000003",
+                ))
+                .unwrap(),
+            ),
             pubkey: PublicKey::try_new(hex_to_bytes(
                 "F9308A019258C31049344F85F89D5229B531C845836F99B08601F113BCE036F9",
-            )).unwrap(),
+            ))
+            .unwrap(),
             aux_rand: Some(hex_to_bytes::<32>(
                 "0000000000000000000000000000000000000000000000000000000000000000",
             )),
-            message: Some(
-                hex::decode("0000000000000000000000000000000000000000000000000000000000000000")
-                    .unwrap(),
-            ),
+            message: Some(hex_to_bytes::<32>(
+                "0000000000000000000000000000000000000000000000000000000000000000",
+            )),
             signature: Signature {
                 value: hex_to_bytes(
                     "E907831F80848D1069A5371B402410364BDF1C5F8307B0084C55F1CE2DCA821525F66A4A85EA8B71E482A74F382D2CE5EBEEE8FDB2172F477DF4900D310536C0",
@@ -36,19 +39,22 @@ pub fn test_vectors() -> Vec<TestVector> {
             verification_result: true,
         },
         TestVector {
-            seckey: Some(PrivateKey::try_new(hex_to_bytes(
-                "B7E151628AED2A6ABF7158809CF4F3C762E7160F38B4DA56A784D9045190CFEF",
-            )).unwrap()),
+            seckey: Some(
+                PrivateKey::try_new(hex_to_bytes(
+                    "B7E151628AED2A6ABF7158809CF4F3C762E7160F38B4DA56A784D9045190CFEF",
+                ))
+                .unwrap(),
+            ),
             pubkey: PublicKey::try_new(hex_to_bytes(
                 "DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
-            )).unwrap(),
+            ))
+            .unwrap(),
             aux_rand: Some(hex_to_bytes::<32>(
                 "0000000000000000000000000000000000000000000000000000000000000001",
             )),
-            message: Some(
-                hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89")
-                    .unwrap(),
-            ),
+            message: Some(hex_to_bytes::<32>(
+                "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+            )),
             signature: Signature {
                 value: hex_to_bytes(
                     "6896BD60EEAE296DB48A229FF71DFE071BDE413E6D43F917DC8DCF8C78DE33418906D11AC976ABCCB20B091292BFF4EA897EFCB639EA871CFA95F6DE339E4B0A",
@@ -57,19 +63,22 @@ pub fn test_vectors() -> Vec<TestVector> {
             verification_result: true,
         },
         TestVector {
-            seckey: Some(PrivateKey::try_new(hex_to_bytes(
-                "C90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B14E5C9",
-            )).unwrap()),
+            seckey: Some(
+                PrivateKey::try_new(hex_to_bytes(
+                    "C90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B14E5C9",
+                ))
+                .unwrap(),
+            ),
             pubkey: PublicKey::try_new(hex_to_bytes(
                 "DD308AFEC5777E13121FA72B9CC1B7CC0139715309B086C960E18FD969774EB8",
-            )).unwrap(),
+            ))
+            .unwrap(),
             aux_rand: Some(hex_to_bytes::<32>(
                 "C87AA53824B4D7AE2EB035A2B5BBBCCC080E76CDC6D1692C4B0B62D798E6D906",
             )),
-            message: Some(
-                hex::decode("7E2D58D8B3BCDF1ABADEC7829054F90DDA9805AAB56C77333024B9D0A508B75C")
-                    .unwrap(),
-            ),
+            message: Some(hex_to_bytes::<32>(
+                "7E2D58D8B3BCDF1ABADEC7829054F90DDA9805AAB56C77333024B9D0A508B75C",
+            )),
             signature: Signature {
                 value: hex_to_bytes(
                     "5831AAEED7B44BB74E5EAB94BA9D4294C49BCF2A60728D8B4C200F50DD313C1BAB745879A5AD954A72C45A91C3A51D3C7ADEA98D82F8481E0E1E03674A6F3FB7",
@@ -78,19 +87,22 @@ pub fn test_vectors() -> Vec<TestVector> {
             verification_result: true,
         },
         TestVector {
-            seckey: Some(PrivateKey::try_new(hex_to_bytes(
-                "0B432B2677937381AEF05BB02A66ECD012773062CF3FA2549E44F58ED2401710",
-            )).unwrap()),
+            seckey: Some(
+                PrivateKey::try_new(hex_to_bytes(
+                    "0B432B2677937381AEF05BB02A66ECD012773062CF3FA2549E44F58ED2401710",
+                ))
+                .unwrap(),
+            ),
             pubkey: PublicKey::try_new(hex_to_bytes(
                 "25D1DFF95105F5253C4022F628A996AD3A0D95FBF21D468A1B33F8C160D8F517",
-            )).unwrap(),
+            ))
+            .unwrap(),
             aux_rand: Some(hex_to_bytes::<32>(
                 "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
             )),
-            message: Some(
-                hex::decode("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF")
-                    .unwrap(),
-            ),
+            message: Some(hex_to_bytes::<32>(
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
+            )),
             signature: Signature {
                 value: hex_to_bytes(
                     "7EB0509757E246F19449885651611CB965ECC1A187DD51B64FDA1EDC9637D5EC97582B9CB13DB3933705B32BA982AF5AF25FD78881EBB32771FC5922EFC66EA3",
@@ -102,12 +114,12 @@ pub fn test_vectors() -> Vec<TestVector> {
             seckey: None,
             pubkey: PublicKey::try_new(hex_to_bytes(
                 "D69C3509BB99E412E68B0FE8544E72837DFA30746D8BE2AA65975F29D22DC7B9",
-            )).unwrap(),
+            ))
+            .unwrap(),
             aux_rand: None,
-            message: Some(
-                hex::decode("4DF3C3F68FCC83B27E9D42C90431A72499F17875C81A599B566C9889B9696703")
-                    .unwrap(),
-            ),
+            message: Some(hex_to_bytes::<32>(
+                "4DF3C3F68FCC83B27E9D42C90431A72499F17875C81A599B566C9889B9696703",
+            )),
             signature: Signature {
                 value: hex_to_bytes(
                     "00000000000000000000003B78CE563F89A0ED9414F5AA28AD0D96D6795F9C6376AFB1548AF603B3EB45C9F8207DEE1060CB71C04E80F593060B07D28308D7F4",
@@ -123,12 +135,14 @@ pub fn test_vectors() -> Vec<TestVector> {
         //                 )).unwrap(),
         //     aux_rand: None,
         //     message: Some(
-        //                     hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89").unwrap(),
-        //                 ),
+        //                     
+        // hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89").
+        // unwrap(),                 ),
         //     signature: Signature {
         //                     value: hex_to_bytes(
-        //                         "6CFF5C3BA86C69EA4B7376F31A9BCB4F74C1976089B2D9963DA2E5543E17776969E89B4C5564D00349106B8497785DD7D1D713A8AE82B32FA79D5F7FC407D39B",
-        //                     ),
+        //                         
+        // "6CFF5C3BA86C69EA4B7376F31A9BCB4F74C1976089B2D9963DA2E5543E17776969E89B4C5564D00349106B8497785DD7D1D713A8AE82B32FA79D5F7FC407D39B"
+        // ,                     ),
         //                 },
         //     verification_result: false,
         // },
@@ -136,12 +150,12 @@ pub fn test_vectors() -> Vec<TestVector> {
             seckey: None,
             pubkey: PublicKey::try_new(hex_to_bytes(
                 "DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
-            )).unwrap(),
+            ))
+            .unwrap(),
             aux_rand: None,
-            message: Some(
-                hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89")
-                    .unwrap(),
-            ),
+            message: Some(hex_to_bytes::<32>(
+                "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+            )),
             signature: Signature {
                 value: hex_to_bytes(
                     "FFF97BD5755EEEA420453A14355235D382F6472F8568A18B2F057A14602975563CC27944640AC607CD107AE10923D9EF7A73C643E166BE5EBEAFA34B1AC553E2",
@@ -153,12 +167,12 @@ pub fn test_vectors() -> Vec<TestVector> {
             seckey: None,
             pubkey: PublicKey::try_new(hex_to_bytes(
                 "DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
-            )).unwrap(),
+            ))
+            .unwrap(),
             aux_rand: None,
-            message: Some(
-                hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89")
-                    .unwrap(),
-            ),
+            message: Some(hex_to_bytes::<32>(
+                "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+            )),
             signature: Signature {
                 value: hex_to_bytes(
                     "1FA62E331EDBC21C394792D2AB1100A7B432B013DF3F6FF4F99FCB33E0E1515F28890B3EDB6E7189B630448B515CE4F8622A954CFE545735AAEA5134FCCDB2BD",
@@ -170,12 +184,12 @@ pub fn test_vectors() -> Vec<TestVector> {
             seckey: None,
             pubkey: PublicKey::try_new(hex_to_bytes(
                 "DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
-            )).unwrap(),
+            ))
+            .unwrap(),
             aux_rand: None,
-            message: Some(
-                hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89")
-                    .unwrap(),
-            ),
+            message: Some(hex_to_bytes::<32>(
+                "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+            )),
             signature: Signature {
                 value: hex_to_bytes(
                     "6CFF5C3BA86C69EA4B7376F31A9BCB4F74C1976089B2D9963DA2E5543E177769961764B3AA9B2FFCB6EF947B6887A226E8D7C93E00C5ED0C1834FF0D0C2E6DA6",
@@ -187,12 +201,12 @@ pub fn test_vectors() -> Vec<TestVector> {
             seckey: None,
             pubkey: PublicKey::try_new(hex_to_bytes(
                 "DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
-            )).unwrap(),
+            ))
+            .unwrap(),
             aux_rand: None,
-            message: Some(
-                hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89")
-                    .unwrap(),
-            ),
+            message: Some(hex_to_bytes::<32>(
+                "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+            )),
             signature: Signature {
                 value: hex_to_bytes(
                     "0000000000000000000000000000000000000000000000000000000000000000123DDA8328AF9C23A94C1FEECFD123BA4FB73476F0D594DCB65C6425BD186051",
@@ -204,12 +218,12 @@ pub fn test_vectors() -> Vec<TestVector> {
             seckey: None,
             pubkey: PublicKey::try_new(hex_to_bytes(
                 "DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
-            )).unwrap(),
+            ))
+            .unwrap(),
             aux_rand: None,
-            message: Some(
-                hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89")
-                    .unwrap(),
-            ),
+            message: Some(hex_to_bytes::<32>(
+                "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+            )),
             signature: Signature {
                 value: hex_to_bytes(
                     "00000000000000000000000000000000000000000000000000000000000000017615FBAF5AE28864013C099742DEADB4DBA87F11AC6754F93780D5A1837CF197",
@@ -221,12 +235,12 @@ pub fn test_vectors() -> Vec<TestVector> {
             seckey: None,
             pubkey: PublicKey::try_new(hex_to_bytes(
                 "DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
-            )).unwrap(),
+            ))
+            .unwrap(),
             aux_rand: None,
-            message: Some(
-                hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89")
-                    .unwrap(),
-            ),
+            message: Some(hex_to_bytes::<32>(
+                "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+            )),
             signature: Signature {
                 value: hex_to_bytes(
                     "4A298DACAE57395A15D0795DDBFD1DCB564DA82B0F269BC70A74F8220429BA1D69E89B4C5564D00349106B8497785DD7D1D713A8AE82B32FA79D5F7FC407D39B",
@@ -238,12 +252,12 @@ pub fn test_vectors() -> Vec<TestVector> {
             seckey: None,
             pubkey: PublicKey::try_new(hex_to_bytes(
                 "DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
-            )).unwrap(),
+            ))
+            .unwrap(),
             aux_rand: None,
-            message: Some(
-                hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89")
-                    .unwrap(),
-            ),
+            message: Some(hex_to_bytes::<32>(
+                "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+            )),
             signature: Signature {
                 value: hex_to_bytes(
                     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F69E89B4C5564D00349106B8497785DD7D1D713A8AE82B32FA79D5F7FC407D39B",
@@ -255,12 +269,12 @@ pub fn test_vectors() -> Vec<TestVector> {
             seckey: None,
             pubkey: PublicKey::try_new(hex_to_bytes(
                 "DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
-            )).unwrap(),
+            ))
+            .unwrap(),
             aux_rand: None,
-            message: Some(
-                hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89")
-                    .unwrap(),
-            ),
+            message: Some(hex_to_bytes::<32>(
+                "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+            )),
             signature: Signature {
                 value: hex_to_bytes(
                     "6CFF5C3BA86C69EA4B7376F31A9BCB4F74C1976089B2D9963DA2E5543E177769FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",
@@ -276,89 +290,95 @@ pub fn test_vectors() -> Vec<TestVector> {
         //                 )).unwrap(),
         //     aux_rand: None,
         //     message: Some(
-        //                     hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89").unwrap(),
-        //                 ),
+        //                     
+        // hex::decode("243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89").
+        // unwrap(),                 ),
         //     signature: Signature {
         //                     value: hex_to_bytes(
-        //                         "6CFF5C3BA86C69EA4B7376F31A9BCB4F74C1976089B2D9963DA2E5543E17776969E89B4C5564D00349106B8497785DD7D1D713A8AE82B32FA79D5F7FC407D39B",
-        //                     ),
+        //                         
+        // "6CFF5C3BA86C69EA4B7376F31A9BCB4F74C1976089B2D9963DA2E5543E17776969E89B4C5564D00349106B8497785DD7D1D713A8AE82B32FA79D5F7FC407D39B"
+        // ,                     ),
         //                 },
         //     verification_result: false,
         // },
-        TestVector {
-            seckey: Some(PrivateKey::try_new(hex_to_bytes(
-                "0340034003400340034003400340034003400340034003400340034003400340",
-            )).unwrap()),
-            pubkey: PublicKey::try_new(hex_to_bytes(
-                "778CAA53B4393AC467774D09497A87224BF9FAB6F6E68B23086497324D6FD117",
-            )).unwrap(),
-            aux_rand: Some(hex_to_bytes::<32>(
-                "0000000000000000000000000000000000000000000000000000000000000000",
-            )),
-            message: None,
-            signature: Signature {
-                value: hex_to_bytes(
-                    "71535DB165ECD9FBBC046E5FFAEA61186BB6AD436732FCCC25291A55895464CF6069CE26BF03466228F19A3A62DB8A649F2D560FAC652827D1AF0574E427AB63",
-                ),
-            },
-            verification_result: true,
-        },
-        TestVector {
-            seckey: Some(PrivateKey::try_new(hex_to_bytes(
-                "0340034003400340034003400340034003400340034003400340034003400340",
-            )).unwrap()),
-            pubkey: PublicKey::try_new(hex_to_bytes(
-                "778CAA53B4393AC467774D09497A87224BF9FAB6F6E68B23086497324D6FD117",
-            )).unwrap(),
-            aux_rand: Some(hex_to_bytes::<32>(
-                "0000000000000000000000000000000000000000000000000000000000000000",
-            )),
-            message: Some(hex::decode("11").unwrap()),
-            signature: Signature {
-                value: hex_to_bytes(
-                    "08A20A0AFEF64124649232E0693C583AB1B9934AE63B4C3511F3AE1134C6A303EA3173BFEA6683BD101FA5AA5DBC1996FE7CACFC5A577D33EC14564CEC2BACBF",
-                ),
-            },
-            verification_result: true,
-        },
-        TestVector {
-            seckey: Some(PrivateKey::try_new(hex_to_bytes(
-                "0340034003400340034003400340034003400340034003400340034003400340",
-            )).unwrap()),
-            pubkey: PublicKey::try_new(hex_to_bytes(
-                "778CAA53B4393AC467774D09497A87224BF9FAB6F6E68B23086497324D6FD117",
-            )).unwrap(),
-            aux_rand: Some(hex_to_bytes::<32>(
-                "0000000000000000000000000000000000000000000000000000000000000000",
-            )),
-            message: Some(hex::decode("0102030405060708090A0B0C0D0E0F1011").unwrap()),
-            signature: Signature {
-                value: hex_to_bytes(
-                    "5130F39A4059B43BC7CAC09A19ECE52B5D8699D1A71E3C52DA9AFDB6B50AC370C4A482B77BF960F8681540E25B6771ECE1E5A37FD80E5A51897C5566A97EA5A5",
-                ),
-            },
-            verification_result: true,
-        },
-        TestVector {
-            seckey: Some(PrivateKey::try_new(hex_to_bytes(
-                "0340034003400340034003400340034003400340034003400340034003400340",
-            )).unwrap()),
-            pubkey: PublicKey::try_new(hex_to_bytes(
-                "778CAA53B4393AC467774D09497A87224BF9FAB6F6E68B23086497324D6FD117",
-            )).unwrap(),
-            aux_rand: Some(hex_to_bytes::<32>(
-                "0000000000000000000000000000000000000000000000000000000000000000",
-            )),
-            message: Some(
-                hex::decode("99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999").unwrap(),
-            ),
-            signature: Signature {
-                value: hex_to_bytes(
-                    "403B12B0D8555A344175EA7EC746566303321E5DBFA8BE6F091635163ECA79A8585ED3E3170807E7C03B720FC54C7B23897FCBA0E9D0B4A06894CFD249F22367",
-                ),
-            },
-            verification_result: true,
-        },
+        // Test with invalid message length (0); valid test for BIP-340 post 2022.
+        // TestVector {
+        // seckey: Some(PrivateKey::try_new(hex_to_bytes(
+        // "0340034003400340034003400340034003400340034003400340034003400340",
+        // )).unwrap()),
+        // pubkey: PublicKey::try_new(hex_to_bytes(
+        // "778CAA53B4393AC467774D09497A87224BF9FAB6F6E68B23086497324D6FD117",
+        // )).unwrap(),
+        // aux_rand: Some(hex_to_bytes::<32>(
+        // "0000000000000000000000000000000000000000000000000000000000000000",
+        // )),
+        // message: None,
+        // signature: Signature {
+        // value: hex_to_bytes(
+        // "71535DB165ECD9FBBC046E5FFAEA61186BB6AD436732FCCC25291A55895464CF6069CE26BF03466228F19A3A62DB8A649F2D560FAC652827D1AF0574E427AB63",
+        // ),
+        // },
+        // verification_result: true,
+        // },
+        // Test with invalid message length (1); valid test for BIP-340 post 2022.
+        // TestVector {
+        // seckey: Some(PrivateKey::try_new(hex_to_bytes(
+        // "0340034003400340034003400340034003400340034003400340034003400340",
+        // )).unwrap()),
+        // pubkey: PublicKey::try_new(hex_to_bytes(
+        // "778CAA53B4393AC467774D09497A87224BF9FAB6F6E68B23086497324D6FD117",
+        // )).unwrap(),
+        // aux_rand: Some(hex_to_bytes::<32>(
+        // "0000000000000000000000000000000000000000000000000000000000000000",
+        // )),
+        // message: Some(hex::decode("11").unwrap()),
+        // signature: Signature {
+        // value: hex_to_bytes(
+        // "08A20A0AFEF64124649232E0693C583AB1B9934AE63B4C3511F3AE1134C6A303EA3173BFEA6683BD101FA5AA5DBC1996FE7CACFC5A577D33EC14564CEC2BACBF",
+        // ),
+        // },
+        // verification_result: true,
+        // },
+        // Test with invalid message length (17); valid test for BIP-340 post 2022.
+        // TestVector {
+        // seckey: Some(PrivateKey::try_new(hex_to_bytes(
+        // "0340034003400340034003400340034003400340034003400340034003400340",
+        // )).unwrap()),
+        // pubkey: PublicKey::try_new(hex_to_bytes(
+        // "778CAA53B4393AC467774D09497A87224BF9FAB6F6E68B23086497324D6FD117",
+        // )).unwrap(),
+        // aux_rand: Some(hex_to_bytes::<32>(
+        // "0000000000000000000000000000000000000000000000000000000000000000",
+        // )),
+        // message: Some(hex::decode("0102030405060708090A0B0C0D0E0F1011").unwrap()),
+        // signature: Signature {
+        // value: hex_to_bytes(
+        // "5130F39A4059B43BC7CAC09A19ECE52B5D8699D1A71E3C52DA9AFDB6B50AC370C4A482B77BF960F8681540E25B6771ECE1E5A37FD80E5A51897C5566A97EA5A5",
+        // ),
+        // },
+        // erification_result: true,
+        // },
+        // Test with invalid message length (100); valid test for BIP-340 post 2022.
+        // TestVector {
+        // seckey: Some(PrivateKey::try_new(hex_to_bytes(
+        // "0340034003400340034003400340034003400340034003400340034003400340",
+        // )).unwrap()),
+        // pubkey: PublicKey::try_new(hex_to_bytes(
+        // "778CAA53B4393AC467774D09497A87224BF9FAB6F6E68B23086497324D6FD117",
+        // )).unwrap(),
+        // aux_rand: Some(hex_to_bytes::<32>(
+        // "0000000000000000000000000000000000000000000000000000000000000000",
+        // )),
+        // message: Some(
+        // hex::decode("99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999").unwrap(),
+        // ),
+        // signature: Signature {
+        // value: hex_to_bytes(
+        // "403B12B0D8555A344175EA7EC746566303321E5DBFA8BE6F091635163ECA79A8585ED3E3170807E7C03B720FC54C7B23897FCBA0E9D0B4A06894CFD249F22367",
+        // ),
+        // },
+        // verification_result: true,
+        // },
     ]
 }
 

nssa/src/signature/mod.rs

@@ -37,7 +37,7 @@ impl FromStr for Signature {
 
 impl Signature {
     #[must_use]
-    pub fn new(key: &PrivateKey, message: &[u8]) -> Self {
+    pub fn new(key: &PrivateKey, message: &[u8; 32]) -> Self {
         let mut aux_random = [0_u8; 32];
         OsRng.fill_bytes(&mut aux_random);
         Self::new_with_aux_random(key, message, aux_random)
@@ -45,14 +45,14 @@ impl Signature {
 
     pub(crate) fn new_with_aux_random(
         key: &PrivateKey,
-        message: &[u8],
+        message: &[u8; 32],
         aux_random: [u8; 32],
     ) -> Self {
         let value = {
             let signing_key = k256::schnorr::SigningKey::from_bytes(key.value())
                 .expect("Expect valid signing key");
             signing_key
-                .sign_raw(message, &aux_random)
+                .sign_prehash_with_aux_rand(message, &aux_random)
                 .expect("Expect to produce a valid signature")
                 .to_bytes()
         };
@@ -114,7 +114,7 @@ mod tests {
     #[test]
     fn signature_verification_from_bip340_test_vectors() {
         for (i, test_vector) in bip340_test_vectors::test_vectors().into_iter().enumerate() {
-            let message = test_vector.message.unwrap_or(vec![]);
+            let message = test_vector.message.unwrap_or([0_u8; 32]);
             let expected_result = test_vector.verification_result;
 
             let result = test_vector