Merge pull request #110 from fjarri/serde-only

Leave `serde` as the only serialization method
nucypher · Jan 15, 2023 · d215154 · d215154
2 parents fbf2c03 + b3fd37f
commit d215154
Show file tree

Hide file tree

Showing 18 changed files with 536 additions and 1,301 deletions.
diff --git a/umbral-pre-python/umbral_pre/__init__.pyi b/umbral-pre-python/umbral_pre/__init__.pyi
@@ -10,17 +10,10 @@ class SecretKey:
     def public_key(self) -> PublicKey:
         ...
 
-    def to_secret_bytes(self) -> bytes:
-        ...
-
     @staticmethod
     def from_bytes(data: bytes) -> SecretKey:
         ...
 
-    @staticmethod
-    def serialized_size() -> int:
-        ...
-
 
 class SecretKeyFactory:
 
@@ -36,35 +29,27 @@ class SecretKeyFactory:
     def from_secure_randomness(seed: bytes) -> SecretKeyFactory:
         ...
 
-    def make_key(self, label: bytes) -> SecretKey:
+    def make_secret(self, label: bytes) -> bytes:
         ...
 
-    def make_factory(self, label: bytes) -> SecretKeyFactory:
-        ...
-
-    def to_secret_bytes(self) -> bytes:
+    def make_key(self, label: bytes) -> SecretKey:
         ...
 
-    @staticmethod
-    def from_bytes(data: bytes) -> SecretKeyFactory:
+    def make_factory(self, label: bytes) -> SecretKeyFactory:
         ...
 
     @staticmethod
-    def serialized_size() -> int:
+    def from_secure_randomness(data: bytes) -> SecretKeyFactory:
         ...
 
 
 class PublicKey:
 
     @staticmethod
-    def from_bytes(data: bytes) -> PublicKey:
-        ...
-
-    def __bytes__(self) -> bytes:
+    def from_compressed_bytes(data: bytes) -> PublicKey:
         ...
 
-    @staticmethod
-    def serialized_size() -> int:
+    def to_compressed_bytes(self) -> bytes:
         ...
 
 
@@ -86,23 +71,15 @@ class Signature:
         ...
 
     @staticmethod
-    def from_bytes(data: bytes) -> Signature:
+    def from_der_bytes(data: bytes) -> Signature:
         ...
 
-    def __bytes__(self) -> bytes:
-        ...
-
-    @staticmethod
-    def serialized_size() -> int:
+    def to_der_bytes(self) -> bytes:
         ...
 
 
 class Capsule:
 
-    @staticmethod
-    def serialized_size() -> int:
-        ...
-
     @staticmethod
     def from_bytes(data: bytes) -> Capsule:
         ...
@@ -139,26 +116,15 @@ class KeyFrag:
     def __bytes__(self) -> bytes:
         ...
 
-    @staticmethod
-    def serialized_size() -> int:
-        ...
-
 
 class VerifiedKeyFrag:
 
-    def from_verified_bytes(self, data: bytes) -> VerifiedKeyFrag:
-        ...
-
     def __bytes__(self) -> bytes:
         ...
 
     def unverify(self) -> KeyFrag:
         ...
 
-    @staticmethod
-    def serialized_size() -> int:
-        ...
-
 
 def generate_kfrags(
         delegating_sk: SecretKey,
@@ -193,27 +159,15 @@ class CapsuleFrag:
     def __bytes__(self) -> bytes:
         ...
 
-    @staticmethod
-    def serialized_size() -> int:
-        ...
-
 
 class VerifiedCapsuleFrag:
 
-    @staticmethod
-    def from_verified_bytes(data: bytes) -> VerifiedCapsuleFrag:
-        ...
-
     def __bytes__(self) -> bytes:
         ...
 
     def unverify(self) -> CapsuleFrag:
         ...
 
-    @staticmethod
-    def serialized_size() -> int:
-        ...
-
 
 def reencrypt(capsule: Capsule, kfrag: VerifiedKeyFrag) -> VerifiedCapsuleFrag:
     ...

diff --git a/umbral-pre/Cargo.toml b/umbral-pre/Cargo.toml
@@ -36,6 +36,7 @@ typenum = "1.13" # typenum is a 2018-edition crate starting from 1.13
 getrandom = { version = "0.2", optional = true, default-features = false, features = ["js"] }
 subtle = { version = "2.4", default-features = false }
 zeroize = { version = "1.5", default-features = false, features = ["derive"] }
+rmp-serde = { version = "0.15", optional = true }
 
 [dev-dependencies]
 criterion = { version = "0.3", features = ["html_reports"] }
@@ -45,9 +46,10 @@ rmp-serde = "0.15"
 [features]
 default = ["default-rng"]
 bench-internals = ["default-rng"]
-bindings-python = ["pyo3", "std", "derive_more"]
-bindings-wasm = ["js-sys", "wasm-bindgen", "derive_more", "wasm-bindgen-derive"]
+bindings-python = ["pyo3", "std", "derive_more", "default-serialization"]
+bindings-wasm = ["js-sys", "default-serialization", "wasm-bindgen", "derive_more", "wasm-bindgen-derive"]
 default-rng = ["getrandom", "rand_core/getrandom"]
+default-serialization = ["serde-support", "rmp-serde"]
 serde-support = ["serde"]
 std = []