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

formats: refactor parsing code

Browse Source
This commit is contained in:
Roman Zeyde
2015-07-20 18:28:00 +03:00
parent b7cc276259
commit 86b166ba08
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sshagent/formats.py
View File

@@ -51,16 +51,6 @@ def parse_pubkey(blob):
return result
def parse_public_key(data):
file_type, base64blob, name = data.split()
blob = base64.b64decode(base64blob)
result = parse_pubkey(blob)
result['name'] = name.encode('ascii')
assert result['type'] == file_type.encode('ascii')
log.debug('loaded %s %s', file_type, result['fingerprint'])
return result
def decompress_pubkey(pub):
P = curve.curve.p()
A = curve.curve.a()
@@ -81,3 +71,14 @@ def export_public_key(pubkey, label):
log.debug('fingerprint: %s', fingerprint(blob))
b64 = base64.b64encode(blob)
return '{} {} {}\n'.format(ECDSA_KEY_TYPE, b64, label)
def import_public_key(line):
''' Parse public key textual format, as saved at .pub file '''
file_type, base64blob, name = line.split()
blob = base64.b64decode(base64blob)
result = parse_pubkey(blob)
result['name'] = name.encode('ascii')
assert result['type'] == file_type.encode('ascii')
log.debug('loaded %s %s', file_type, result['fingerprint'])
return result