diff options
| author | Werner Koch <wk@gnupg.org> | 2016-12-05 10:58:39 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-12-05 11:00:11 +0100 |
| commit | 41b3d0975de65d1654f5e37c626d7c9b7c9a7a4d (patch) | |
| tree | a097a86bcb7aaa4c149ef429bf1ad597fed61c7d /g10/export.c | |
| parent | tests: New test for '--enarmor' and '--dearmor'. (diff) | |
| download | gnupg2-41b3d0975de65d1654f5e37c626d7c9b7c9a7a4d.tar.xz gnupg2-41b3d0975de65d1654f5e37c626d7c9b7c9a7a4d.zip | |
gpg: New option --quick-set-expire.
* g10/gpg.c (aQuickSetExpire): New.
(opts): New option --quick-set-expire.
(main): Implement option.
* g10/keyedit.c (menu_expire): Add args FORCE_MAINKEY and
NEWEXPIRATION. Change semantics of the return value. Change caller.
(keyedit_quick_set_expire): New.
--
This patch partly solves
GnuPG-bug-id: 2701
Diffstat (limited to 'g10/export.c')
| -rw-r--r-- | g10/export.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/export.c b/g10/export.c index 6a5597ce1..ad42b41b5 100644 --- a/g10/export.c +++ b/g10/export.c @@ -1144,9 +1144,9 @@ print_status_exported (PKT_public_key *pk) /* * Receive a secret key from agent specified by HEXGRIP. * - * Since the key data from agant is encrypted, decrypt it by CIPHERHD. - * Then, parse the decrypted key data in transfer format, and put - * secret parameters into PK. + * Since the key data from the agent is encrypted, decrypt it using + * CIPHERHD context. Then, parse the decrypted key data into transfer + * format, and put secret parameters into PK. * * If CLEARTEXT is 0, store the secret key material * passphrase-protected. Otherwise, store secret key material in the |