nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Another memory leak bytes the dust.

Browse Source
This commit is contained in:
Nick Mathewson 2015-05-29 16:17:54 -04:00
parent a6e3db5f72
commit 12a2321501
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/or/routerkeys.c
View File

@ -312,12 +312,14 @@ load_ed_keys(const or_options_t *options, time_t now)
check_signing_cert = signing_key_cert; check_signing_cert = signing_key_cert;
use_signing = master_signing_key; use_signing = master_signing_key;
} else { } else {
char *fname = options_get_datadir_fname2(options, "keys", "ed25519_signing");
sign = ed_key_init_from_file( sign = ed_key_init_from_file(
options_get_datadir_fname2(options, "keys", "ed25519_signing"), fname,
INIT_ED_KEY_NEEDCERT| INIT_ED_KEY_NEEDCERT|
INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT, INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT,
LOG_INFO, LOG_INFO,
NULL, 0, 0, CERT_TYPE_ID_SIGNING, &sign_cert); NULL, 0, 0, CERT_TYPE_ID_SIGNING, &sign_cert);
tor_free(fname);
check_signing_cert = sign_cert; check_signing_cert = sign_cert;
use_signing = sign; use_signing = sign;
} }
@ -338,10 +340,12 @@ load_ed_keys(const or_options_t *options, time_t now)
if (! want_new_signing_key) if (! want_new_signing_key)
flags |= INIT_ED_KEY_OMIT_SECRET; flags |= INIT_ED_KEY_OMIT_SECRET;
char *fname = options_get_datadir_fname2(options, "keys", "ed25519_master_id");
id = ed_key_init_from_file( id = ed_key_init_from_file(
options_get_datadir_fname2(options, "keys", "ed25519_master_id"), fname,
flags, flags,
LOG_WARN, NULL, 0, 0, 0, NULL); LOG_WARN, NULL, 0, 0, 0, NULL);
tor_free(fname);
if (!id) if (!id)
FAIL("Missing identity key"); FAIL("Missing identity key");
if (tor_mem_is_zero((char*)id->seckey.seckey, sizeof(id->seckey))) if (tor_mem_is_zero((char*)id->seckey.seckey, sizeof(id->seckey)))
@ -359,12 +363,13 @@ load_ed_keys(const or_options_t *options, time_t now)
INIT_ED_KEY_EXTRA_STRONG| INIT_ED_KEY_EXTRA_STRONG|
INIT_ED_KEY_NEEDCERT| INIT_ED_KEY_NEEDCERT|
INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT); INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT);
sign = ed_key_init_from_file( char *fname = options_get_datadir_fname2(options, "keys", "ed25519_signing");
options_get_datadir_fname2(options, "keys", "ed25519_signing"), sign = ed_key_init_from_file(fname,
flags, LOG_WARN, flags, LOG_WARN,
sign_signing_key_with_id, now, sign_signing_key_with_id, now,
options->SigningKeyLifetime, options->SigningKeyLifetime,
CERT_TYPE_ID_SIGNING, &sign_cert); CERT_TYPE_ID_SIGNING, &sign_cert);
tor_free(fname);
if (!sign) if (!sign)
FAIL("Missing signing key"); FAIL("Missing signing key");
use_signing = sign; use_signing = sign;