Merge pull request #69 from nucypher/ferveo-alpha-11

nucypher-core-python/Cargo.toml

@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 pyo3 = "0.18"
 nucypher-core = { path = "../nucypher-core" }
 umbral-pre = { version = "0.10.0", features = ["bindings-python"] }
-ferveo = { package = "ferveo-pre-release", version = "0.1.0-alpha.10", features = ["bindings-python"] }
+ferveo = { package = "ferveo-pre-release", version = "0.2.0", features = ["bindings-python"] }
 derive_more = { version = "0.99", default-features = false, features = ["from", "as_ref"] }
 
 [build-dependencies]

nucypher-core-python/src/lib.rs

@@ -7,7 +7,10 @@ extern crate alloc;
 
 use alloc::collections::{BTreeMap, BTreeSet};
 
-use ferveo::bindings_python::{Ciphertext, FerveoPublicKey};
+use ferveo::{
+    api::FerveoVariant,
+    bindings_python::{Ciphertext, FerveoPublicKey},
+};
 use pyo3::class::basic::CompareOp;
 use pyo3::exceptions::{PyTypeError, PyValueError};
 use pyo3::prelude::*;
@@ -18,7 +21,6 @@ use umbral_pre::bindings_python::{
     VerifiedCapsuleFrag, VerifiedKeyFrag,
 };
 
-use nucypher_core::FerveoVariant;
 use nucypher_core::ProtocolObject;
 
 fn to_bytes<'a, T, U>(obj: &T) -> PyObject
@@ -763,8 +765,8 @@ impl ThresholdDecryptionRequest {
         context: Option<&Context>,
     ) -> PyResult<Self> {
         let ferveo_variant = match variant {
-            0 => FerveoVariant::SIMPLE,
-            1 => FerveoVariant::PRECOMPUTED,
+            0 => FerveoVariant::Simple,
+            1 => FerveoVariant::Precomputed,
             _ => {
                 return Err(PyValueError::new_err(
                     "Invalid ThresholdDecryptionRequest variant",
@@ -816,8 +818,8 @@ impl ThresholdDecryptionRequest {
     #[getter]
     pub fn variant(&self) -> u8 {
         match self.backend.variant {
-            FerveoVariant::SIMPLE => 0,
-            FerveoVariant::PRECOMPUTED => 1,
+            FerveoVariant::Simple => 0,
+            FerveoVariant::Precomputed => 1,
         }
     }
 

nucypher-core-wasm/Cargo.toml

@@ -20,7 +20,7 @@ default = ["console_error_panic_hook"]
 
 [dependencies]
 umbral-pre = { version = "0.10.0", features = ["bindings-wasm"] }
-ferveo = { package = "ferveo-pre-release", version = "0.1.0-alpha.10", features = ["bindings-wasm"] }
+ferveo = { package = "ferveo-pre-release", version = "0.2.0", features = ["bindings-wasm"] }
 nucypher-core = { path = "../nucypher-core" }
 wasm-bindgen = "0.2.86"
 js-sys = "0.3.63"

nucypher-core-wasm/src/lib.rs

@@ -12,7 +12,7 @@ use alloc::{
 };
 use core::fmt;
 
-use ferveo::bindings_wasm::Ciphertext;
+use ferveo::{api::FerveoVariant, bindings_wasm::Ciphertext};
 use js_sys::Error;
 use umbral_pre::bindings_wasm::{
     Capsule, PublicKey, RecoverableSignature, SecretKey, Signer, VerifiedCapsuleFrag,
@@ -22,7 +22,7 @@ use wasm_bindgen::prelude::{wasm_bindgen, JsValue};
 use wasm_bindgen::JsCast;
 use wasm_bindgen_derive::TryFromJsValue;
 
-use nucypher_core::{FerveoVariant, ProtocolObject};
+use nucypher_core::ProtocolObject;
 
 // Re-export certain types so they can be used from `nucypher-core` WASM bindings directly.
 pub use ferveo::bindings_wasm::{FerveoPublicKey, Keypair};
@@ -673,8 +673,8 @@ impl ThresholdDecryptionRequest {
         let typed_context = try_from_js_option::<Context>(context)?;
 
         let ferveo_variant = match variant {
-            0 => FerveoVariant::SIMPLE,
-            1 => FerveoVariant::PRECOMPUTED,
+            0 => FerveoVariant::Simple,
+            1 => FerveoVariant::Precomputed,
             _ => return Err(Error::new("Invalid variant")),
         };
 
@@ -695,8 +695,8 @@ impl ThresholdDecryptionRequest {
     #[wasm_bindgen(getter)]
     pub fn variant(&self) -> u8 {
         match self.0.variant {
-            FerveoVariant::SIMPLE => 0,
-            FerveoVariant::PRECOMPUTED => 1,
+            FerveoVariant::Simple => 0,
+            FerveoVariant::Precomputed => 1,
         }
     }
 

nucypher-core/Cargo.toml

@@ -11,7 +11,7 @@ categories = ["cryptography", "no-std"]
 
 [dependencies]
 umbral-pre = { version = "0.10.0", features = ["serde"] }
-ferveo = { package = "ferveo-pre-release", version = "0.1.0-alpha.10" }
+ferveo = { package = "ferveo-pre-release", version = "0.2.0" }
 serde = { version = "1", default-features = false, features = ["derive"] }
 generic-array = { version = "0.14", features = ["zeroize"] }
 sha3 = "0.10"

nucypher-core/src/dkg.rs

@@ -1,7 +1,7 @@
 use alloc::boxed::Box;
 use alloc::string::String;
 use core::fmt;
-use ferveo::api::Ciphertext;
+use ferveo::api::{Ciphertext, FerveoVariant};
 use generic_array::typenum::Unsigned;
 
 use serde::{Deserialize, Serialize};
@@ -100,15 +100,6 @@ fn decrypt_with_shared_secret(
     Ok(plaintext.into_boxed_slice())
 }
 
-/// The ferveo variant to use for the decryption share derivation.
-#[derive(PartialEq, Eq, Debug, Serialize, Deserialize, Copy, Clone)]
-pub enum FerveoVariant {
-    /// The simple variant requires m of n shares to decrypt
-    SIMPLE,
-    /// The precomputed variant requires n of n shares to decrypt
-    PRECOMPUTED,
-}
-
 /// Module for session key objects.
 pub mod session {
     use alloc::boxed::Box;
@@ -601,11 +592,11 @@ impl<'a> ProtocolObject<'a> for EncryptedThresholdDecryptionResponse {}
 
 #[cfg(test)]
 mod tests {
-    use ferveo::api::{encrypt as ferveo_encrypt, DkgPublicKey, SecretBox};
+    use ferveo::api::{encrypt as ferveo_encrypt, DkgPublicKey, FerveoVariant, SecretBox};
 
     use crate::{
         Conditions, Context, EncryptedThresholdDecryptionRequest,
-        EncryptedThresholdDecryptionResponse, FerveoVariant, ProtocolObject, SessionSecretFactory,
+        EncryptedThresholdDecryptionResponse, ProtocolObject, SessionSecretFactory,
         SessionStaticKey, ThresholdDecryptionRequest, ThresholdDecryptionResponse,
     };
 
@@ -742,7 +733,7 @@ mod tests {
             &ciphertext,
             Some(&Conditions::new("abcd")),
             Some(&Context::new("efgh")),
-            FerveoVariant::SIMPLE,
+            FerveoVariant::Simple,
         );
 
         // requester encrypts request to send to service

nucypher-core/src/lib.rs

@@ -30,7 +30,7 @@ pub use conditions::{Conditions, Context};
 pub use dkg::{
     session::{SessionSecretFactory, SessionSharedSecret, SessionStaticKey, SessionStaticSecret},
     DecryptionError, EncryptedThresholdDecryptionRequest, EncryptedThresholdDecryptionResponse,
-    EncryptionError, FerveoVariant, ThresholdDecryptionRequest, ThresholdDecryptionResponse,
+    EncryptionError, ThresholdDecryptionRequest, ThresholdDecryptionResponse,
 };
 pub use fleet_state::FleetStateChecksum;
 pub use hrac::HRAC;