Umbral -> Curve25519 for ThresholdDecryptionRequest/Response

.pre-commit-config.yaml

@@ -0,0 +1,8 @@
+repos:
+  - repo: https://github.com/doublify/pre-commit-rust
+    rev: v1.0
+    hooks:
+    - id: fmt
+    - id: cargo-check
+    - id: clippy
+      args: ["--all", "--all-features", "--", "-D", "warnings"]

CHANGELOG.md

@@ -3,20 +3,28 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-
 ## [0.9.0] - Unreleased
 
 ### Added
 
 - Re-exported `ferveo` Python and WASM bindings. ([#58])
+- Added `RequestSharedSecret`, `RequestPublicKey`, `RequestSecretKey`, `RequestKeyFactory` as wrappers for underlying Curve 25519 key functionality. ([#54])
+- Added Rust `pre-commit` hooks for repos. ([#54])
+- Added `secret_box` functionality. ([#54])
+
 
-###  Changed
+### Changed
 
 - Replaced opaque types with native `ferveo` types. ([#53])
+- Removed `E2EThresholdDecryptionRequest` type and bindings. ([#54])
+- Modified `EncryptedThresholdDecryptionRequest`/`EncryptedThresholdDecryptionResponse` to use Curve 25519 keys instead of Umbral keys for encryption/decryption. ([#54])
+- Modified `ThresholdDecryptionResponse`/`EncryptedThresholdDecryptionResponse`  to include `ritual_id` member in struct. ([#54])
+- Ritual ID for `ThresholdDecryption[Request/Response]` / `EncryptedThresholdDecryption[Request/Response]` is now u32 instead of u16. ([#54])
 
 
 [#53]: https://github.com/nucypher/nucypher-core/pull/53
 [#58]: https://github.com/nucypher/nucypher-core/pull/58
+[#54]: https://github.com/nucypher/nucypher-core/pull/54
 
 
 ## [0.8.0] - 2023-05-23
@@ -38,7 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Add `ThresholdDecryptionRequest`/`ThresholdDecryptionResponse` types and bindings. ([#48])`
+- Add `ThresholdDecryptionRequest`/`ThresholdDecryptionResponse` types and bindings. ([#48])
 - Add `ferveo_public_key` field to `NodeMetadataPayload`. ([#48])
 
 

nucypher-core-python/nucypher_core/__init__.py

@@ -18,8 +18,11 @@
     MetadataResponse,
     MetadataResponsePayload,
     ThresholdDecryptionRequest,
-    E2EThresholdDecryptionRequest,
     ThresholdDecryptionResponse,
     EncryptedThresholdDecryptionRequest,
     EncryptedThresholdDecryptionResponse,
+    RequestSharedSecret,
+    RequestPublicKey,
+    RequestSecretKey,
+    RequestKeyFactory,
 )

nucypher-core-python/nucypher_core/__init__.pyi

@@ -423,7 +423,7 @@ class ThresholdDecryptionRequest:
 
     ciphertext: Ciphertext
 
-    def encrypt(self, request_encrypting_key: PublicKey, response_encrypting_key: PublicKey) -> EncryptedThresholdDecryptionRequest:
+    def encrypt(self, shared_secret: RequestSharedSecret, requester_public_key: RequestPublicKey) -> EncryptedThresholdDecryptionRequest:
         ...
 
     @staticmethod
@@ -434,27 +434,15 @@ class ThresholdDecryptionRequest:
         ...
 
 
-class E2EThresholdDecryptionRequest:
-
-    decryption_request: ThresholdDecryptionRequest
-
-    response_encrypting_key: PublicKey
-
-    @staticmethod
-    def from_bytes(data: bytes) -> E2EThresholdDecryptionRequest:
-        ...
-
-    def __bytes__(self) -> bytes:
-        ...
-
-
 class EncryptedThresholdDecryptionRequest:
     ritual_id: int
 
+    requester_public_key: RequestPublicKey
+
     def decrypt(
         self,
-        sk: SecretKey
-    ) -> E2EThresholdDecryptionRequest:
+        shared_secret: RequestSharedSecret
+    ) -> ThresholdDecryptionRequest:
         ...
 
     @staticmethod
@@ -467,12 +455,14 @@ class EncryptedThresholdDecryptionRequest:
 
 class ThresholdDecryptionResponse:
 
-    def __init__(self, decryption_share: bytes):
+    def __init__(self, ritual_id: int, decryption_share: bytes):
         ...
 
     decryption_share: bytes
 
-    def encrypt(self, encrypting_key: PublicKey) -> EncryptedThresholdDecryptionResponse:
+    ritual_id: int
+
+    def encrypt(self, shared_secret: RequestSharedSecret) -> EncryptedThresholdDecryptionResponse:
         ...
 
     @staticmethod
@@ -485,9 +475,11 @@ class ThresholdDecryptionResponse:
 
 class EncryptedThresholdDecryptionResponse:
 
+    ritual_id: int
+
     def decrypt(
         self,
-        sk: SecretKey
+        shared_secret: RequestSharedSecret
     ) -> ThresholdDecryptionResponse:
         ...
 
@@ -497,3 +489,52 @@ class EncryptedThresholdDecryptionResponse:
 
     def __bytes__(self) -> bytes:
         ...
+
+
+class RequestSharedSecret:
+    ...
+
+
+class RequestPublicKey:
+
+    @staticmethod
+    def from_bytes(data: bytes) -> RequestPublicKey:
+        ...
+
+    def __bytes__(self) -> bytes:
+        ...
+
+
+class RequestSecretKey:
+
+    @staticmethod
+    def random() -> RequestSecretKey:
+        ...
+
+    def public_key(self) -> RequestPublicKey:
+        ...
+
+    def derive_shared_secret(self, their_public_key: RequestPublicKey) -> RequestSharedSecret:
+        ...
+
+
+class RequestKeyFactory:
+
+    @staticmethod
+    def random() -> RequestKeyFactory:
+        ...
+
+    @staticmethod
+    def seed_size() -> int:
+        ...
+
+    @staticmethod
+    def from_secure_randomness(seed: bytes) -> RequestKeyFactory:
+        ...
+
+    def make_key(self, label: bytes) -> RequestSecretKey:
+        ...
+
+    def make_factory(self, label: bytes) -> RequestKeyFactory:
+        ...
+