diff options
| author | Ben Kibbey <[email protected]> | 2011-08-09 22:56:16 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-08-10 10:46:06 +0000 |
| commit | 28eac436bbe894c0464a3b3d3ad20ed841d0ca9d (patch) | |
| tree | 88b81de69ff6232b8bcca315ffe21e14a7fb36cb | |
| parent | Made the KILLAGENT and KILLSCD commands working again. (diff) | |
| download | gnupg-28eac436bbe894c0464a3b3d3ad20ed841d0ca9d.tar.gz gnupg-28eac436bbe894c0464a3b3d3ad20ed841d0ca9d.zip | |
Update option s2k-count to match the documentation.
The option would previously return an error if its value was < 65536.
Diffstat (limited to '')
| -rw-r--r-- | agent/ChangeLog | 5 | ||||
| -rw-r--r-- | agent/command.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 60ea7eeae..b4a333a71 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,8 @@ +2011-08-09 Ben Kibbey <[email protected]> + + * command.c (option_handler): Have option s2k-count match the + documentation. + 2011-07-27 Werner Koch <[email protected]> * call-scd.c (struct inq_needpin_s): Add field ANY_INQ_SEEN. diff --git a/agent/command.c b/agent/command.c index 4fbbfb56f..6973e78e5 100644 --- a/agent/command.c +++ b/agent/command.c @@ -2505,10 +2505,10 @@ option_handler (assuan_context_t ctx, const char *key, const char *value) else if (!strcmp (key, "s2k-count")) { ctrl->s2k_count = *value? strtoul(value, NULL, 10) : 0; - if (ctrl->s2k_count && ctrl->s2k_count < 65536) { + if (ctrl->s2k_count && ctrl->s2k_count < 65536) + { ctrl->s2k_count = 0; - err = gpg_error (GPG_ERR_INV_VALUE); - } + } } else err = gpg_error (GPG_ERR_UNKNOWN_OPTION); |