Some organization.

pull/157/head
jMyles 2018-02-11 00:55:22 -08:00
parent b92b5158e1
commit 69137b07d5
2 changed files with 5 additions and 5 deletions

View File

@ -38,8 +38,8 @@ class MessageKit(CryptoKit):
as_bytes += self.ciphertext as_bytes += self.ciphertext
return as_bytes return as_bytes
class MapKit(MessageKit):
class MapKit(MessageKit):
def __init__(self, ciphertext, capsule, treasure_map, alice_pubkey=None): def __init__(self, ciphertext, capsule, treasure_map, alice_pubkey=None):
super().__init__(ciphertext, capsule, alice_pubkey) super().__init__(ciphertext, capsule, alice_pubkey)
self.treasure_map = treasure_map self.treasure_map = treasure_map

View File

@ -1,11 +1,12 @@
import inspect import inspect
from typing import Iterable, List, Tuple from typing import Iterable, List, Tuple
import umbral
from nkms.crypto import api as API 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 import keypairs
from nkms.keystore.keypairs import SigningKeypair, EncryptingKeypair from nkms.keystore.keypairs import SigningKeypair, EncryptingKeypair
from umbral.keys import UmbralPublicKey from umbral.keys import UmbralPublicKey, UmbralPrivateKey
class PowerUpError(TypeError): class PowerUpError(TypeError):
@ -22,7 +23,6 @@ class NoEncryptingPower(PowerUpError):
class CryptoPower(object): class CryptoPower(object):
def __init__(self, power_ups=None, generate_keys_if_needed=False): def __init__(self, power_ups=None, generate_keys_if_needed=False):
self._power_ups = {} self._power_ups = {}
# TODO: The keys here will actually be IDs for looking up in a KeyStore. # TODO: The keys here will actually be IDs for looking up in a KeyStore.
self.public_keys = {} self.public_keys = {}