kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reverts block_len to a fixed number

Browse Source
This commit is contained in:
Fabian Kaczmarczyck
2020-12-09 20:09:49 +01:00
parent e8f6ed9a43
commit d942f0173f
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ctap/mod.rs
View File

@@ -238,15 +238,14 @@ where
let mut iv = [0; 16]; let mut iv = [0; 16];
iv.copy_from_slice(&self.rng.gen_uniform_u8x32()[..16]); iv.copy_from_slice(&self.rng.gen_uniform_u8x32()[..16]);
let block_len = 4; let mut blocks = [[0u8; 16]; 4];
let mut blocks = vec![[0u8; 16]; block_len];
blocks[0].copy_from_slice(&sk_bytes[..16]); blocks[0].copy_from_slice(&sk_bytes[..16]);
blocks[1].copy_from_slice(&sk_bytes[16..]); blocks[1].copy_from_slice(&sk_bytes[16..]);
blocks[2].copy_from_slice(&application[..16]); blocks[2].copy_from_slice(&application[..16]);
blocks[3].copy_from_slice(&application[16..]); blocks[3].copy_from_slice(&application[16..]);
cbc_encrypt(&aes_enc_key, iv, &mut blocks); cbc_encrypt(&aes_enc_key, iv, &mut blocks);
let mut encrypted_id = Vec::with_capacity(16 * (block_len + 3)); let mut encrypted_id = Vec::with_capacity(0x70);
encrypted_id.extend(&iv); encrypted_id.extend(&iv);
for b in &blocks { for b in &blocks {
encrypted_id.extend(b); encrypted_id.extend(b);
@@ -280,9 +279,8 @@ where
let aes_dec_key = crypto::aes256::DecryptionKey::new(&aes_enc_key); let aes_dec_key = crypto::aes256::DecryptionKey::new(&aes_enc_key);
let mut iv = [0; 16]; let mut iv = [0; 16];
iv.copy_from_slice(&credential_id[..16]); iv.copy_from_slice(&credential_id[..16]);
let block_len = 4; let mut blocks = [[0u8; 16]; 4];
let mut blocks = vec![[0u8; 16]; block_len]; for i in 0..4 {
for i in 0..block_len {
blocks[i].copy_from_slice(&credential_id[16 * (i + 1)..16 * (i + 2)]); blocks[i].copy_from_slice(&credential_id[16 * (i + 1)..16 * (i + 2)]);
} }
@@ -608,7 +606,7 @@ where
let mut private_key_bytes = [0u8; 32]; let mut private_key_bytes = [0u8; 32];
private_key.to_bytes(&mut private_key_bytes); private_key.to_bytes(&mut private_key_bytes);
let key = self.persistent_store.cred_random_secret(has_uv)?; let key = self.persistent_store.cred_random_secret(has_uv)?;
Ok(hmac_256::<Sha256>(&key, &private_key_bytes[..])) Ok(hmac_256::<Sha256>(&key, &private_key_bytes))
} }
// Processes the input of a get_assertion operation for a given credential // Processes the input of a get_assertion operation for a given credential