diff options
| -rw-r--r-- | agent/ChangeLog | 5 | ||||
| -rw-r--r-- | agent/protect.c | 32 |
2 files changed, 24 insertions, 13 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 70ff89b48..4b98e9c34 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,8 @@ +2010-01-26 Werner Koch <[email protected]> + + * protect.c (do_encryption): Encode the s2kcount and no not use a + static value of 96. + 2009-12-21 Werner Koch <[email protected]> * command.c (cmd_getinfo): Add sub-command s2k_count. diff --git a/agent/protect.c b/agent/protect.c index d5bb982af..0e2f52ce9 100644 --- a/agent/protect.c +++ b/agent/protect.c @@ -360,19 +360,25 @@ do_encryption (const unsigned char *protbegin, size_t protlen, in canoncical format of course. We use asprintf and %n modifier and dummy values as placeholders. */ - p = xtryasprintf - ("(9:protected%d:%s((4:sha18:%n_8bytes_2:96)%d:%n%*s)%d:%n%*s)", - (int)strlen (modestr), modestr, - &saltpos, - blklen, &ivpos, blklen, "", - enclen, &encpos, enclen, ""); - if (!p) - { - gpg_error_t tmperr = out_of_core (); - xfree (iv); - xfree (outbuf); - return tmperr; - } + { + char countbuf[35]; + + snprintf (countbuf, sizeof countbuf, "%lu", get_standard_s2k_count ()); + p = xtryasprintf + ("(9:protected%d:%s((4:sha18:%n_8bytes_%u:%s)%d:%n%*s)%d:%n%*s)", + (int)strlen (modestr), modestr, + &saltpos, + (unsigned int)strlen (countbuf), countbuf, + blklen, &ivpos, blklen, "", + enclen, &encpos, enclen, ""); + if (!p) + { + gpg_error_t tmperr = out_of_core (); + xfree (iv); + xfree (outbuf); + return tmperr; + } + } *resultlen = strlen (p); *result = (unsigned char*)p; memcpy (p+saltpos, iv+2*blklen, 8); |