diff options
| author | NIIBE Yutaka <[email protected]> | 2014-12-12 08:41:56 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2014-12-12 08:46:45 +0000 |
| commit | 4f0d526b7df871318508f8c3d2f57e7069c47e6f (patch) | |
| tree | 1499cf692a4d9f39bdeb7489c1c27ac79afb7080 | |
| parent | po: Update French translation (diff) | |
| download | gnupg-4f0d526b7df871318508f8c3d2f57e7069c47e6f.tar.gz gnupg-4f0d526b7df871318508f8c3d2f57e7069c47e6f.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
Cherry-picked da66ad5bba4215b9ddd0cb927a89aa75355632aa from
STABLE-BRANCH-1-4 branch.
| -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 17fde7f4a..10cca7d8d 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) |