diff options
author | Werner Koch <[email protected]> | 2010-01-08 19:18:49 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2010-01-08 19:18:49 +0000 |
commit | be45bf3d544873ff4bc86496c6ab6c5f16c6a26e (patch) | |
tree | 31c443f6d989917ea476143abc4fd5d2ae749faa /agent/command.c | |
parent | Fix bug 1146 (diff) | |
download | gnupg-be45bf3d544873ff4bc86496c6ab6c5f16c6a26e.tar.gz gnupg-be45bf3d544873ff4bc86496c6ab6c5f16c6a26e.zip |
Add dummu option --passwd for gpg.
Collected changes.
Diffstat (limited to '')
-rw-r--r-- | agent/command.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/agent/command.c b/agent/command.c index deb5beb13..1e0c5e744 100644 --- a/agent/command.c +++ b/agent/command.c @@ -1637,6 +1637,7 @@ static const char hlp_getinfo[] = " socket_name - Return the name of the socket.\n" " ssh_socket_name - Return the name of the ssh socket.\n" " scd_running - Return OK if the SCdaemon is already running.\n" + " s2k_count - Return the calibrated S2K count.\n" " cmd_has_option\n" " - Returns OK if the command CMD implements the option OPT."; static gpg_error_t @@ -1678,6 +1679,13 @@ cmd_getinfo (assuan_context_t ctx, char *line) { rc = agent_scd_check_running ()? 0 : gpg_error (GPG_ERR_GENERAL); } + else if (!strcmp (line, "s2k_count")) + { + char numbuf[50]; + + snprintf (numbuf, sizeof numbuf, "%lu", get_standard_s2k_count ()); + rc = assuan_send_data (ctx, numbuf, strlen (numbuf)); + } else if (!strncmp (line, "cmd_has_option", 14) && (line[14] == ' ' || line[14] == '\t' || !line[14])) { |