From 28eac436bbe894c0464a3b3d3ad20ed841d0ca9d Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Tue, 9 Aug 2011 18:56:16 -0400 Subject: [PATCH] Update option s2k-count to match the documentation. The option would previously return an error if its value was < 65536. --- agent/ChangeLog | 5 +++++ 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 + + * command.c (option_handler): Have option s2k-count match the + documentation. + 2011-07-27 Werner Koch * 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);