diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-07 17:41:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-07 17:41:41 -0500 |
| commit | a0577aacb4a94e803b4d9ec266e969f1aa5a88f3 (patch) | |
| tree | c9cdc23534cc7e58a6f79494dce337130e50cd58 | |
| parent | fdf68479b077c2b53fcdffd54e307f1258c81a4b (diff) | |
| parent | 9bb34aa897e4ecac27a6f8d50a659803f73c6cb9 (diff) | |
| download | tor-a0577aacb4a94e803b4d9ec266e969f1aa5a88f3.tar.gz tor-a0577aacb4a94e803b4d9ec266e969f1aa5a88f3.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
| -rw-r--r-- | changes/bug10835 | 4 | ||||
| -rw-r--r-- | src/test/bench.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug10835 b/changes/bug10835 new file mode 100644 index 0000000000..9df7bdd279 --- /dev/null +++ b/changes/bug10835 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Fix a segmentation fault in our benchmark code when running with + Fedora's OpenSSL package, or any other OpenSSL that provides + ECDH but not P224. Fixes bug 10835; bugfix on 0.2.4.8-alpha. diff --git a/src/test/bench.c b/src/test/bench.c index e650569a75..ae311b53cf 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -438,6 +438,10 @@ bench_ecdh_impl(int nid, const char *name) ssize_t slen_a, slen_b; EC_KEY *dh_a = EC_KEY_new_by_curve_name(nid); EC_KEY *dh_b = EC_KEY_new_by_curve_name(nid); + if (!dh_a || !dh_b) { + puts("Skipping. (No implementation?)"); + return; + } EC_KEY_generate_key(dh_a); EC_KEY_generate_key(dh_b); |