diff options
| author | Werner Koch <[email protected]> | 2010-10-13 15:57:08 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-10-13 15:57:08 +0000 |
| commit | 54591341a417ca769b2219a9b2f7683f11a74718 (patch) | |
| tree | d4cd49932dec93aa9e20e1933ad16ba897965c46 /g10/passphrase.c | |
| parent | Describe %v and %V. (diff) | |
| download | gnupg-54591341a417ca769b2219a9b2f7683f11a74718.tar.gz gnupg-54591341a417ca769b2219a9b2f7683f11a74718.zip | |
More agent support for gpg.
Diffstat (limited to 'g10/passphrase.c')
| -rw-r--r-- | g10/passphrase.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index 60560123f..b28477fd5 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -211,17 +211,6 @@ get_last_passphrase() return p; } -/* As if we had used the passphrase - make it the last_pw. */ -void -next_to_last_passphrase(void) -{ - if (next_pw) - { - last_pw=next_pw; - next_pw=NULL; - } -} - /* Here's an interesting question: since this passphrase was passed in on the command line, is there really any point in using secure memory for it? I'm going with 'yes', since it doesn't hurt, and @@ -407,7 +396,8 @@ passphrase_get ( u32 *keyid, int mode, const char *cacheid, int repeat, if (!rc) ; - else if ( gpg_err_code (rc) == GPG_ERR_CANCELED ) + else if (gpg_err_code (rc) == GPG_ERR_CANCELED + || gpg_err_code (rc) == GPG_ERR_FULLY_CANCELED) { log_info (_("cancelled by user\n") ); if (canceled) |