evie/rs-matter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

spake2p: Fix issues

Browse source 
- Verifier length was incorrect
- spake2 was not being initialised in the 'Verifier' Option
- change method for new()
This commit is contained in:
Kedar Sovani 2023-01-10 18:39:14 +05:30
parent 8d4f91b3eb
commit 471c264a09
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
matter/src/secure_channel/spake2p.rs
View file

@ -82,7 +82,7 @@ const CRYPTO_W_SIZE_BYTES: usize = CRYPTO_GROUP_SIZE_BYTES + 8;
const CRYPTO_PUBLIC_KEY_SIZE_BYTES: usize = (2 * CRYPTO_GROUP_SIZE_BYTES) + 1; const CRYPTO_PUBLIC_KEY_SIZE_BYTES: usize = (2 * CRYPTO_GROUP_SIZE_BYTES) + 1;
const MAX_SALT_SIZE_BYTES: usize = 32; const MAX_SALT_SIZE_BYTES: usize = 32;
const VERIFIER_SIZE_BYTES: usize = CRYPTO_W_SIZE_BYTES + CRYPTO_PUBLIC_KEY_SIZE_BYTES; const VERIFIER_SIZE_BYTES: usize = CRYPTO_GROUP_SIZE_BYTES + CRYPTO_PUBLIC_KEY_SIZE_BYTES;
#[cfg(feature = "crypto_openssl")] #[cfg(feature = "crypto_openssl")]
fn crypto_spake2_new() -> Result<Box<dyn CryptoSpake2>, Error> { fn crypto_spake2_new() -> Result<Box<dyn CryptoSpake2>, Error> {
@ -131,15 +131,20 @@ impl VerifierData {
s s
} }
pub fn new( pub fn new(verifier: &[u8], count: u32, salt: &[u8]) -> Self {
verifier: [u8; VERIFIER_SIZE_BYTES], let mut v = [0_u8; VERIFIER_SIZE_BYTES];
count: u32, let mut s = [0_u8; MAX_SALT_SIZE_BYTES];
salt: [u8; MAX_SALT_SIZE_BYTES],
) -> Self { let slice = &mut v[..verifier.len()];
slice.copy_from_slice(verifier);
let slice = &mut s[..salt.len()];
slice.copy_from_slice(salt);
Self { Self {
data: VerifierOption::Verifier(verifier), data: VerifierOption::Verifier(v),
count, count,
salt, salt: s,
} }
} }
} }
@ -181,12 +186,12 @@ impl Spake2P {
} }
pub fn start_verifier(&mut self, verifier: &VerifierData) -> Result<(), Error> { pub fn start_verifier(&mut self, verifier: &VerifierData) -> Result<(), Error> {
self.crypto_spake2 = Some(crypto_spake2_new()?);
match verifier.data { match verifier.data {
VerifierOption::Password(pw) => { VerifierOption::Password(pw) => {
// Derive w0 and L from the password // Derive w0 and L from the password
let mut w0w1s: [u8; (2 * CRYPTO_W_SIZE_BYTES)] = [0; (2 * CRYPTO_W_SIZE_BYTES)]; let mut w0w1s: [u8; (2 * CRYPTO_W_SIZE_BYTES)] = [0; (2 * CRYPTO_W_SIZE_BYTES)];
Spake2P::get_w0w1s(pw, verifier.count, &verifier.salt, &mut w0w1s); Spake2P::get_w0w1s(pw, verifier.count, &verifier.salt, &mut w0w1s);
self.crypto_spake2 = Some(crypto_spake2_new()?);
let w0s_len = w0w1s.len() / 2; let w0s_len = w0w1s.len() / 2;
if let Some(crypto_spake2) = &mut self.crypto_spake2 { if let Some(crypto_spake2) = &mut self.crypto_spake2 {
@ -226,6 +231,7 @@ impl Spake2P {
Spake2P::get_Ke_and_cAcB(&TT, pA, pB, &mut self.Ke, &mut self.cA, cB)?; Spake2P::get_Ke_and_cAcB(&TT, pA, pB, &mut self.Ke, &mut self.cA, cB)?;
} }
} }
// We are finished with using the crypto_spake2 now // We are finished with using the crypto_spake2 now
self.crypto_spake2 = None; self.crypto_spake2 = None;
self.mode = Spake2Mode::Verifier(Spake2VerifierState::PendingConfirmation); self.mode = Spake2Mode::Verifier(Spake2VerifierState::PendingConfirmation);