blob42/trezor-agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gpg: use separate derivations for GPG keys

Browse Source
This commit is contained in:
Roman Zeyde 2016-06-17 09:34:05 +03:00
parent d9fbfccd35
commit c98cb22ba4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
trezor_agent/gpg/__main__.py
View File

@ -18,7 +18,8 @@ def run_create(args):
user_id = os.environ['TREZOR_GPG_USER_ID'] user_id = os.environ['TREZOR_GPG_USER_ID']
conn = encode.HardwareSigner(user_id=user_id, conn = encode.HardwareSigner(user_id=user_id,
curve_name=args.ecdsa_curve) curve_name=args.ecdsa_curve)
verifying_key = conn.pubkey() verifying_key = conn.pubkey(ecdh=False)
decryption_key = conn.pubkey(ecdh=True)
if args.subkey: if args.subkey:
primary_bytes = keyring.export_public_key(user_id=user_id) primary_bytes = keyring.export_public_key(user_id=user_id)
@ -29,7 +30,7 @@ def run_create(args):
# subkey for encryption # subkey for encryption
encryption_key = proto.PublicKey( encryption_key = proto.PublicKey(
curve_name=args.ecdsa_curve, created=args.time, curve_name=args.ecdsa_curve, created=args.time,
verifying_key=verifying_key, ecdh=True) verifying_key=decryption_key, ecdh=True)
result = encode.create_subkey(primary_bytes=primary_bytes, result = encode.create_subkey(primary_bytes=primary_bytes,
pubkey=signing_key, pubkey=signing_key,
signer_func=conn.sign) signer_func=conn.sign)
@ -44,7 +45,7 @@ def run_create(args):
# subkey for encryption # subkey for encryption
subkey = proto.PublicKey( subkey = proto.PublicKey(
curve_name=args.ecdsa_curve, created=args.time, curve_name=args.ecdsa_curve, created=args.time,
verifying_key=verifying_key, ecdh=True) verifying_key=decryption_key, ecdh=True)
result = encode.create_primary(user_id=user_id, result = encode.create_primary(user_id=user_id,
pubkey=primary, pubkey=primary,