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

gpg: fix logging and arguments in demo

Browse Source
This commit is contained in:
Roman Zeyde
2016-04-30 22:20:50 +03:00
parent a0e476ea19
commit 4a7fef3011
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trezor_agent/gpg/encode.py
View File

@@ -189,6 +189,7 @@ class Signer(object):
proto.subpacket_time(self.pubkey.created)] # signature time proto.subpacket_time(self.pubkey.created)] # signature time
unhashed_subpackets = [ unhashed_subpackets = [
proto.subpacket(16, self.pubkey.key_id())] # issuer key id proto.subpacket(16, self.pubkey.key_id())] # issuer key id
log.info('confirm signing subkey with hardware device')
embedded_sig = _make_signature(signer_func=self.conn.sign, embedded_sig = _make_signature(signer_func=self.conn.sign,
data_to_sign=data_to_sign, data_to_sign=data_to_sign,
public_algo=self.pubkey.algo_id, public_algo=self.pubkey.algo_id,
@@ -204,6 +205,7 @@ class Signer(object):
proto.subpacket(16, primary['key_id']), # issuer key id proto.subpacket(16, primary['key_id']), # issuer key id
proto.subpacket(32, embedded_sig), proto.subpacket(32, embedded_sig),
proto.CUSTOM_SUBPACKET] proto.CUSTOM_SUBPACKET]
log.info('confirm signing subkey with gpg-agent')
gpg_agent = AgentSigner(self.user_id) gpg_agent = AgentSigner(self.user_id)
signature = _make_signature(signer_func=gpg_agent.sign, signature = _make_signature(signer_func=gpg_agent.sign,
data_to_sign=data_to_sign, data_to_sign=data_to_sign,

2
trezor_agent/gpg/test.sh
View File

@@ -12,5 +12,5 @@ gpg2 -K
gpg2 -v --import <(cat romanz.pub subkey.pub) gpg2 -v --import <(cat romanz.pub subkey.pub)
gpg2 -K gpg2 -K
trezor-gpg -t $NOW -e $CURVE $USERID EXAMPLE trezor-gpg -t $NOW -e $CURVE "$USERID" EXAMPLE
gpg2 --verify EXAMPLE.sig gpg2 --verify EXAMPLE.sig