Add shorter sig / pubkey tests

Author: maurolacy

packages/vm/src/imports.rs

@@ -1014,6 +1014,7 @@ mod tests {
         let mut hash =
             hex::decode("5ae8317d34d1e595e3fa7247db80c0af4320cce1116de187f8f7e2e099c0d8d0")
                 .unwrap();
+        // extend / break hash
         hash.push(0x00);
         let hash_ptr = write_data(&env, &hash);
         let sig = hex::decode("207082eb2c3dfa0b454e0906051270ba4074ac93760ba9e7110cd9471475111151eb0dbbc9920e72146fb564f99d039802bf6ef2561446eb126ef364d21ee9c4").unwrap();
@@ -1039,6 +1040,7 @@ mod tests {
         let mut hash =
             hex::decode("5ae8317d34d1e595e3fa7247db80c0af4320cce1116de187f8f7e2e099c0d8d0")
                 .unwrap();
+        // reduce / break hash
         hash.pop();
         let hash_ptr = write_data(&env, &hash);
         let sig = hex::decode("207082eb2c3dfa0b454e0906051270ba4074ac93760ba9e7110cd9471475111151eb0dbbc9920e72146fb564f99d039802bf6ef2561446eb126ef364d21ee9c4").unwrap();
@@ -1081,7 +1083,7 @@ mod tests {
     }
 
     #[test]
-    fn do_secp256k1_verify_wrong_sig_length_fails() {
+    fn do_secp256k1_verify_larger_sig_fails() {
         let api = MockApi::default();
         let (env, mut _instance) = make_instance(api.clone());
 
@@ -1106,58 +1108,57 @@ mod tests {
     }
 
     #[test]
-    fn do_secp256k1_verify_wrong_pubkey_fails() {
+    fn do_secp256k1_verify_shorter_sig_fails() {
         let api = MockApi::default();
         let (env, mut _instance) = make_instance(api.clone());
 
         let hash = hex::decode("5ae8317d34d1e595e3fa7247db80c0af4320cce1116de187f8f7e2e099c0d8d0")
             .unwrap();
         let hash_ptr = write_data(&env, &hash);
-        let sig = hex::decode("207082eb2c3dfa0b454e0906051270ba4074ac93760ba9e7110cd9471475111151eb0dbbc9920e72146fb564f99d039802bf6ef2561446eb126ef364d21ee9c4").unwrap();
+        let mut sig = hex::decode("207082eb2c3dfa0b454e0906051270ba4074ac93760ba9e7110cd9471475111151eb0dbbc9920e72146fb564f99d039802bf6ef2561446eb126ef364d21ee9c4").unwrap();
+        // reduce / break sig
+        sig.pop();
         let sig_ptr = write_data(&env, &sig);
-        let mut pubkey = hex::decode("04051c1ee2190ecfb174bfe4f90763f2b4ff7517b70a2aec1876ebcfd644c4633fb03f3cfbd94b1f376e34592d9d41ccaf640bb751b00a1fadeb0c01157769eb73").unwrap();
-        // alter pubkey
-        pubkey[0] ^= 0x01;
+        let pubkey = hex::decode("04051c1ee2190ecfb174bfe4f90763f2b4ff7517b70a2aec1876ebcfd644c4633fb03f3cfbd94b1f376e34592d9d41ccaf640bb751b00a1fadeb0c01157769eb73").unwrap();
         let pubkey_ptr = write_data(&env, &pubkey);
 
         let result = do_secp256k1_verify::<MA, MS, MQ>(&env, hash_ptr, sig_ptr, pubkey_ptr);
         match result.unwrap_err() {
-            VmError::CryptoErr { source, .. } => match source {
-                CryptoError::GenericErr { msg, .. } => {
-                    assert_eq!(msg, "signature error");
-                }
-                err => panic!("Incorrect crypto error returned: {:?}", err),
-            },
-            err => panic!("Incorrect error returned: {:?}", err),
+            VmError::CryptoErr {
+                source: CryptoError::GenericErr { msg, .. },
+                ..
+            } => assert_eq!(msg, "signature error"),
+            e => panic!("Unexpected error: {:?}", e),
         }
     }
 
     #[test]
-    fn do_secp256k1_verify_wrong_data_fails() {
+    fn do_secp256k1_verify_wrong_pubkey_fails() {
         let api = MockApi::default();
         let (env, mut _instance) = make_instance(api.clone());
 
-        let hash = vec![0x22; MAX_LENGTH_MESSAGE_HASH];
+        let hash = hex::decode("5ae8317d34d1e595e3fa7247db80c0af4320cce1116de187f8f7e2e099c0d8d0")
+            .unwrap();
         let hash_ptr = write_data(&env, &hash);
-        let sig = vec![0x22; MAX_LENGTH_SIGNATURE];
+        let sig = hex::decode("207082eb2c3dfa0b454e0906051270ba4074ac93760ba9e7110cd9471475111151eb0dbbc9920e72146fb564f99d039802bf6ef2561446eb126ef364d21ee9c4").unwrap();
         let sig_ptr = write_data(&env, &sig);
-        let pubkey = vec![0x22; MAX_LENGTH_PUBKEY];
+        let mut pubkey = hex::decode("04051c1ee2190ecfb174bfe4f90763f2b4ff7517b70a2aec1876ebcfd644c4633fb03f3cfbd94b1f376e34592d9d41ccaf640bb751b00a1fadeb0c01157769eb73").unwrap();
+        // alter pubkey
+        pubkey[0] ^= 0x01;
         let pubkey_ptr = write_data(&env, &pubkey);
 
         let result = do_secp256k1_verify::<MA, MS, MQ>(&env, hash_ptr, sig_ptr, pubkey_ptr);
         match result.unwrap_err() {
-            VmError::CryptoErr { source, .. } => match source {
-                CryptoError::GenericErr { msg, .. } => {
-                    assert_eq!(msg, "signature error");
-                }
-                err => panic!("Incorrect crypto error returned: {:?}", err),
-            },
+            VmError::CryptoErr {
+                source: CryptoError::GenericErr { msg, .. },
+                ..
+            } => assert_eq!(msg, "signature error"),
             err => panic!("Incorrect error returned: {:?}", err),
         }
     }
 
     #[test]
-    fn do_secp256k1_verify_wrong_pubkey_length_fails() {
+    fn do_secp256k1_verify_larger_pubkey_fails() {
         let api = MockApi::default();
         let (env, mut _instance) = make_instance(api.clone());
 
@@ -1181,6 +1182,53 @@ mod tests {
         }
     }
 
+    #[test]
+    fn do_secp256k1_verify_shorter_pubkey_fails() {
+        let api = MockApi::default();
+        let (env, mut _instance) = make_instance(api.clone());
+
+        let hash = hex::decode("5ae8317d34d1e595e3fa7247db80c0af4320cce1116de187f8f7e2e099c0d8d0")
+            .unwrap();
+        let hash_ptr = write_data(&env, &hash);
+        let sig = hex::decode("207082eb2c3dfa0b454e0906051270ba4074ac93760ba9e7110cd9471475111151eb0dbbc9920e72146fb564f99d039802bf6ef2561446eb126ef364d21ee9c4").unwrap();
+        let sig_ptr = write_data(&env, &sig);
+        let mut pubkey = hex::decode("04051c1ee2190ecfb174bfe4f90763f2b4ff7517b70a2aec1876ebcfd644c4633fb03f3cfbd94b1f376e34592d9d41ccaf640bb751b00a1fadeb0c01157769eb73").unwrap();
+        // reduce / break pubkey
+        pubkey.pop();
+        let pubkey_ptr = write_data(&env, &pubkey);
+
+        let result = do_secp256k1_verify::<MA, MS, MQ>(&env, hash_ptr, sig_ptr, pubkey_ptr);
+        match result.unwrap_err() {
+            VmError::CryptoErr {
+                source: CryptoError::GenericErr { msg, .. },
+                ..
+            } => assert_eq!(msg, "signature error"),
+            err => panic!("Incorrect error returned: {:?}", err),
+        }
+    }
+
+    #[test]
+    fn do_secp256k1_verify_wrong_data_fails() {
+        let api = MockApi::default();
+        let (env, mut _instance) = make_instance(api.clone());
+
+        let hash = vec![0x22; MAX_LENGTH_MESSAGE_HASH];
+        let hash_ptr = write_data(&env, &hash);
+        let sig = vec![0x22; MAX_LENGTH_SIGNATURE];
+        let sig_ptr = write_data(&env, &sig);
+        let pubkey = vec![0x22; MAX_LENGTH_PUBKEY];
+        let pubkey_ptr = write_data(&env, &pubkey);
+
+        let result = do_secp256k1_verify::<MA, MS, MQ>(&env, hash_ptr, sig_ptr, pubkey_ptr);
+        match result.unwrap_err() {
+            VmError::CryptoErr {
+                source: CryptoError::GenericErr { msg, .. },
+                ..
+            } => assert_eq!(msg, "signature error"),
+            err => panic!("Incorrect error returned: {:?}", err),
+        }
+    }
+
     #[test]
     fn do_query_chain_works() {
         let api = MockApi::default();