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: check that the configuration is in place

Browse Source
This commit is contained in:
Roman Zeyde
2016-12-02 13:10:33 +02:00
parent f86aae9a40
commit 9fe1a235c1
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/gpg-shell
View File

@@ -5,6 +5,13 @@ gpg2 --version >/dev/null # verify that GnuPG 2 is installed
export GNUPGHOME=~/.gnupg/trezor export GNUPGHOME=~/.gnupg/trezor
CONFIG_PATH="${GNUPGHOME}/gpg-agent.conf"
if [ ! -f ${CONFIG_PATH} ]
then
echo "No configuration found: ${CONFIG_PATH}"
exit 1
fi
# Make sure that the device is unlocked before starting the shell # Make sure that the device is unlocked before starting the shell
trezor-gpg-unlock trezor-gpg-unlock

4
trezor_agent/gpg/__main__.py
View File

@@ -92,6 +92,10 @@ def main_agent():
"""Run a simple GPG-agent server.""" """Run a simple GPG-agent server."""
home_dir = os.environ.get('GNUPGHOME', os.path.expanduser('~/.gnupg/trezor')) home_dir = os.environ.get('GNUPGHOME', os.path.expanduser('~/.gnupg/trezor'))
config_file = os.path.join(home_dir, 'gpg-agent.conf') config_file = os.path.join(home_dir, 'gpg-agent.conf')
if not os.path.exists(config_file):
msg = 'No configuration file found: {}'.format(config_file)
raise IOError(msg)
lines = (line.strip() for line in open(config_file)) lines = (line.strip() for line in open(config_file))
lines = (line for line in lines if line and not line.startswith('#')) lines = (line for line in lines if line and not line.startswith('#'))
config = dict(line.split(' ', 1) for line in lines) config = dict(line.split(' ', 1) for line in lines)