Qortal/pirate-librustzcash
1
0
Fork 1
mirror of https://github.com/Qortal/pirate-librustzcash.git synced 2025-07-30 20:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate Sapling key agreement logic

Browse Source
This commit is contained in:
Jack Grigg
2019-03-23 17:51:30 +13:00
parent 247f3fb038
commit 2b1583d75f
3 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
zcash_primitives/src/note_encryption.rs
View File

@@ -128,14 +128,21 @@ fn generate_esk() -> Fs {
Fs::to_uniform(&buffer[..])
}
fn sapling_ka_agree(esk: &Fs, pk_d: &edwards::Point<Bls12, PrimeOrder>) -> Vec<u8> {
let ka = pk_d
.mul(esk.into_repr(), &JUBJUB)
.double(&JUBJUB)
.double(&JUBJUB)
.double(&JUBJUB);
let mut result = Vec::with_capacity(32);
ka.write(&mut result).expect("length is not 32 bytes");
pub fn sapling_ka_agree<'a, P>(esk: &Fs, pk_d: &'a P) -> [u8; 32]
where
edwards::Point<Bls12, Unknown>: From<&'a P>,
{
let p: edwards::Point<Bls12, Unknown> = pk_d.into();
// Multiply by 8
let p = p.mul_by_cofactor(&JUBJUB);
// Multiply by esk
let p = p.mul(*esk, &JUBJUB);
// Produce result
let mut result = [0; 32];
p.write(&mut result[..]).expect("length is not 32 bytes");
result
}
@@ -294,7 +301,7 @@ pub fn try_sapling_note_decryption(
cmu: &Fr,
enc_ciphertext: &[u8],
) -> Option<(Note<Bls12>, PaymentAddress<Bls12>, Memo)> {
let shared_secret = sapling_ka_agree(&ivk, &epk);
let shared_secret = sapling_ka_agree(ivk, epk);
let key = kdf_sapling(&shared_secret, &epk);
let mut plaintext = Vec::with_capacity(564);
@@ -328,7 +335,7 @@ pub fn try_sapling_compact_note_decryption(
cmu: &Fr,
enc_ciphertext: &[u8],
) -> Option<(Note<Bls12>, PaymentAddress<Bls12>)> {
let shared_secret = sapling_ka_agree(&ivk, &epk);
let shared_secret = sapling_ka_agree(ivk, epk);
let key = kdf_sapling(&shared_secret, &epk);
let nonce = [0u8; 12];