diff options
| author | Justus Winter <[email protected]> | 2016-08-11 07:52:08 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-08-11 07:52:08 +0000 |
| commit | 9e6503b7ce019aa417099ded1dda87b68c33f912 (patch) | |
| tree | d4a27497ec9f7f07439331c290dc4ad6434e15a6 /agent/preset-passphrase.c | |
| parent | gpg: Print the signer's UID during verification. (diff) | |
| download | gnupg-9e6503b7ce019aa417099ded1dda87b68c33f912.tar.gz gnupg-9e6503b7ce019aa417099ded1dda87b68c33f912.zip | |
common: Remove simple password query error codes.
* common/simple-pwquery.h: Remove mapping function. Move all
definitions of status codes...
* common/simple-pwquery.c: ... here, and define them to meaningful gpg
error values.
* agent/preset-passphrase.c (preset_passphrase): Use error code as-is.
(forget_passphrase): Likewise.
* tools/symcryptrun.c (confucius_get_pass): Likewise.
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'agent/preset-passphrase.c')
| -rw-r--r-- | agent/preset-passphrase.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c index 549ecc327..485ca7bb9 100644 --- a/agent/preset-passphrase.c +++ b/agent/preset-passphrase.c @@ -111,10 +111,6 @@ my_strusage (int level) -/* Include the implementation of map_spwq_error. */ -MAP_SPWQ_ERROR_IMPL - - static void preset_passphrase (const char *keygrip) { @@ -170,7 +166,7 @@ preset_passphrase (const char *keygrip) if (!opt_passphrase) wipememory (passphrase, sizeof (passphrase)); - rc = map_spwq_error (simple_query (line)); + rc = simple_query (line); if (rc) { log_error ("caching passphrase failed: %s\n", gpg_strerror (rc)); @@ -192,7 +188,7 @@ forget_passphrase (const char *keygrip) if (rc < 0) rc = gpg_error_from_syserror (); else - rc = map_spwq_error (simple_query (line)); + rc = simple_query (line); if (rc) { log_error ("clearing passphrase failed: %s\n", gpg_strerror (rc)); |