Adapt verify_kfrag to simplified API (I missed this in the main commit)

nucypher · Jun 5, 2018 · fa4375d · fa4375d
1 parent d34fd6e
commit fa4375d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/umbral/_pre.py b/umbral/_pre.py
@@ -111,14 +111,21 @@ def assess_cfrag_correctness(cfrag, capsule: "Capsule"):
 
 
 def verify_kfrag(kfrag,
-                 delegating_point,
+                 delegating_pubkey: UmbralPublicKey,
                  signing_pubkey,
-                 receiving_point,
-                 params: UmbralParameters
+                 receiving_pubkey: UmbralPublicKey
                  ):
 
+
+    params = delegating_pubkey.params
+    if not params == receiving_pubkey.params:
+        raise ValueError("The delegating and receiving keys must use the same UmbralParameters")
+
     u = params.u
 
+    delegating_point = delegating_pubkey.point_key
+    receiving_point = receiving_pubkey.point_key
+
     id = kfrag._id
     key = kfrag._bn_key
     u1 = kfrag._point_commitment

diff --git a/umbral/fragments.py b/umbral/fragments.py
@@ -72,13 +72,7 @@ def verify(self,
                delegating_pubkey: UmbralPublicKey,
                receiving_pubkey: UmbralPublicKey):
 
-        params = delegating_pubkey.params
-
-        return verify_kfrag(self,
-                            delegating_pubkey.point_key,
-                            signing_pubkey,
-                            receiving_pubkey.point_key,
-                            params)
+        return verify_kfrag(self, delegating_pubkey, signing_pubkey, receiving_pubkey)
 
     def __bytes__(self):
         return self.to_bytes()