Merge branch 'bug16034_no_more_openssl_098_squashed'

Conflicts: src/test/testing_common.c
2024-12-06 19:41:15 +01:00 · 2015-05-20 15:33:22 -04:00
parent 32bd533dda e9677c8f8d
commit ed02a409cf
12 changed files with 191 additions and 225 deletions
@@ -270,7 +270,7 @@ main(int c, const char **v)
    return 1;
  }
  crypto_set_tls_dh_prime();
-  crypto_seed_rng(1);
+  crypto_seed_rng();
  rep_hist_init();
  network_init();
  setup_directory();