diff options
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/ChangeLog | 13 | ||||
| -rw-r--r-- | agent/agent.h | 17 | ||||
| -rw-r--r-- | agent/call-pinentry.c | 32 | ||||
| -rw-r--r-- | agent/command.c | 18 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 5 |
5 files changed, 83 insertions, 2 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 7ec8789fd..de5f3da5b 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,16 @@ +2011-03-03 Werner Koch <[email protected]> + + * gpg-agent.c: Add option --allow-loopback-pinentry. + * command.c (option_handler): Add option pinentry-mode. + * agent.h (pinentry_mode_t): New enum. + (struct server_local_s): Add PINENTRY_MODE. + (struct opt): Add ALLOW_LOOPBACK_PINENTRY. + * call-pinentry.c (agent_askpin): Implement ask, cancel and error + pinentry modes. + (agent_get_passphrase, agent_get_confirmation): Ditto. + (agent_show_message): Return cancel if pinentry mode is not "ask". + (agent_popup_message_start): Ditto. + 2011-03-02 Werner Koch <[email protected]> * call-scd.c (hash_algo_option): New. diff --git a/agent/agent.h b/agent/agent.h index 3319c3684..3e01897d1 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -45,6 +45,18 @@ /* Maximum length of a digest. */ #define MAX_DIGEST_LEN 64 + +/* Values for the pinentry mode. */ +typedef enum + { + PINENTRY_MODE_ASK = 0, /* Ask via pinentry (default). */ + PINENTRY_MODE_CANCEL, /* Always return a cancel error. */ + PINENTRY_MODE_ERROR, /* Return error code for no pinentry. */ + PINENTRY_MODE_LOOPBACK,/* Use an inquiry to get the value. */ + } +pinentry_mode_t; + + /* A large struct name "opt" to keep global flags */ struct { @@ -67,7 +79,6 @@ struct char *startup_lc_ctype; char *startup_lc_messages; - const char *pinentry_program; /* Filename of the program to start as pinentry. */ const char *scdaemon_program; /* Filename of the program to handle @@ -105,6 +116,7 @@ struct int ignore_cache_for_signing; int allow_mark_trusted; int allow_preset_passphrase; + int allow_loopback_pinentry; int keep_tty; /* Don't switch the TTY (for pinentry) on request */ int keep_display; /* Don't switch the DISPLAY (for pinentry) on request */ int ssh_support; /* Enable ssh-agent emulation. */ @@ -149,6 +161,9 @@ struct server_control_s char *lc_ctype; char *lc_messages; + /* The current pinentry mode. */ + pinentry_mode_t pinentry_mode; + struct { int algo; unsigned char value[MAX_DIGEST_LEN]; diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c index c570e3819..4c30f6dea 100644 --- a/agent/call-pinentry.c +++ b/agent/call-pinentry.c @@ -742,6 +742,14 @@ agent_askpin (ctrl_t ctrl, if (opt.batch) return 0; /* fixme: we should return BAD PIN */ + if (ctrl->pinentry_mode != PINENTRY_MODE_ASK) + { + if (ctrl->pinentry_mode == PINENTRY_MODE_CANCEL) + return gpg_error (GPG_ERR_CANCELED); + /*FIXME: Implement loopback mode. */ + return gpg_error (GPG_ERR_NO_PIN_ENTRY); + } + if (!pininfo || pininfo->max_length < 1) return gpg_error (GPG_ERR_INV_VALUE); if (!desc_text && pininfo->min_digits) @@ -895,6 +903,14 @@ agent_get_passphrase (ctrl_t ctrl, if (opt.batch) return gpg_error (GPG_ERR_BAD_PASSPHRASE); + if (ctrl->pinentry_mode != PINENTRY_MODE_ASK) + { + if (ctrl->pinentry_mode == PINENTRY_MODE_CANCEL) + return gpg_error (GPG_ERR_CANCELED); + + return gpg_error (GPG_ERR_NO_PIN_ENTRY); + } + rc = start_pinentry (ctrl); if (rc) return rc; @@ -981,6 +997,14 @@ agent_get_confirmation (ctrl_t ctrl, int rc; char line[ASSUAN_LINELENGTH]; + if (ctrl->pinentry_mode != PINENTRY_MODE_ASK) + { + if (ctrl->pinentry_mode == PINENTRY_MODE_CANCEL) + return gpg_error (GPG_ERR_CANCELED); + + return gpg_error (GPG_ERR_NO_PIN_ENTRY); + } + rc = start_pinentry (ctrl); if (rc) return rc; @@ -1046,7 +1070,7 @@ agent_get_confirmation (ctrl_t ctrl, /* Pop up the PINentry, display the text DESC and a button with the - text OK_BTN (which may be NULL to use the default of "OK") and waut + text OK_BTN (which may be NULL to use the default of "OK") and wait for the user to hit this button. The return value is not relevant. */ int @@ -1055,6 +1079,9 @@ agent_show_message (ctrl_t ctrl, const char *desc, const char *ok_btn) int rc; char line[ASSUAN_LINELENGTH]; + if (ctrl->pinentry_mode != PINENTRY_MODE_ASK) + return gpg_error (GPG_ERR_CANCELED); + rc = start_pinentry (ctrl); if (rc) return rc; @@ -1123,6 +1150,9 @@ agent_popup_message_start (ctrl_t ctrl, const char *desc, const char *ok_btn) char line[ASSUAN_LINELENGTH]; pth_attr_t tattr; + if (ctrl->pinentry_mode != PINENTRY_MODE_ASK) + return gpg_error (GPG_ERR_CANCELED); + rc = start_pinentry (ctrl); if (rc) return rc; diff --git a/agent/command.c b/agent/command.c index 79b9b9731..b4b9b9e4c 100644 --- a/agent/command.c +++ b/agent/command.c @@ -2402,6 +2402,24 @@ option_handler (assuan_context_t ctx, const char *key, const char *value) ctrl->server_local->use_cache_for_signing = *value? atoi (value) : 0; else if (!strcmp (key, "allow-pinentry-notify")) ctrl->server_local->allow_pinentry_notify = 1; + else if (!strcmp (key, "pinentry-mode")) + { + if (!strcmp (value, "ask") || !strcmp (value, "default")) + ctrl->pinentry_mode = PINENTRY_MODE_ASK; + else if (!strcmp (value, "cancel")) + ctrl->pinentry_mode = PINENTRY_MODE_CANCEL; + else if (!strcmp (value, "error")) + ctrl->pinentry_mode = PINENTRY_MODE_ERROR; + else if (!strcmp (value, "loopback")) + { + if (opt.allow_loopback_pinentry) + ctrl->pinentry_mode = PINENTRY_MODE_LOOPBACK; + else + err = gpg_error (GPG_ERR_NOT_SUPPORTED); + } + else + err = gpg_error (GPG_ERR_INV_VALUE); + } else err = gpg_error (GPG_ERR_UNKNOWN_OPTION); diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index e5af91ed9..c64b32feb 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -105,6 +105,7 @@ enum cmd_and_opt_values oIgnoreCacheForSigning, oAllowMarkTrusted, oAllowPresetPassphrase, + oAllowLoopbackPinentry, oKeepTTY, oKeepDISPLAY, oSSHSupport, @@ -179,6 +180,8 @@ static ARGPARSE_OPTS opts[] = { N_("allow clients to mark keys as \"trusted\"")}, { oAllowPresetPassphrase, "allow-preset-passphrase", 0, N_("allow presetting passphrase")}, + { oAllowLoopbackPinentry, "allow-loopback-pinentry", 0, + N_("allow presetting passphrase")}, { oSSHSupport, "enable-ssh-support", 0, N_("enable ssh-agent emulation") }, { oWriteEnvFile, "write-env-file", 2|8, N_("|FILE|write environment settings also to FILE")}, @@ -549,6 +552,8 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) case oAllowPresetPassphrase: opt.allow_preset_passphrase = 1; break; + case oAllowLoopbackPinentry: opt.allow_loopback_pinentry = 1; break; + default: return 0; /* not handled */ } |