From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Feb 2014 22:36:11 +0000 (-0500)
Subject: Survive fedora's openssl in our benchmarks
X-Git-Tag: tor-0.2.5.2-alpha~14^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9bb34aa897e4ecac27a6f8d50a659803f73c6cb9;p=thirdparty%2Ftor.git

Survive fedora's openssl in our benchmarks

Apparently fedora currently has ECDH but not P224. This isn't a huge
deal, since we no longer use OpenSSL's P224 ever (see #9780 and
72c1e5acfe1c6). But we shouldn't have segfaulting benchmarks really.

Fixes bug 10835; bugfix on 0.2.4.8-alpha.
---

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 5a8d21d173..706b8bc7fb 100644
--- a/src/test/bench.c
+++ b/src/test/bench.c
@@ -440,6 +440,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);