From 7dfa3ab255504dc0cae055a92f761eac8cbe2b32 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Sat, 30 Apr 2016 09:29:04 +0300 Subject: [PATCH] gpg: replace PublicKey.curve_name attribute --- trezor_agent/gpg/encode.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/trezor_agent/gpg/encode.py b/trezor_agent/gpg/encode.py index 05ea87d..deae7a4 100644 --- a/trezor_agent/gpg/encode.py +++ b/trezor_agent/gpg/encode.py @@ -143,20 +143,22 @@ class AgentSigner(object): class PublicKey(object): + """GPG representation for public key packets.""" + def __init__(self, curve_name, created, verifying_key): - self.curve_name = str(curve_name) - self.created = int(created) + """Contruct using a ECDSA VerifyingKey object.""" + self.curve_info = SUPPORTED_CURVES[curve_name] + self.created = int(created) # time since Epoch self.verifying_key = verifying_key def data(self): """Data for packet creation.""" - curve_info = SUPPORTED_CURVES[self.curve_name] header = struct.pack('>BLB', 4, # version self.created, # creation - curve_info['algo_id']) - oid = util.prefix_len('>B', curve_info['oid']) - blob = curve_info['serialize'](self.verifying_key) + self.curve_info['algo_id']) + oid = util.prefix_len('>B', self.curve_info['oid']) + blob = self.curve_info['serialize'](self.verifying_key) return header + oid + blob def data_to_hash(self):