From 56d910dc8e8d8d2a483390e3d61a48491b729d2c Mon Sep 17 00:00:00 2001 From: Bogdan Opanchuk Date: Mon, 12 Apr 2021 21:48:55 -0700 Subject: [PATCH] Remove TODO for #43 (closed) --- umbral-pre/src/dem.rs | 4 ++-- umbral-pre/src/pre.rs | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/umbral-pre/src/dem.rs b/umbral-pre/src/dem.rs index 1b3d9703..0cb1c923 100644 --- a/umbral-pre/src/dem.rs +++ b/umbral-pre/src/dem.rs @@ -34,9 +34,9 @@ pub(crate) struct DEM { } impl DEM { - pub fn new(key_seed: &[u8], salt: Option<&[u8]>, info: Option<&[u8]>) -> Self { + pub fn new(key_seed: &[u8]) -> Self { type KeySize = ::KeySize; - let key_bytes = kdf::(&key_seed, salt, info); + let key_bytes = kdf::(&key_seed, None, None); let key = Key::from_slice(&key_bytes); let cipher = XChaCha20Poly1305::new(key); Self { cipher } diff --git a/umbral-pre/src/pre.rs b/umbral-pre/src/pre.rs index dd639f76..271a36fc 100644 --- a/umbral-pre/src/pre.rs +++ b/umbral-pre/src/pre.rs @@ -14,8 +14,7 @@ use alloc::boxed::Box; /// Returns the KEM [`Capsule`] and the ciphertext. pub fn encrypt(pk: &PublicKey, plaintext: &[u8]) -> Option<(Capsule, Box<[u8]>)> { let (capsule, key_seed) = Capsule::from_public_key(pk); - // TODO (#43): add salt and info here? - let dem = DEM::new(&key_seed.to_array(), None, None); + let dem = DEM::new(&key_seed.to_array()); let capsule_bytes = capsule.to_array(); let ciphertext = dem.encrypt(plaintext, &capsule_bytes)?; Some((capsule, ciphertext)) @@ -29,8 +28,7 @@ pub fn decrypt_original( ciphertext: impl AsRef<[u8]>, ) -> Option> { let key_seed = capsule.open_original(decrypting_sk); - // TODO (#43): add salt and info here? - let dem = DEM::new(&key_seed.to_array(), None, None); + let dem = DEM::new(&key_seed.to_array()); dem.decrypt(ciphertext, &capsule.to_array()) } @@ -62,8 +60,7 @@ pub fn decrypt_reencrypted( ciphertext: impl AsRef<[u8]>, ) -> Option> { let key_seed = capsule.open_reencrypted(decrypting_sk, delegating_pk, cfrags)?; - // TODO (#43): add salt and info here? - let dem = DEM::new(&key_seed.to_array(), None, None); + let dem = DEM::new(&key_seed.to_array()); dem.decrypt(&ciphertext, &capsule.to_array()) }