From 41b3d0975de65d1654f5e37c626d7c9b7c9a7a4d Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 5 Dec 2016 10:58:39 +0100 Subject: 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 --- g10/export.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'g10/export.c') 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 -- cgit v1.2.3