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

gpg: deduce curve name from existing pubkey information

Browse Source
This commit is contained in:
Roman Zeyde
2016-04-23 00:08:45 +03:00
parent fb368d24eb
commit 80f29469d0
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gpg/git_gpg_wrapper.py
View File

@@ -21,9 +21,7 @@ def main():
else:
command, user_id = args
assert command == '-bsau' # --detach-sign --sign --armor --local-user
pubkey = signer.load_from_gpg(user_id)
s = signer.Signer(user_id=user_id, created=pubkey['created'])
assert s.key_id() == pubkey['key_id']
s = signer.load_from_gpg(user_id)
data = sys.stdin.read()
sig = s.sign(data)

17
gpg/signer.py
View File

@@ -96,6 +96,11 @@ SUPPORTED_CURVES = {
}
}
def find_curve_by_algo_id(algo_id):
curve_name, = [name for name, info in SUPPORTED_CURVES.items()
if info['algo_id'] == algo_id]
return curve_name
class Signer(object):
@@ -233,7 +238,11 @@ def load_from_gpg(user_id):
log.info('loading GPG public key for %r', user_id)
pubkey_bytes = subprocess.check_output(['gpg2', '--export', user_id])
pubkey = decode.load_public_key(io.BytesIO(pubkey_bytes))
return pubkey
s = Signer(user_id=user_id,
created=pubkey['created'],
curve_name=find_curve_by_algo_id(pubkey['algo']))
assert s.key_id() == pubkey['key_id']
return s
def main():
@@ -261,11 +270,7 @@ def main():
open(filename, 'wb').write(pubkey)
log.info('import to local keyring using "gpg2 --import %s"', filename)
else:
pubkey = load_from_gpg(args.user_id)
s = Signer(user_id=user_id, created=pubkey['created'],
curve_name=args.ecdsa_curve) # TODO: deduce from existing pubkey
assert s.key_id() == pubkey['key_id']
s = load_from_gpg(user_id)
data = open(args.filename, 'rb').read()
sig, ext = s.sign(data), '.sig'
if args.armor: