diff options
| author | NIIBE Yutaka <[email protected]> | 2014-12-12 08:41:56 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2014-12-12 08:41:56 +0000 |
| commit | da66ad5bba4215b9ddd0cb927a89aa75355632aa (patch) | |
| tree | b9be8c391490c6c9ee324f603c9dbbd5c362d8ee | |
| parent | doc: Do not install gnupg.7 (diff) | |
| download | gnupg-da66ad5bba4215b9ddd0cb927a89aa75355632aa.tar.gz gnupg-da66ad5bba4215b9ddd0cb927a89aa75355632aa.zip | |
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
| -rw-r--r-- | g10/keygen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index 90209083f..5af00437b 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 ) |