Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dependencies #75

Merged
merged 4 commits into from
Nov 16, 2021
Merged

Bump dependencies #75

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4ababb
bump dependencies
kigawas Nov 14, 2021
ef6c0e7
clippy fix
kigawas Nov 14, 2021
5a64f67
Merge branch 'master' into bump-dep
kigawas Nov 15, 2021
2c50043
fmt
kigawas Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
clippy fix
  • Loading branch information
@kigawas
kigawas committed Nov 14, 2021
commit ef6c0e7582e23aaa294cc9027ea1da303db36173
2 changes: 1 addition & 1 deletion src/openssl_aes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ pub fn aes_decrypt(key: &[u8], encrypted_msg: &[u8]) -> Option<Vec<u8>> {
let tag = &encrypted_msg[AES_IV_LENGTH..AES_IV_PLUS_TAG_LENGTH];
let encrypted = &encrypted_msg[AES_IV_PLUS_TAG_LENGTH..];

decrypt_aead(cipher, key, Some(&iv), &EMPTY_BYTES, encrypted, tag).ok()
decrypt_aead(cipher, key, Some(iv), &EMPTY_BYTES, encrypted, tag).ok()
}
12 changes: 6 additions & 6 deletions src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ pub use crate::openssl_aes::{aes_decrypt, aes_encrypt};
/// Generate a `(SecretKey, PublicKey)` pair
pub fn generate_keypair() -> (SecretKey, PublicKey) {
let sk = SecretKey::random(&mut thread_rng());
(sk.clone(), PublicKey::from_secret_key(&sk))
(sk, PublicKey::from_secret_key(&sk))
}

/// Calculate a shared AES key of our secret key and peer's public key by hkdf
pub fn encapsulate(sk: &SecretKey, peer_pk: &PublicKey) -> Result<AesKey, SecpError> {
let mut shared_point = peer_pk.clone();
shared_point.tweak_mul_assign(&sk)?;
let mut shared_point = *peer_pk;
shared_point.tweak_mul_assign(sk)?;

let mut master = Vec::with_capacity(FULL_PUBLIC_KEY_SIZE * 2);
master.extend(PublicKey::from_secret_key(&sk).serialize().iter());
master.extend(PublicKey::from_secret_key(sk).serialize().iter());
master.extend(shared_point.serialize().iter());

hkdf_sha256(master.as_slice())
}

/// Calculate a shared AES key of our public key and peer's secret key by hkdf
pub fn decapsulate(pk: &PublicKey, peer_sk: &SecretKey) -> Result<AesKey, SecpError> {
let mut shared_point = pk.clone();
shared_point.tweak_mul_assign(&peer_sk)?;
let mut shared_point = *pk;
shared_point.tweak_mul_assign(peer_sk)?;

let mut master = Vec::with_capacity(FULL_PUBLIC_KEY_SIZE * 2);
master.extend(pk.serialize().iter());
Expand Down