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

gpg: return correct keygrip for KEYINFO assuan command

Browse Source
This commit is contained in:
Roman Zeyde
2017-11-16 22:13:05 +02:00
parent 1f9d457e92
commit a1ecbf447e
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libagent/gpg/agent.py
View File

@@ -57,6 +57,18 @@ def parse_ecdh(line):
return dict(items)[b'e'] return dict(items)[b'e']
def _key_info(conn, args):
"""
Dummy reply (mainly for 'gpg --edit' to succeed).
For details, see GnuPG agent KEYINFO command help.
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=agent/command.c;h=c8b34e9882076b1b724346787781f657cac75499;hb=refs/heads/master#l1082
"""
fmt = 'S KEYINFO {0} X - - - - - - -'
keygrip, = args
keyring.sendline(conn, fmt.format(keygrip).encode('ascii'))
class AgentError(Exception): class AgentError(Exception):
"""GnuPG agent-related error.""" """GnuPG agent-related error."""
@@ -93,7 +105,7 @@ class Handler(object):
b'PKSIGN': lambda conn, _: self.pksign(conn), b'PKSIGN': lambda conn, _: self.pksign(conn),
b'PKDECRYPT': lambda conn, _: self.pkdecrypt(conn), b'PKDECRYPT': lambda conn, _: self.pkdecrypt(conn),
b'HAVEKEY': lambda _, args: self.have_key(*args), b'HAVEKEY': lambda _, args: self.have_key(*args),
b'KEYINFO': lambda conn, _: self.key_info(conn), b'KEYINFO': _key_info,
b'SCD': self.handle_scd, b'SCD': self.handle_scd,
} }
@@ -165,16 +177,6 @@ class Handler(object):
else: else:
raise AgentError(b'ERR 67108881 No secret key <GPG Agent>') raise AgentError(b'ERR 67108881 No secret key <GPG Agent>')
def key_info(self, conn):
"""
Dummy reply (mainly for 'gpg --edit' to succeed).
For details, see GnuPG agent KEYINFO command help.
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=agent/command.c;h=c8b34e9882076b1b724346787781f657cac75499;hb=refs/heads/master#l1082
"""
fmt = 'S KEYINFO {0} X - - - - - - -'
keyring.sendline(conn, fmt.format(self.keygrip).encode('ascii'))
def set_key(self, keygrip): def set_key(self, keygrip):
"""Set hexadecimal keygrip for next operation.""" """Set hexadecimal keygrip for next operation."""
self.keygrip = keygrip self.keygrip = keygrip