You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/12/05 05:24:23 UTC
git commit: TS-2372: include openssl/ec.h
Updated Branches:
refs/heads/master c1d73e836 -> 6ae5e9219
TS-2372: include openssl/ec.h
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6ae5e921
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6ae5e921
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6ae5e921
Branch: refs/heads/master
Commit: 6ae5e9219fe56baef60c3592c3f56e74fe5906a3
Parents: c1d73e8
Author: James Peach <jp...@apache.org>
Authored: Wed Dec 4 20:24:07 2013 -0800
Committer: James Peach <jp...@apache.org>
Committed: Wed Dec 4 20:24:07 2013 -0800
----------------------------------------------------------------------
build/crypto.m4 | 2 +-
iocore/net/SSLUtils.cc | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6ae5e921/build/crypto.m4
----------------------------------------------------------------------
diff --git a/build/crypto.m4 b/build/crypto.m4
index 80f1cf7..20cefb7 100644
--- a/build/crypto.m4
+++ b/build/crypto.m4
@@ -131,7 +131,7 @@ AC_DEFUN([TS_CHECK_CRYPTO_SNI], [
enable_tls_sni=yes
TS_ADDTO(LIBS, [$LIBSSL])
- AC_CHECK_HEADERS(openssl/tls1.h openssl/ssl.h openssl/ts.h)
+ AC_CHECK_HEADERS(openssl/tls1.h openssl/ssl.h openssl/ts.h openssl/ec.h)
# We are looking for SSL_CTX_set_tlsext_servername_callback, but it's a
# macro, so AC_CHECK_FUNCS is not going to do the business.
AC_MSG_CHECKING([for SSL_CTX_set_tlsext_servername_callback])
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6ae5e921/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 33d1bd5..2dc691c 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -34,6 +34,10 @@
#include <openssl/ts.h>
#endif
+#if HAVE_OPENSSL_EC_H
+#include <openssl/ec.h>
+#endif
+
// ssl_multicert.config field names:
#define SSL_IP_TAG "dest_ip"
#define SSL_CERT_TAG "ssl_cert_name"