Browse Source

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

Nick Mathewson 10 years ago
parent
commit
a0577aacb4
2 changed files with 8 additions and 0 deletions
  1. 4 0
      changes/bug10835
  2. 4 0
      src/test/bench.c

+ 4 - 0
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.

+ 4 - 0
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);