[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.26-31-g4f0d526

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-0 has been updated
       via  4f0d526b7df871318508f8c3d2f57e7069c47e6f (commit)
      from  4e03e2757521ddc39d627712937227b84bf72275 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4f0d526b7df871318508f8c3d2f57e7069c47e6f
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Dec 12 17:41:56 2014 +0900

    gpg: release DEK soon after its use.
    
    * g10/keygen.c (generate_subkeypair): Release DEK soon.
    
    --
    
    This fixes the out_of_core error in the test case of adding
    RSA-4096 subkey to RSA-4096 primary key with configuration:
    
        s2k-cipher-algo S10
    
    Debian-bug-id: 772780
    
    Cherry-picked da66ad5bba4215b9ddd0cb927a89aa75355632aa from
    STABLE-BRANCH-1-4 branch.

diff --git a/g10/keygen.c b/g10/keygen.c
index 17fde7f..10cca7d 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -3839,6 +3839,7 @@ generate_subkeypair (KBNODE pub_keyblock, KBNODE sec_keyblock)
   if (!rc)
     rc = do_create (algo, nbits, pub_keyblock, sec_keyblock,
                     dek, s2k, &sub_sk, cur_time, expire, 1 );
+  xfree (dek);
   if (!rc)
     rc = write_keybinding (pub_keyblock, pub_keyblock, pri_sk, sub_sk,
                           use, cur_time);
@@ -3855,7 +3856,6 @@ generate_subkeypair (KBNODE pub_keyblock, KBNODE sec_keyblock)
   if (rc)
     log_error (_("Key generation failed: %s\n"), g10_errstr(rc) );
   xfree (passphrase);
-  xfree (dek);
   xfree (s2k);
   /* Release the copy of the (now unprotected) secret keys.  */
   if (pri_sk)

-----------------------------------------------------------------------

Summary of changes:
 g10/keygen.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org