mirrors/rage
1
0
Fork 0
mirror of https://github.com/str4d/rage.git synced 2025-04-05 03:47:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

Minor deduplication

Browse source
This commit is contained in:
Jack Grigg 2019-11-17 21:19:09 +00:00
parent e41a6d98ac
commit e5e883fa65
No known key found for this signature in database
GPG key ID: 9E8255172BBF9898
1 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/keys.rs
View file

@ -99,12 +99,7 @@ impl SecretKey {
salt.extend_from_slice(pk.as_bytes()); salt.extend_from_slice(pk.as_bytes());
let enc_key = hkdf(&salt, X25519_RECIPIENT_KEY_LABEL, shared_secret.as_bytes()); let enc_key = hkdf(&salt, X25519_RECIPIENT_KEY_LABEL, shared_secret.as_bytes());
aead_decrypt(&enc_key, &r.encrypted_file_key).map(|pt| { aead_decrypt(&enc_key, &r.encrypted_file_key)
// It's ours!
let mut file_key = [0; 16];
file_key.copy_from_slice(&pt);
file_key
})
} }
(SecretKey::SshRsa(ssh_key, sk), RecipientLine::SshRsa(r)) => { (SecretKey::SshRsa(ssh_key, sk), RecipientLine::SshRsa(r)) => {
if ssh_tag(&ssh_key) != r.tag { if ssh_tag(&ssh_key) != r.tag {
@ -122,12 +117,6 @@ impl SecretKey {
Some(SSH_RSA_OAEP_LABEL.to_owned()), Some(SSH_RSA_OAEP_LABEL.to_owned()),
) )
.ok() .ok()
.map(|pt| {
// It's ours!
let mut file_key = [0; 16];
file_key.copy_from_slice(&pt);
file_key
})
} }
(SecretKey::SshEd25519(ssh_key, privkey), RecipientLine::SshEd25519(r)) => { (SecretKey::SshEd25519(ssh_key, privkey), RecipientLine::SshEd25519(r)) => {
if ssh_tag(&ssh_key) != r.tag { if ssh_tag(&ssh_key) != r.tag {
@ -152,15 +141,16 @@ impl SecretKey {
salt.extend_from_slice(pk.as_bytes()); salt.extend_from_slice(pk.as_bytes());
let enc_key = hkdf(&salt, X25519_RECIPIENT_KEY_LABEL, shared_secret.as_bytes()); let enc_key = hkdf(&salt, X25519_RECIPIENT_KEY_LABEL, shared_secret.as_bytes());
aead_decrypt(&enc_key, &r.rest.encrypted_file_key).map(|pt| { aead_decrypt(&enc_key, &r.rest.encrypted_file_key)
// It's ours!
let mut file_key = [0; 16];
file_key.copy_from_slice(&pt);
file_key
})
} }
_ => None, _ => None,
} }
.map(|pt| {
// It's ours!
let mut file_key = [0; 16];
file_key.copy_from_slice(&pt);
file_key
})
} }
} }