Attachment 848772 Details for Bug 1051733 – Proposed patch

[patch] Proposed patch

fix-kdf.patch (text/plain), 975 bytes, created by Milan Broz on 2014-01-11 22:34:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Broz

Created: 2014-01-11 22:34:27 UTC

Size: 975 bytes

patch

obsolete

>The key should be set only once not in every iteration.
>
>--- libgcrypt-1.5.3.old/cipher/kdf.c	2013-07-25 11:10:03.000000000 +0200
>+++ libgcrypt-1.5.3/cipher/kdf.c	2014-01-11 23:31:00.384438958 +0100
>@@ -172,19 +172,21 @@ pkdf2 (const void *passphrase, size_t pa
>       return ec;
>     }
> 
>+  ec = gpg_err_code (gcry_md_setkey (md, passphrase, passphraselen));
>+  if (ec)
>+    {
>+      gcry_md_close (md);
>+      gcry_free (sbuf);
>+      return ec;
>+    }
>+
>   /* Step 3 and 4. */
>   memcpy (sbuf, salt, saltlen);
>   for (lidx = 1; lidx <= l; lidx++)
>     {
>       for (iter = 0; iter < iterations; iter++)
>         {
>-          ec = gpg_err_code (gcry_md_setkey (md, passphrase, passphraselen));
>-          if (ec)
>-            {
>-              gcry_md_close (md);
>-              gcry_free (sbuf);
>-              return ec;
>-            }
>+          gcry_md_reset(md);
>           if (!iter) /* Compute U_1:  */
>             {
>               sbuf[saltlen]     = (lidx >> 24);

Actions: View | Diff

Attachments on bug 1051733: 848766 | 848770 | 848771 | 848772