Merge pull request #2460 from oasisprotocol/peternose/trivial/revert-nonce-trim

runtime-sdk/modules/evm/src/precompile/confidential: Revert validation

Author: peternose

runtime-sdk/modules/evm/fuzz/precompile_corpus.rs

@@ -16,7 +16,7 @@ fn gen_test_vectors(fixture: &str) -> Box<dyn Iterator<Item = Vec<u8>>> {
 
 fn gen_x25519() -> Box<dyn Iterator<Item = Vec<u8>>> {
     let key = b"this must be the excelentest key";
-    let nonce = b"short nonce\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+    let nonce = b"complete noncence, and too long.";
     let plaintext = b"0123456789";
     let ad = b"additional data";
 

runtime-sdk/modules/evm/src/precompile/confidential.rs

@@ -185,12 +185,6 @@ fn decode_deoxysii_call_args(
     let text = text.to_vec();
     let ad = ad.to_vec();
 
-    if nonce_bytes[NONCE_SIZE..].iter().any(|&x| x != 0) {
-        return Err(PrecompileFailure::Error {
-            exit_status: ExitError::Other("invalid nonce size".into()),
-        });
-    }
-
     let mut nonce = [0u8; NONCE_SIZE];
     nonce.copy_from_slice(&nonce_bytes[..NONCE_SIZE]);
     let mut key = [0u8; KEY_SIZE];
@@ -505,7 +499,7 @@ mod test {
     #[test]
     fn test_deoxysii() {
         let key = b"this must be the excelentest key";
-        let nonce = b"short nonce\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+        let nonce = b"complete noncence, and too long.";
         let plaintext = b"0123456789";
         let ad = b"additional data";
         let ret_ct = call_contract(
@@ -541,28 +535,6 @@ mod test {
         assert_eq!(plaintext.as_slice(), ret_pt.output);
     }
 
-    #[test]
-    fn test_deoxysii_invalid_nonce() {
-        let key = b"this must be the excelentest key";
-        let nonce = b"invalid nonce, which is too long";
-        let plaintext = b"0123456789";
-        let ad = b"additional data";
-        let _ = call_contract(
-            H160([
-                0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x03,
-            ]),
-            &solabi::encode(&(
-                solabi::Bytes::<[u8; 32]>(*key),
-                solabi::Bytes::<[u8; 32]>(*nonce),
-                solabi::Bytes(plaintext.to_vec()),
-                solabi::Bytes(ad.to_vec()),
-            )),
-            10_000_000,
-        )
-        .expect("call should return something")
-        .expect_err("call should fail");
-    }
-
     #[test]
     fn test_random_bytes() {
         let ret = call_contract(
@@ -579,7 +551,7 @@ mod test {
     #[bench]
     fn bench_deoxysii_short(b: &mut Bencher) {
         let key = b"this must be the excelentest key";
-        let nonce = b"short nonce\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+        let nonce = b"complete noncence, and too long.";
         let plaintext = b"01234567890123456789";
         let ad = b"additional data";
         b.iter(|| {
@@ -603,7 +575,7 @@ mod test {
     #[bench]
     fn bench_deoxysii_long(b: &mut Bencher) {
         let key = b"this must be the excelentest key";
-        let nonce = b"short nonce\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+        let nonce = b"complete noncence, and too long.";
         let plaintext = b"0123456789".repeat(200);
         let ad = b"additional data";
         b.iter(|| {