zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FFI: Rename r to rcm

This commit is contained in:
Jack Grigg 2020-08-25 17:30:38 +01:00
parent fbe54c4b6c
commit 6c1204b228
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rust/include/librustzcash.h
View File

@ -204,7 +204,7 @@ extern "C" {
const unsigned char *diversifier, const unsigned char *diversifier,
const unsigned char *pk_d, const unsigned char *pk_d,
const uint64_t value, const uint64_t value,
const unsigned char *r, const unsigned char *rcm,
const unsigned char *ak, const unsigned char *ak,
const unsigned char *nk, const unsigned char *nk,
const uint64_t position, const uint64_t position,
@ -221,7 +221,7 @@ extern "C" {
const unsigned char *diversifier, const unsigned char *diversifier,
const unsigned char *pk_d, const unsigned char *pk_d,
const uint64_t value, const uint64_t value,
const unsigned char *r, const unsigned char *rcm,
unsigned char *result unsigned char *result
); );

12
src/rust/src/rustzcash.rs
View File

@ -327,7 +327,7 @@ fn priv_get_note(
diversifier: *const [c_uchar; 11], diversifier: *const [c_uchar; 11],
pk_d: *const [c_uchar; 32], pk_d: *const [c_uchar; 32],
value: u64, value: u64,
r: *const [c_uchar; 32], rcm: *const [c_uchar; 32],
) -> Result<Note, ()> { ) -> Result<Note, ()> {
let diversifier = Diversifier(unsafe { *diversifier }); let diversifier = Diversifier(unsafe { *diversifier });
let g_d = diversifier.g_d().ok_or(())?; let g_d = diversifier.g_d().ok_or(())?;
@ -339,7 +339,7 @@ fn priv_get_note(
// Deserialize randomness // Deserialize randomness
// If this is after ZIP 212, the caller has calculated rcm, and we don't need to call // If this is after ZIP 212, the caller has calculated rcm, and we don't need to call
// Note::derive_esk, so we just pretend the note was using this rcm all along. // Note::derive_esk, so we just pretend the note was using this rcm all along.
let rseed = Rseed::BeforeZip212(de_ct(jubjub::Scalar::from_bytes(unsafe { &*r })).ok_or(())?); let rseed = Rseed::BeforeZip212(de_ct(jubjub::Scalar::from_bytes(unsafe { &*rcm })).ok_or(())?);
let note = Note { let note = Note {
value, value,
@ -362,13 +362,13 @@ pub extern "C" fn librustzcash_sapling_compute_nf(
diversifier: *const [c_uchar; 11], diversifier: *const [c_uchar; 11],
pk_d: *const [c_uchar; 32], pk_d: *const [c_uchar; 32],
value: u64, value: u64,
r: *const [c_uchar; 32], rcm: *const [c_uchar; 32],
ak: *const [c_uchar; 32], ak: *const [c_uchar; 32],
nk: *const [c_uchar; 32], nk: *const [c_uchar; 32],
position: u64, position: u64,
result: *mut [c_uchar; 32], result: *mut [c_uchar; 32],
) -> bool { ) -> bool {
let note = match priv_get_note(diversifier, pk_d, value, r) { let note = match priv_get_note(diversifier, pk_d, value, rcm) {
Ok(p) => p, Ok(p) => p,
Err(_) => return false, Err(_) => return false,
}; };
@ -412,10 +412,10 @@ pub extern "C" fn librustzcash_sapling_compute_cmu(
diversifier: *const [c_uchar; 11], diversifier: *const [c_uchar; 11],
pk_d: *const [c_uchar; 32], pk_d: *const [c_uchar; 32],
value: u64, value: u64,
r: *const [c_uchar; 32], rcm: *const [c_uchar; 32],
result: *mut [c_uchar; 32], result: *mut [c_uchar; 32],
) -> bool { ) -> bool {
let note = match priv_get_note(diversifier, pk_d, value, r) { let note = match priv_get_note(diversifier, pk_d, value, rcm) {
Ok(p) => p, Ok(p) => p,
Err(_) => return false, Err(_) => return false,
}; };