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

gpg: use policy URI subpacket for marking our public keys

Browse Source 
keybase.io does not support experimental/private subpacket IDs
This commit is contained in:
Roman Zeyde 2016-10-29 17:15:24 +03:00
parent 0342b39465
commit c7346d621d
No known key found for this signature in database
GPG Key ID: 87CAE5FA46917CBB
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trezor_agent/gpg/decode.py
View File

@ -127,7 +127,9 @@ def _parse_signature(stream):
log.debug('embedded sigs: %s', embedded) log.debug('embedded sigs: %s', embedded)
p['embedded'] = embedded p['embedded'] = embedded
p['_is_custom'] = (protocol.CUSTOM_SUBPACKET in p['unhashed_subpackets']) # Detect our custom public keys by matching subpacket data
p['_is_custom'] = any(protocol.CUSTOM_KEY_LABEL == subpacket[1:]
for subpacket in p['unhashed_subpackets'])
p['hash_prefix'] = stream.readfmt('2s') p['hash_prefix'] = stream.readfmt('2s')
if p['pubkey_alg'] in ECDSA_ALGO_IDS: if p['pubkey_alg'] in ECDSA_ALGO_IDS:

4
trezor_agent/gpg/protocol.py
View File

@ -167,7 +167,9 @@ SUPPORTED_CURVES = {
ECDH_ALGO_ID = 18 ECDH_ALGO_ID = 18
CUSTOM_SUBPACKET = subpacket(100, b'TREZOR-GPG') # marks "our" pubkey CUSTOM_KEY_LABEL = b'TREZOR-GPG' # marks "our" pubkey
CUSTOM_SUBPACKET_ID = 26 # use "policy URL" subpacket
CUSTOM_SUBPACKET = subpacket(CUSTOM_SUBPACKET_ID, CUSTOM_KEY_LABEL)
def get_curve_name_by_oid(oid): def get_curve_name_by_oid(oid):