Make sure NSS is initialized before running benchmarks

This commit is contained in:
Nick Mathewson 2018-07-13 13:43:23 -04:00
parent f64c9dccde
commit be8d497b65

View File

@ -681,9 +681,9 @@ main(int argc, const char **argv)
tor_threads_init(); tor_threads_init();
tor_compress_init(); tor_compress_init();
init_logging(1);
if (argc == 4 && !strcmp(argv[1], "diff")) { if (argc == 4 && !strcmp(argv[1], "diff")) {
init_logging(1);
const int N = 200; const int N = 200;
char *f1 = read_file_to_str(argv[2], RFTS_BIN, NULL); char *f1 = read_file_to_str(argv[2], RFTS_BIN, NULL);
char *f2 = read_file_to_str(argv[3], RFTS_BIN, NULL); char *f2 = read_file_to_str(argv[3], RFTS_BIN, NULL);
@ -719,13 +719,12 @@ main(int argc, const char **argv)
reset_perftime(); reset_perftime();
if (crypto_seed_rng() < 0) { if (crypto_global_init(0, NULL, NULL) < 0) {
printf("Couldn't seed RNG; exiting.\n"); printf("Couldn't seed RNG; exiting.\n");
return 1; return 1;
} }
init_protocol_warning_severity_level(); init_protocol_warning_severity_level();
crypto_init_siphash_key();
options = options_new(); options = options_new();
init_logging(1); init_logging(1);
options->command = CMD_RUN_UNITTESTS; options->command = CMD_RUN_UNITTESTS;