DragonX/librustzcash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inline empty nonces

Browse Source
This commit is contained in:
Jack Grigg
2019-03-23 17:55:09 +13:00
parent 566db65a91
commit 899d852c39
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
zcash_primitives/src/note_encryption.rs
View File

@@ -214,8 +214,6 @@ impl SaplingNoteEncryption {
let shared_secret = sapling_ka_agree(&self.esk, &self.to.pk_d); let shared_secret = sapling_ka_agree(&self.esk, &self.to.pk_d);
let key = kdf_sapling(&shared_secret, &self.epk); let key = kdf_sapling(&shared_secret, &self.epk);
let nonce = [0u8; 12];
let mut input = Vec::with_capacity(564); let mut input = Vec::with_capacity(564);
input.push(1); input.push(1);
input.extend_from_slice(&self.to.diversifier.0); input.extend_from_slice(&self.to.diversifier.0);
@@ -226,9 +224,14 @@ impl SaplingNoteEncryption {
input.extend_from_slice(&self.memo.0); input.extend_from_slice(&self.memo.0);
let mut ciphertext = Vec::with_capacity(564); let mut ciphertext = Vec::with_capacity(564);
let tag = let tag = chacha20_poly1305_aead::encrypt(
chacha20_poly1305_aead::encrypt(&key.as_bytes(), &nonce, &[], &input, &mut ciphertext) &key.as_bytes(),
.unwrap(); &[0u8; 12],
&[],
&input,
&mut ciphertext,
)
.unwrap();
let mut output = [0u8; 580]; let mut output = [0u8; 580];
output[0..564].copy_from_slice(&ciphertext); output[0..564].copy_from_slice(&ciphertext);
@@ -248,9 +251,9 @@ impl SaplingNoteEncryption {
self.esk.into_repr().write_le(&mut input[32..64]).unwrap(); self.esk.into_repr().write_le(&mut input[32..64]).unwrap();
let mut buffer = Vec::with_capacity(64); let mut buffer = Vec::with_capacity(64);
let nonce = [0u8; 12]; let tag =
let tag = chacha20_poly1305_aead::encrypt(key.as_bytes(), &nonce, &[], &input, &mut buffer) chacha20_poly1305_aead::encrypt(key.as_bytes(), &[0u8; 12], &[], &input, &mut buffer)
.unwrap(); .unwrap();
let mut output = [0u8; 80]; let mut output = [0u8; 80];
output[0..64].copy_from_slice(&buffer); output[0..64].copy_from_slice(&buffer);
@@ -305,10 +308,9 @@ pub fn try_sapling_note_decryption(
let key = kdf_sapling(&shared_secret, &epk); let key = kdf_sapling(&shared_secret, &epk);
let mut plaintext = Vec::with_capacity(564); let mut plaintext = Vec::with_capacity(564);
let nonce = [0u8; 12];
chacha20_poly1305_aead::decrypt( chacha20_poly1305_aead::decrypt(
key.as_bytes(), key.as_bytes(),
&nonce, &[0u8; 12],
&[], &[],
&enc_ciphertext[..564], &enc_ciphertext[..564],
&enc_ciphertext[564..], &enc_ciphertext[564..],
@@ -338,8 +340,7 @@ pub fn try_sapling_compact_note_decryption(
let shared_secret = sapling_ka_agree(ivk, epk); let shared_secret = sapling_ka_agree(ivk, epk);
let key = kdf_sapling(&shared_secret, &epk); let key = kdf_sapling(&shared_secret, &epk);
let nonce = [0u8; 12]; let mut chacha20 = ChaCha20::new(key.as_bytes(), &[0u8; 12]);
let mut chacha20 = ChaCha20::new(key.as_bytes(), &nonce);
// Skip over Poly1305 keying output // Skip over Poly1305 keying output
chacha20.next(); chacha20.next();
@@ -366,13 +367,12 @@ pub fn try_sapling_output_recovery(
enc_ciphertext: &[u8], enc_ciphertext: &[u8],
out_ciphertext: &[u8], out_ciphertext: &[u8],
) -> Option<(Note<Bls12>, PaymentAddress<Bls12>, Memo)> { ) -> Option<(Note<Bls12>, PaymentAddress<Bls12>, Memo)> {
let nonce = [0u8; 12];
let ock = prf_ock(&ovk, &cv, &cmu, &epk); let ock = prf_ock(&ovk, &cv, &cmu, &epk);
let mut op = Vec::with_capacity(64); let mut op = Vec::with_capacity(64);
chacha20_poly1305_aead::decrypt( chacha20_poly1305_aead::decrypt(
ock.as_bytes(), ock.as_bytes(),
&nonce, &[0u8; 12],
&[], &[],
&out_ciphertext[..64], &out_ciphertext[..64],
&out_ciphertext[64..], &out_ciphertext[64..],
@@ -394,7 +394,7 @@ pub fn try_sapling_output_recovery(
let mut plaintext = Vec::with_capacity(564); let mut plaintext = Vec::with_capacity(564);
chacha20_poly1305_aead::decrypt( chacha20_poly1305_aead::decrypt(
key.as_bytes(), key.as_bytes(),
&nonce, &[0u8; 12],
&[], &[],
&enc_ciphertext[..564], &enc_ciphertext[..564],
&enc_ciphertext[564..], &enc_ciphertext[564..],