Uses de/serialization from umbral.

nkms/crypto/encrypting_keypair.py

@@ -4,6 +4,8 @@ from nacl.secret import SecretBox
 from typing import Tuple, List
 from threading import local
 
+from nkms.crypto.api import PRE
+
 _tl = local()
 _tl.pre = None
 
@@ -140,7 +142,7 @@ class EncryptingKeypair(object):
         and the ephemeral private key encrypted for recepient (Bob)
         """
         rk, encrypted_eph = rekey
-        rk = umbral.RekeyFrag(rk[0], ec.deserialize(self.pre.ecgroup, rk[1]))
+        rk = umbral.RekeyFrag(rk[0], ec.deserialize(self.pre.ecgroup, rk[1]), pre=PRE)
         ekey, edata = ciphertext
         ekey = umbral.EncryptedKey(
                 ekey=ec.deserialize(self.pre.ecgroup, ekey[0]), re_id=ekey[1])

nkms/policy/constants.py

@@ -1,3 +1 @@
-UNKNOWN_KFRAG = 550
-
 NON_PAYMENT = 1500

nkms/policy/models.py

@@ -1,10 +1,10 @@
 import msgpack
+from npre.constants import UNKNOWN_KFRAG
 from npre.elliptic_curve import serialize
 
 from nkms.characters import Alice, Bob, Ursula
 from nkms.crypto import api
 from nkms.crypto.powers import EncryptingPower
-from nkms.policy.constants import UNKNOWN_KFRAG
 
 
 class PolicyOffer(object):
@@ -175,7 +175,7 @@ class Policy(object):
         return policy
 
     def payload(self):
-        return msgpack.dumps({b"kf": [serialize(k) for k in self.kfrag], b"cp": msgpack.dumps(self.challenge_pack)})
+        return msgpack.dumps({b"kf": bytes(self.kfrag), b"cp": msgpack.dumps(self.challenge_pack)})
 
     def activate(self, ursula, negotiation_result):
         self.ursula = ursula