From 69137b07d5122302c0fbed1cb3d17676f27d23b3 Mon Sep 17 00:00:00 2001 From: jMyles Date: Sun, 11 Feb 2018 00:55:22 -0800 Subject: [PATCH] Some organization. --- nkms/crypto/kits.py | 4 ++-- nkms/crypto/powers.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nkms/crypto/kits.py b/nkms/crypto/kits.py index 8685b4392..5a1f74ccf 100644 --- a/nkms/crypto/kits.py +++ b/nkms/crypto/kits.py @@ -38,8 +38,8 @@ class MessageKit(CryptoKit): as_bytes += self.ciphertext return as_bytes -class MapKit(MessageKit): +class MapKit(MessageKit): def __init__(self, ciphertext, capsule, treasure_map, alice_pubkey=None): super().__init__(ciphertext, capsule, alice_pubkey) - self.treasure_map = treasure_map \ No newline at end of file + self.treasure_map = treasure_map diff --git a/nkms/crypto/powers.py b/nkms/crypto/powers.py index cd349b945..44f2eec90 100644 --- a/nkms/crypto/powers.py +++ b/nkms/crypto/powers.py @@ -1,11 +1,12 @@ import inspect from typing import Iterable, List, Tuple +import umbral from nkms.crypto import api as API -from nkms.crypto.signature import Signature +from nkms.crypto.kits import MessageKit from nkms.keystore import keypairs from nkms.keystore.keypairs import SigningKeypair, EncryptingKeypair -from umbral.keys import UmbralPublicKey +from umbral.keys import UmbralPublicKey, UmbralPrivateKey class PowerUpError(TypeError): @@ -22,7 +23,6 @@ class NoEncryptingPower(PowerUpError): class CryptoPower(object): def __init__(self, power_ups=None, generate_keys_if_needed=False): - self._power_ups = {} # TODO: The keys here will actually be IDs for looking up in a KeyStore. self.public_keys = {}