Browse Source

Use fixed-length arrays instead of Vec

master
Jack Grigg 5 years ago
parent
commit
75bede4bc8
No known key found for this signature in database
GPG Key ID: 9E8255172BBF9898
  1. 28
      zcash_primitives/src/note_encryption.rs

28
zcash_primitives/src/note_encryption.rs

@ -299,15 +299,18 @@ impl SaplingNoteEncryption {
// Note plaintext encoding is defined in section 5.5 of the Zcash Protocol // Note plaintext encoding is defined in section 5.5 of the Zcash Protocol
// Specification. // Specification.
let mut input = Vec::with_capacity(NOTE_PLAINTEXT_SIZE); let mut input = [0; NOTE_PLAINTEXT_SIZE];
input.push(1); input[0] = 1;
input.extend_from_slice(&self.to.diversifier.0); input[1..12].copy_from_slice(&self.to.diversifier.0);
(&mut input) (&mut input[12..20])
.write_u64::<LittleEndian>(self.note.value) .write_u64::<LittleEndian>(self.note.value)
.unwrap(); .unwrap();
self.note.r.into_repr().write_le(&mut input).unwrap(); self.note
input.extend_from_slice(&self.memo.0); .r
assert_eq!(input.len(), NOTE_PLAINTEXT_SIZE); .into_repr()
.write_le(&mut input[20..COMPACT_NOTE_SIZE])
.unwrap();
input[COMPACT_NOTE_SIZE..NOTE_PLAINTEXT_SIZE].copy_from_slice(&self.memo.0);
let mut output = [0u8; ENC_CIPHERTEXT_SIZE]; let mut output = [0u8; ENC_CIPHERTEXT_SIZE];
assert_eq!( assert_eq!(
@ -395,7 +398,7 @@ pub fn try_sapling_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 mut plaintext = vec![0; ENC_CIPHERTEXT_SIZE]; let mut plaintext = [0; ENC_CIPHERTEXT_SIZE];
assert_eq!( assert_eq!(
ChachaPolyIetf::aead_cipher() ChachaPolyIetf::aead_cipher()
.open_to( .open_to(
@ -439,9 +442,8 @@ pub fn try_sapling_compact_note_decryption(
// Prefix plaintext with 64 zero-bytes to skip over Poly1305 keying output // Prefix plaintext with 64 zero-bytes to skip over Poly1305 keying output
const CHACHA20_BLOCK_SIZE: usize = 64; const CHACHA20_BLOCK_SIZE: usize = 64;
let mut plaintext = Vec::with_capacity(CHACHA20_BLOCK_SIZE + COMPACT_NOTE_SIZE); let mut plaintext = [0; CHACHA20_BLOCK_SIZE + COMPACT_NOTE_SIZE];
plaintext.extend_from_slice(&[0; CHACHA20_BLOCK_SIZE]); plaintext[CHACHA20_BLOCK_SIZE..].copy_from_slice(&enc_ciphertext[0..COMPACT_NOTE_SIZE]);
plaintext.extend_from_slice(&enc_ciphertext[0..COMPACT_NOTE_SIZE]);
assert_eq!( assert_eq!(
ChaCha20Ietf::cipher() ChaCha20Ietf::cipher()
.decrypt( .decrypt(
@ -477,7 +479,7 @@ pub fn try_sapling_output_recovery(
let ock = prf_ock(&ovk, &cv, &cmu, &epk); let ock = prf_ock(&ovk, &cv, &cmu, &epk);
let mut op = vec![0; OUT_CIPHERTEXT_SIZE]; let mut op = [0; OUT_CIPHERTEXT_SIZE];
assert_eq!( assert_eq!(
ChachaPolyIetf::aead_cipher() ChachaPolyIetf::aead_cipher()
.open_to(&mut op, &out_ciphertext, &[], ock.as_bytes(), &[0u8; 12]) .open_to(&mut op, &out_ciphertext, &[], ock.as_bytes(), &[0u8; 12])
@ -496,7 +498,7 @@ pub fn try_sapling_output_recovery(
let shared_secret = sapling_ka_agree(&esk, &pk_d); let shared_secret = sapling_ka_agree(&esk, &pk_d);
let key = kdf_sapling(&shared_secret, &epk); let key = kdf_sapling(&shared_secret, &epk);
let mut plaintext = vec![0; ENC_CIPHERTEXT_SIZE]; let mut plaintext = [0; ENC_CIPHERTEXT_SIZE];
assert_eq!( assert_eq!(
ChachaPolyIetf::aead_cipher() ChachaPolyIetf::aead_cipher()
.open_to( .open_to(

Loading…
Cancel
Save