diff --git a/src/rust/include/librustzcash.h b/src/rust/include/librustzcash.h index 81f009515..8fde5eade 100644 --- a/src/rust/include/librustzcash.h +++ b/src/rust/include/librustzcash.h @@ -204,7 +204,7 @@ extern "C" { const unsigned char *diversifier, const unsigned char *pk_d, const uint64_t value, - const unsigned char *r, + const unsigned char *rcm, const unsigned char *ak, const unsigned char *nk, const uint64_t position, @@ -221,7 +221,7 @@ extern "C" { const unsigned char *diversifier, const unsigned char *pk_d, const uint64_t value, - const unsigned char *r, + const unsigned char *rcm, unsigned char *result ); diff --git a/src/rust/src/rustzcash.rs b/src/rust/src/rustzcash.rs index 1ce0dfe85..9ee34332e 100644 --- a/src/rust/src/rustzcash.rs +++ b/src/rust/src/rustzcash.rs @@ -327,7 +327,7 @@ fn priv_get_note( diversifier: *const [c_uchar; 11], pk_d: *const [c_uchar; 32], value: u64, - r: *const [c_uchar; 32], + rcm: *const [c_uchar; 32], ) -> Result { let diversifier = Diversifier(unsafe { *diversifier }); let g_d = diversifier.g_d().ok_or(())?; @@ -339,7 +339,7 @@ fn priv_get_note( // Deserialize randomness // 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. - 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 { value, @@ -362,13 +362,13 @@ pub extern "C" fn librustzcash_sapling_compute_nf( diversifier: *const [c_uchar; 11], pk_d: *const [c_uchar; 32], value: u64, - r: *const [c_uchar; 32], + rcm: *const [c_uchar; 32], ak: *const [c_uchar; 32], nk: *const [c_uchar; 32], position: u64, result: *mut [c_uchar; 32], ) -> 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, Err(_) => return false, }; @@ -412,10 +412,10 @@ pub extern "C" fn librustzcash_sapling_compute_cmu( diversifier: *const [c_uchar; 11], pk_d: *const [c_uchar; 32], value: u64, - r: *const [c_uchar; 32], + rcm: *const [c_uchar; 32], result: *mut [c_uchar; 32], ) -> 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, Err(_) => return false, };