lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-04-04 19:56:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

gpg: rename load_from_gpg -> get_public_key

Browse Source
This commit is contained in:
Roman Zeyde
2016-05-21 20:23:48 +03:00
parent db6903eab7
commit 0b0f60dd89
4 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
trezor_agent/gpg/encode.py
View File

@@ -89,12 +89,7 @@ class Factory(object):
@classmethod
def from_public_key(cls, pubkey, user_id):
"""
Create from an existing GPG public key.
`pubkey` should be loaded via `decode.load_from_gpg(user_id)`
from the local GPG keyring.
"""
"""Create from an existing GPG public key."""
s = cls(user_id=user_id,
created=pubkey['created'],
curve_name=proto.find_curve_by_algo_id(pubkey['algo']))
@@ -144,7 +139,7 @@ class Factory(object):
def create_subkey(self):
"""Export new subkey to `self.user_id` GPG primary key."""
subkey_packet = proto.packet(tag=14, blob=self.pubkey.data())
primary = decode.load_from_gpg(self.user_id)
primary = keyring.get_public_key(self.user_id)
log.info('adding subkey to primary GPG key "%s" (%s)',
self.user_id, util.hexlify(primary['key_id']))
data_to_sign = primary['_to_hash'] + self.pubkey.data_to_hash()