Ecosystem/serai
Ecosystem/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-03-12 09:26:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use Zeroize for the ViewPair

Browse source
This commit is contained in:
Luke Parker 2022-12-14 09:27:49 -05:00
parent 25f1549c6c
commit 3ec5189fbf
No known key found for this signature in database
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
coins/monero/src/wallet/mod.rs
View file

@ -1,6 +1,7 @@
use core::ops::Deref;
use std::collections::{HashSet, HashMap};
use zeroize::{Zeroize, ZeroizeOnDrop};
use zeroize::{Zeroize, ZeroizeOnDrop, Zeroizing};
use curve25519_dalek::{
constants::ED25519_BASEPOINT_TABLE,
@ -97,11 +98,11 @@ pub(crate) fn commitment_mask(shared_key: Scalar) -> Scalar {
#[derive(Clone, Zeroize, ZeroizeOnDrop)]
pub struct ViewPair {
spend: EdwardsPoint,
view: Scalar,
view: Zeroizing<Scalar>,
}
impl ViewPair {
pub fn new(spend: EdwardsPoint, view: Scalar) -> ViewPair {
pub fn new(spend: EdwardsPoint, view: Zeroizing<Scalar>) -> ViewPair {
ViewPair { spend, view }
}
@ -110,15 +111,15 @@ impl ViewPair {
return Scalar::zero();
}
hash_to_scalar(
&[
hash_to_scalar(&Zeroizing::new(
[
b"SubAddr\0".as_ref(),
&self.view.to_bytes(),
Zeroizing::new(self.view.to_bytes()).as_ref(),
&index.0.to_le_bytes(),
&index.1.to_le_bytes(),
]
.concat(),
)
))
}
}
@ -191,7 +192,7 @@ impl Scanner {
},
),
self.pair.spend,
&self.pair.view * &ED25519_BASEPOINT_TABLE,
self.pair.view.deref() * &ED25519_BASEPOINT_TABLE,
)
}
@ -214,7 +215,7 @@ impl Scanner {
},
),
spend,
self.pair.view * spend,
self.pair.view.deref() * spend,
)
}
}

11
coins/monero/tests/runner.rs
View file

@ -1,6 +1,9 @@
use core::ops::Deref;
use std::sync::Mutex;
use lazy_static::lazy_static;
use zeroize::Zeroizing;
use rand_core::OsRng;
use curve25519_dalek::{constants::ED25519_BASEPOINT_TABLE, scalar::Scalar};
@ -17,14 +20,14 @@ use monero_serai::{
pub fn random_address() -> (Scalar, ViewPair, MoneroAddress) {
let spend = random_scalar(&mut OsRng);
let spend_pub = &spend * &ED25519_BASEPOINT_TABLE;
let view = random_scalar(&mut OsRng);
let view = Zeroizing::new(random_scalar(&mut OsRng));
(
spend,
ViewPair::new(spend_pub, view),
ViewPair::new(spend_pub, view.clone()),
MoneroAddress {
meta: AddressMeta::new(Network::Mainnet, AddressType::Standard),
spend: spend_pub,
view: &view * &ED25519_BASEPOINT_TABLE,
view: view.deref() * &ED25519_BASEPOINT_TABLE,
},
)
}
@ -163,7 +166,7 @@ macro_rules! test {
keys[&1].group_key().0
};
let view = ViewPair::new(spend_pub, random_scalar(&mut OsRng));
let view = ViewPair::new(spend_pub, Zeroizing::new(random_scalar(&mut OsRng)));
let rpc = rpc().await;