From b3f0335679d695e825240dc8624d4d0e0a0fc792 Mon Sep 17 00:00:00 2001 From: tuxxy Date: Tue, 26 Sep 2017 13:06:52 -0700 Subject: [PATCH] Allow generate_key to have a pubkey param --- nkms/crypto/keypairs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nkms/crypto/keypairs.py b/nkms/crypto/keypairs.py index 7340ac370..14c380dab 100644 --- a/nkms/crypto/keypairs.py +++ b/nkms/crypto/keypairs.py @@ -16,14 +16,15 @@ class EncryptingKeypair(object): self.priv_key = privkey_bytes self.pub_key = self.pre.priv2pub(self.priv_key) - def generate_key(self): + def generate_key(self, pubkey=None): """ Generate a raw symmetric key and its encrypted counterpart. :rtype: Tuple(bytes, bytes) :return: Tuple of the raw encrypted key and the encrypted key """ - symm_key, enc_symm_key = self.pre.encapsulate(self.pub_key) + pubkey = pubkey or self.pub_key + symm_key, enc_symm_key = self.pre.encapsulate(pubkey) return (symm_key, enc_symm_key) def decrypt_key(self, enc_key):