From f6b75d6ed0cda513cb4bbc81021e9595d7918999 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Tue, 16 Jun 2015 09:52:53 +0300 Subject: [PATCH] formats: remove unused code and reorg --- sshagent/formats.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sshagent/formats.py b/sshagent/formats.py index 99f29d3..b9dfcb8 100644 --- a/sshagent/formats.py +++ b/sshagent/formats.py @@ -8,15 +8,17 @@ log = logging.getLogger(__name__) from . import util -def fingerprint(blob): - digest = hashlib.md5(blob).digest() - return ':'.join('{:02x}'.format(c) for c in bytearray(digest)) - DER_OCTET_STRING = b'\x04' curve = ecdsa.NIST256p hashfunc = hashlib.sha256 + +def fingerprint(blob): + digest = hashlib.md5(blob).digest() + return ':'.join('{:02x}'.format(c) for c in bytearray(digest)) + + def parse_pubkey(blob): s = io.BytesIO(blob) key_type = util.read_frame(s) @@ -45,9 +47,6 @@ def parse_pubkey(blob): } return result -def load_public_key(filename): - with open(filename) as f: - return parse_public_key(f.read()) def parse_public_key(data): file_type, base64blob, name = data.split() @@ -58,6 +57,7 @@ def parse_public_key(data): log.debug('loaded %s %s', file_type, result['fingerprint']) return result + def decompress_pubkey(pub): P = curve.curve.p() A = curve.curve.a()