Upgrade dependencies

pairing/src/bls12_381/ec.rs

@@ -955,7 +955,7 @@ pub mod g1 {
                 let negyrepr = negy.into_repr();
 
                 let p = G1Affine {
-                    x: x,
+                    x,
                     y: if yrepr < negyrepr { y } else { negy },
                     infinity: false,
                 };
@@ -1637,7 +1637,7 @@ pub mod g2 {
                 negy.negate();
 
                 let p = G2Affine {
-                    x: x,
+                    x,
                     y: if y < negy { y } else { negy },
                     infinity: false,
                 };

pairing/src/bls12_381/fq12.rs

@@ -168,8 +168,8 @@ fn test_fq12_mul_by_014() {
         a.mul_by_014(&c0, &c1, &c5);
         b.mul_assign(&Fq12 {
             c0: Fq6 {
-                c0: c0,
-                c1: c1,
+                c0,
+                c1,
                 c2: Fq2::zero(),
             },
             c1: Fq6 {

pairing/src/bls12_381/fq6.rs

@@ -343,7 +343,7 @@ fn test_fq6_mul_by_1() {
         a.mul_by_1(&c1);
         b.mul_assign(&Fq6 {
             c0: Fq2::zero(),
-            c1: c1,
+            c1,
             c2: Fq2::zero(),
         });
 
@@ -366,8 +366,8 @@ fn test_fq6_mul_by_01() {
 
         a.mul_by_01(&c0, &c1);
         b.mul_assign(&Fq6 {
-            c0: c0,
-            c1: c1,
+            c0,
+            c1,
             c2: Fq2::zero(),
         });
 

pairing/src/lib.rs

@@ -2,12 +2,12 @@
 // common mistakes or strange code patterns. If the `cargo-clippy` feature
 // is provided, all compiler warnings are prohibited.
 #![cfg_attr(feature = "cargo-clippy", deny(warnings))]
-#![cfg_attr(feature = "cargo-clippy", allow(inline_always))]
-#![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]
-#![cfg_attr(feature = "cargo-clippy", allow(unreadable_literal))]
-#![cfg_attr(feature = "cargo-clippy", allow(many_single_char_names))]
-#![cfg_attr(feature = "cargo-clippy", allow(new_without_default_derive))]
-#![cfg_attr(feature = "cargo-clippy", allow(write_literal))]
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::inline_always))]
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::too_many_arguments))]
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::unreadable_literal))]
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::many_single_char_names))]
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::new_without_default))]
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::write_literal))]
 // Force public structures to implement Debug
 #![deny(missing_debug_implementations)]
 
@@ -100,7 +100,7 @@ pub trait Engine: ScalarEngine {
         G2: Into<Self::G2Affine>,
     {
         Self::final_exponentiation(&Self::miller_loop(
-            [(&(p.into().prepare()), &(q.into().prepare()))].into_iter(),
+            [(&(p.into().prepare()), &(q.into().prepare()))].iter(),
         )).unwrap()
     }
 }

sapling-crypto/Cargo.toml

@@ -18,7 +18,7 @@ blake2b_simd = "0.5"
 blake2s_simd = "0.5"
 ff = { path = "../ff" }
 rand_core = "0.5"
-digest = "0.7"
+digest = "0.8"
 byteorder = "1"
 
 [dev-dependencies]

zcash_client_backend/Cargo.toml

@@ -7,7 +7,7 @@ authors = [
 edition = "2018"
 
 [dependencies]
-bech32 = "0.6"
+bech32 = "0.7"
 pairing = { path = "../pairing" }
 sapling-crypto = { path = "../sapling-crypto" }
 zcash_primitives = { path = "../zcash_primitives" }

zcash_client_backend/src/encoding.rs

@@ -3,7 +3,7 @@
 //! Human-Readable Prefixes (HRPs) for Bech32 encodings are located in the [`constants`]
 //! module.
 
-use bech32::{convert_bits, Bech32, Error};
+use bech32::{self, Error, FromBase32, ToBase32};
 use pairing::bls12_381::Bls12;
 use sapling_crypto::{
     jubjub::edwards,
@@ -21,21 +21,16 @@ where
 {
     let mut data: Vec<u8> = vec![];
     write(&mut data).expect("Should be able to write to a Vec");
-
-    let converted =
-        convert_bits(&data, 8, 5, true).expect("Should be able to convert Vec<u8> to Vec<u5>");
-    let encoded = Bech32::new_check_data(hrp.into(), converted).expect("hrp is not empty");
-
-    encoded.to_string()
+    bech32::encode(hrp, data.to_base32()).expect("hrp is invalid")
 }
 
 fn bech32_decode<T, F>(hrp: &str, s: &str, read: F) -> Result<Option<T>, Error>
 where
     F: Fn(Vec<u8>) -> Option<T>,
 {
-    let decoded = s.parse::<Bech32>()?;
-    if decoded.hrp() == hrp {
-        convert_bits(decoded.data(), 5, 8, false).map(|data| read(data))
+    let (decoded_hrp, data) = bech32::decode(s)?;
+    if decoded_hrp == hrp {
+        Vec::<u8>::from_base32(&data).map(|data| read(data))
     } else {
         Ok(None)
     }

zcash_primitives/Cargo.toml

@@ -6,12 +6,12 @@ authors = [
 ]
 
 [dependencies]
-aes = "0.2"
+aes = "0.3"
 blake2b_simd = "0.5"
 byteorder = "1"
-crypto_api_chachapoly = "0.1"
+crypto_api_chachapoly = "0.2.1"
 ff = { path = "../ff" }
-fpe = "0.1"
+fpe = "0.2"
 hex = "0.3"
 lazy_static = "1"
 pairing = { path = "../pairing" }

zcash_primitives/src/note_encryption.rs

@@ -444,23 +444,12 @@ pub fn try_sapling_compact_note_decryption(
     let shared_secret = sapling_ka_agree(ivk, epk);
     let key = kdf_sapling(shared_secret, &epk);
 
-    // Prefix plaintext with 64 zero-bytes to skip over Poly1305 keying output
-    const CHACHA20_BLOCK_SIZE: usize = 64;
-    let mut plaintext = [0; CHACHA20_BLOCK_SIZE + COMPACT_NOTE_SIZE];
-    plaintext[CHACHA20_BLOCK_SIZE..].copy_from_slice(&enc_ciphertext[0..COMPACT_NOTE_SIZE]);
-    assert_eq!(
-        ChaCha20Ietf::cipher()
-            .decrypt(
-                &mut plaintext,
-                CHACHA20_BLOCK_SIZE + COMPACT_NOTE_SIZE,
-                key.as_bytes(),
-                &[0u8; 12],
-            )
-            .ok()?,
-        CHACHA20_BLOCK_SIZE + COMPACT_NOTE_SIZE
-    );
+    // Start from block 1 to skip over Poly1305 keying output
+    let mut plaintext = [0; COMPACT_NOTE_SIZE];
+    plaintext.copy_from_slice(&enc_ciphertext);
+    ChaCha20Ietf::xor(key.as_bytes(), &[0u8; 12], 1, &mut plaintext);
 
-    parse_note_plaintext_without_memo(ivk, cmu, &plaintext[CHACHA20_BLOCK_SIZE..])
+    parse_note_plaintext_without_memo(ivk, cmu, &plaintext)
 }
 
 /// Recovery of the full note plaintext by the sender.