Fix incorrect python bindings.

nucypher · May 31, 2023 · 71e0cd2 · 71e0cd2
1 parent ae83c3f
commit 71e0cd2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/nucypher-core-python/nucypher_core/__init__.pyi b/nucypher-core-python/nucypher_core/__init__.pyi
@@ -418,7 +418,7 @@ class ThresholdDecryptionRequest:
 
     ciphertext: bytes
 
-    def encrypt(self, request_encrypting_key: PublicKey, response_encrypting_key: PublicKey) -> EncryptedThresholdDecryptionRequest:
+    def encrypt(self, shared_secret: RequestSharedSecret, requester_public_key: RequestPublicKey) -> EncryptedThresholdDecryptionRequest:
         ...
 
     @staticmethod
@@ -436,7 +436,7 @@ class EncryptedThresholdDecryptionRequest:
 
     def decrypt(
         self,
-        sk: SecretKey
+        shared_secret: RequestSharedSecret
     ) -> ThresholdDecryptionRequest:
         ...
 
@@ -455,7 +455,7 @@ class ThresholdDecryptionResponse:
 
     decryption_share: bytes
 
-    def encrypt(self, encrypting_key: PublicKey) -> EncryptedThresholdDecryptionResponse:
+    def encrypt(self, shared_secret: RequestSharedSecret) -> EncryptedThresholdDecryptionResponse:
         ...
 
     @staticmethod
@@ -470,7 +470,7 @@ class EncryptedThresholdDecryptionResponse:
 
     def decrypt(
         self,
-        sk: SecretKey
+        shared_secret: RequestSharedSecret
     ) -> ThresholdDecryptionResponse:
         ...
 

diff --git a/nucypher-core/src/dkg.rs b/nucypher-core/src/dkg.rs
@@ -293,7 +293,7 @@ pub mod request_keys {
     }
 
     type SecretKeyFactorySeedSize = U32; // the size of the seed material for key derivation
-    type RequestKeyFactoryDerivedSize = U32; // the size of the derived key (before hashing to scalar)
+    type RequestKeyFactoryDerivedKeySize = U32; // the size of the derived key
     type RequestKeyFactorySeed = GenericArray<u8, SecretKeyFactorySeedSize>;
 
     /// Error thrown when invalid random seed provided for creating key factory.
@@ -349,17 +349,18 @@ pub mod request_keys {
         pub fn make_secret(
             &self,
             label: &[u8],
-        ) -> SecretBox<GenericArray<u8, RequestKeyFactoryDerivedSize>> {
+        ) -> SecretBox<GenericArray<u8, RequestKeyFactoryDerivedKeySize>> {
             let prefix = b"REQUEST_SECRET_DERIVATION/";
             let info = [prefix, label].concat();
-            kdf::<RequestKeyFactoryDerivedSize>(self.0.as_secret(), None, Some(&info))
+            kdf::<RequestKeyFactoryDerivedKeySize>(self.0.as_secret(), None, Some(&info))
         }
 
         /// Creates a `RequestSecretKey` deterministically from the given label.
         pub fn make_key(&self, label: &[u8]) -> RequestSecretKey {
             let prefix = b"REQUEST_KEY_DERIVATION/";
             let info = [prefix, label].concat();
-            let seed = kdf::<RequestKeyFactoryDerivedSize>(self.0.as_secret(), None, Some(&info));
+            let seed =
+                kdf::<RequestKeyFactoryDerivedKeySize>(self.0.as_secret(), None, Some(&info));
             let rng =
                 ChaCha20Rng::from_seed(<[u8; 32]>::try_from(seed.as_secret().as_slice()).unwrap());
             RequestSecretKey::random_from_rng(rng)