From f982d785bd45e6312a9b75ed21a51e44d2c7510c Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Sat, 30 Apr 2016 16:27:43 +0300 Subject: [PATCH] gpg: add marker to our pubkey signature packets --- trezor_agent/gpg/encode.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/trezor_agent/gpg/encode.py b/trezor_agent/gpg/encode.py index 3be6a43..a95c139 100644 --- a/trezor_agent/gpg/encode.py +++ b/trezor_agent/gpg/encode.py @@ -93,6 +93,9 @@ SUPPORTED_CURVES = { } +MARKER = b'TREZOR-GPG' + + def _find_curve_by_algo_id(algo_id): curve_name, = [name for name, info in SUPPORTED_CURVES.items() if info['algo_id'] == algo_id] @@ -249,7 +252,8 @@ class Signer(object): subpacket_byte(0x16, 0), # preferred compression (none) subpacket_byte(0x17, 0x80)] # key server prefs (no-modify) unhashed_subpackets = [ - subpacket(16, self.pubkey.key_id())] # issuer key id + subpacket(16, self.pubkey.key_id()), # issuer key id + subpacket(100, MARKER)] signature = _make_signature( signer_func=self.conn.sign, @@ -289,7 +293,8 @@ class Signer(object): subpacket_byte(0x1B, 2)] # key flags (certify & sign) unhashed_subpackets = [ subpacket(16, primary['key_id']), # issuer key id - subpacket(32, embedded_sig)] + subpacket(32, embedded_sig), + subpacket(100, MARKER)] gpg_agent = AgentSigner(self.user_id) signature = _make_signature(signer_func=gpg_agent.sign, data_to_sign=data_to_sign,