torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.3'

Browse Source 
Conflicts:
	src/common/crypto.c
	src/or/rendservice.c
This commit is contained in:
Nick Mathewson
2012-11-08 16:48:04 -05:00
parent 9f3f5372b8 9ad4776e61
commit 81deddb08c
19 changed files with 125 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/tor-gencert.c
+3 -3
View File
@@ -105,7 +105,7 @@ load_passphrase(void)
cp = memchr(buf, '\n', n);
passphrase_len = cp-buf;
passphrase = tor_strndup(buf, passphrase_len);
memset(buf, 0, sizeof(buf));
memwipe(buf, 0, sizeof(buf));
return 0;
}
@@ -113,7 +113,7 @@ static void
clear_passphrase(void)
{
if (passphrase) {
memset(passphrase, 0, passphrase_len);
memwipe(passphrase, 0, passphrase_len);
tor_free(passphrase);
}
}
@@ -191,7 +191,7 @@ parse_commandline(int argc, char **argv)
}
}
memset(&s, 0, sizeof(s));
memwipe(&s, 0, sizeof(s));
if (verbose)
set_log_severity_config(LOG_DEBUG, LOG_ERR, &s);
else