Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Commenting out encrypting keys from the Keystore for the moment.

pull/157/head
jMyles 2018-02-12 13:08:58 -08:00
parent 63b2a94c9b
commit 2184933c97
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nkms/keystore/db/models.py
View File

@ -33,22 +33,22 @@ class PolicyContract(Base):
hrac = Column(LargeBinary, unique=True) hrac = Column(LargeBinary, unique=True)
key_frag = Column(LargeBinary, unique=True) key_frag = Column(LargeBinary, unique=True)
alice_pubkey_sig_id = Column(Integer, ForeignKey('keys.id')) alice_pubkey_sig_id = Column(Integer, ForeignKey('keys.id'))
alice_pubkey_enc_id = Column(Integer, ForeignKey('keys.id')) # alice_pubkey_enc_id = Column(Integer, ForeignKey('keys.id'))
bob_pubkey_sig_id = Column(Integer, ForeignKey('keys.id')) # bob_pubkey_sig_id = Column(Integer, ForeignKey('keys.id'))
alice_signature = Column(LargeBinary, unique=True) alice_signature = Column(LargeBinary, unique=True)
created_at = Column(DateTime, default=datetime.utcnow) created_at = Column(DateTime, default=datetime.utcnow)
def __init__(self, expiration, deposit, hrac, def __init__(self, expiration, deposit, hrac,
key_frag, alice_pubkey_sig_id, key_frag, alice_pubkey_sig_id,
alice_pubkey_enc_id, bob_pubkey_sig_id, # alice_pubkey_enc_id, bob_pubkey_sig_id,
alice_signature, policy): alice_signature):
self.expiration = expiration self.expiration = expiration
self.deposit = deposit self.deposit = deposit
self.hrac = hrac self.hrac = hrac
self.key_frag = key_frag self.key_frag = key_frag
self.alice_pubkey_sig_id = alice_pubkey_sig_id self.alice_pubkey_sig_id = alice_pubkey_sig_id
self.alice_pubkey_enc_id = alice_pubkey_enc_id # self.alice_pubkey_enc_id = alice_pubkey_enc_id
self.bob_pubkey_sig_id = bob_pubkey_sig_id # self.bob_pubkey_sig_id = bob_pubkey_sig_id
self.alice_signature = alice_signature self.alice_signature = alice_signature

26
nkms/keystore/keystore.py
View File

@ -79,19 +79,23 @@ def del_key(self, fingerprint: bytes):
self.session.query(Key).filter_by(fingerprint=fingerprint).delete() self.session.query(Key).filter_by(fingerprint=fingerprint).delete()
self.session.commit() self.session.commit()
def add_policy_contract(self, expiration, deposit, hrac, kfrag,
alice_pubkey_sig, # alice_pubkey_enc,
alice_signature) -> PolicyContract:
"""
Creates a PolicyContract to the Keystore.
def add_policy_contract(self, expiration, deposit, hrac, :return: The newly added PolicyContract object
alice_pubkey_sig, alice_pubkey_enc, """
bob_pubkey_sig, alice_signature) -> PolicyContract: # TODO: This can be optimized to one commit/write.
""" alice_pubkey_sig = self.add_key(alice_pubkey_sig, is_signing=True)
Creates a PolicyContract to the Keystore. # alice_pubkey_enc = self.add_key(alice_pubkey_enc)
# bob_pubkey_sig = self.add_key(bob_pubkey_sig)
:return: The newly added PolicyContract object new_policy_contract = PolicyContract(
""" expiration, deposit, hrac, alice_pubkey_sig.id, kfrag,
# TODO: This can be optimized to one commit/write. alice_signature, # bob_pubkey_sig.id
alice_pubkey_sig = self.add_key(alice_pubkey_sig) )
alice_pubkey_enc = self.add_key(alice_pubkey_enc)
bob_pubkey_sig = self.add_key(bob_pubkey_sig)
new_policy_contract = PolicyContract( new_policy_contract = PolicyContract(
expiration, deposit, hrac, alice_pubkey_sig.id, expiration, deposit, hrac, alice_pubkey_sig.id,