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

gpg: rename proto -> protocol

Browse Source
This commit is contained in:
Roman Zeyde
2016-07-26 19:37:42 +03:00
parent 8ab0908388
commit 82e08d073b
5 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
trezor_agent/gpg/__main__.py
View File

@@ -7,7 +7,7 @@ import os
import sys
import time
from . import agent, encode, keyring, proto
from . import agent, encode, keyring, protocol
from .. import server
log = logging.getLogger(__name__)
@@ -24,11 +24,11 @@ def run_create(args):
if args.subkey:
primary_bytes = keyring.export_public_key(user_id=user_id)
# subkey for signing
signing_key = proto.PublicKey(
signing_key = protocol.PublicKey(
curve_name=args.ecdsa_curve, created=args.time,
verifying_key=verifying_key, ecdh=False)
# subkey for encryption
encryption_key = proto.PublicKey(
encryption_key = protocol.PublicKey(
curve_name=args.ecdsa_curve, created=args.time,
verifying_key=decryption_key, ecdh=True)
result = encode.create_subkey(primary_bytes=primary_bytes,
@@ -39,11 +39,11 @@ def run_create(args):
signer_func=conn.sign)
else:
# primary key for signing
primary = proto.PublicKey(
primary = protocol.PublicKey(
curve_name=args.ecdsa_curve, created=args.time,
verifying_key=verifying_key, ecdh=False)
# subkey for encryption
subkey = proto.PublicKey(
subkey = protocol.PublicKey(
curve_name=args.ecdsa_curve, created=args.time,
verifying_key=decryption_key, ecdh=True)
@@ -54,7 +54,7 @@ def run_create(args):
pubkey=subkey,
signer_func=conn.sign)
sys.stdout.write(proto.armor(result, 'PUBLIC KEY BLOCK'))
sys.stdout.write(protocol.armor(result, 'PUBLIC KEY BLOCK'))
def run_agent(args):