jacobpascual/trezor-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpg: refactor key creation

Browse Source
This commit is contained in:
Roman Zeyde
2016-06-11 14:38:11 +03:00
parent 3e41fddcef
commit 7bbf11b631
3 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
trezor_agent/gpg/encode.py
View File

@@ -119,7 +119,7 @@ def create_primary(user_id, pubkey, signer_func):
return pubkey_packet + user_id_packet + sign_packet
def create_subkey(primary_bytes, pubkey, signer_func, ecdh=False):
def create_subkey(primary_bytes, pubkey, signer_func):
"""Export new subkey to GPG primary key."""
subkey_packet = proto.packet(tag=14, blob=pubkey.data())
primary = decode.load_public_key(primary_bytes)
@@ -127,7 +127,7 @@ def create_subkey(primary_bytes, pubkey, signer_func, ecdh=False):
primary['user_id'], util.hexlify(primary['key_id']))
data_to_sign = primary['_to_hash'] + pubkey.data_to_hash()
if ecdh:
if pubkey.ecdh:
embedded_sig = None
else:
# Primary Key Binding Signature
@@ -147,8 +147,8 @@ def create_subkey(primary_bytes, pubkey, signer_func, ecdh=False):
# Subkey Binding Signature
# Key flags: https://tools.ietf.org/html/rfc4880#section-5.2.3.21
# (certify & sign) (encrypt)
flags = (2) if (not ecdh) else (4 | 8)
# (certify & sign) (encrypt)
flags = (2) if (not pubkey.ecdh) else (4 | 8)
hashed_subpackets = [
proto.subpacket_time(pubkey.created), # signature time
@@ -223,16 +223,6 @@ class Factory(object):
"""Close connection and turn off the screen of the device."""
self.conn.close()
def create_primary(self):
"""Export new subkey to GPG primary key."""
return create_primary(user_id=self.user_id, pubkey=self.pubkey,
signer_func=self.conn.sign)
def create_subkey(self, primary_bytes):
"""Export new subkey to GPG primary key."""
return create_subkey(primary_bytes=primary_bytes, pubkey=self.pubkey,
signer_func=self.conn.sign, ecdh=self.ecdh)
def sign_message(self, msg, sign_time=None):
"""Sign GPG message at specified time."""
if sign_time is None: