From: Travis Cross <tc@traviscross.com>
Date: Thu, 6 Feb 2014 22:06:04 +0000 (+0000)
Subject: Add OpenSSL version check around ECDH
X-Git-Tag: v1.2.20~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1e40b088a8a91de80e8b2d705c7ae1da54be460;p=thirdparty%2Ffreeswitch.git

Add OpenSSL version check around ECDH

...we'll try to support ancient OpenSSL versions on v1.2 for awhile
longer.
---

diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c b/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c
index 33432283ef..6da5f0a6bb 100644
--- a/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c
@@ -266,6 +266,8 @@ int tls_verify_cb(int ok, X509_STORE_CTX *store)
 static
 int tls_init_ecdh_curve(tls_t *tls)
 {
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+#ifndef OPENSSL_NO_ECDH
   int nid;
   EC_KEY *ecdh;
   if (!(nid = OBJ_sn2nid("prime256v1"))) {
@@ -282,6 +284,9 @@ int tls_init_ecdh_curve(tls_t *tls)
   SSL_CTX_set_tmp_ecdh(tls->ctx, ecdh);
   EC_KEY_free(ecdh);
   return 0;
+#endif
+#endif
+  return -1;
 }
 
 static