[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.18-20-gda66ad5

[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-1-4 has been updated
       via  da66ad5bba4215b9ddd0cb927a89aa75355632aa (commit)
      from  c935c73f8262dcce7d5ac823ba4a6a2f563cc3eb (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 da66ad5bba4215b9ddd0cb927a89aa75355632aa
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

diff --git a/g10/keygen.c b/g10/keygen.c
index 9020908..5af0043 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -3447,6 +3447,7 @@ generate_subkeypair( KBNODE pub_keyblock, KBNODE sec_keyblock )
 
     rc = do_create (algo, nbits, pub_keyblock, sec_keyblock,
 		    dek, s2k, &sub_sk, timestamp, expire, 1 );
+    xfree( dek );
     if (!rc)
 	rc = write_keybinding (pub_keyblock, pub_keyblock, pri_sk, sub_sk,
                                use, timestamp);
@@ -3463,7 +3464,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