security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

Update option s2k-count to match the documentation.

Browse Source 
The option would previously return an error if its value was < 65536.
This commit is contained in:
Ben Kibbey 2011-08-09 18:56:16 -04:00 committed by Werner Koch
parent 81389383a3
commit 28eac436bb
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-09 Ben Kibbey <bjk@luxsci.net>
* command.c (option_handler): Have option s2k-count match the
documentation.
2011-07-27 Werner Koch <wk@g10code.com> 2011-07-27 Werner Koch <wk@g10code.com>
* call-scd.c (struct inq_needpin_s): Add field ANY_INQ_SEEN. * call-scd.c (struct inq_needpin_s): Add field ANY_INQ_SEEN.

6
agent/command.c
View File

@ -2505,10 +2505,10 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
else if (!strcmp (key, "s2k-count")) else if (!strcmp (key, "s2k-count"))
{ {
ctrl->s2k_count = *value? strtoul(value, NULL, 10) : 0; 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; ctrl->s2k_count = 0;
err = gpg_error (GPG_ERR_INV_VALUE); }
}
} }
else else
err = gpg_error (GPG_ERR_UNKNOWN_OPTION); err = gpg_error (GPG_ERR_UNKNOWN_OPTION);