barbieri pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5e8dd491a57bb462c6850ceae9ca0ed869f0b153
commit 5e8dd491a57bb462c6850ceae9ca0ed869f0b153 Author: Gustavo Sverzut Barbieri <[email protected]> Date: Mon Oct 31 22:28:41 2016 -0200 efl_net_ssl: fix build on LibreSSL and BSD As usual thanks to @netstar for quickly spotting the problem :-) Fixes: T4811 --- src/lib/ecore_con/efl_net_ssl_conn-openssl.c | 20 ++++++++++++++++++++ src/lib/ecore_con/efl_net_ssl_ctx-openssl.c | 6 +++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c index 88e73c7..37dcf0e 100644 --- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c +++ b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c @@ -3,6 +3,12 @@ #include <openssl/err.h> #include <openssl/dh.h> +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif #ifdef HAVE_ARPA_INET_H # include <arpa/inet.h> #endif @@ -263,13 +269,27 @@ efl_net_ssl_conn_setup(Efl_Net_Ssl_Conn *conn, Eina_Bool is_dialer, Efl_Net_Sock int ver; const char *str; } *ssl_ver_itr, ssl_ver_map[] = { +#ifdef SSL3_VERSION {SSL3_VERSION, "SSLv3.0"}, +#endif +#ifdef TLS1_VERSION {TLS1_VERSION, "TLSv1.0"}, +#endif +#ifdef TLS1_1_VERSION {TLS1_1_VERSION, "TLSv1.1"}, +#endif +#ifdef TLS1_2_VERSION {TLS1_2_VERSION, "TLSv1.2"}, +#endif +#ifdef DTLS1_VERSION {DTLS1_VERSION, "DTLSv1.0"}, +#endif +#ifdef DTLS1_2_VERSION {DTLS1_2_VERSION, "DTLSv1.2"}, +#endif +#ifdef DTLS1_BAD_VER {DTLS1_BAD_VER, "DTLSv1.0"}, +#endif {0, NULL} }; diff --git a/src/lib/ecore_con/efl_net_ssl_ctx-openssl.c b/src/lib/ecore_con/efl_net_ssl_ctx-openssl.c index beefbac..526764a 100644 --- a/src/lib/ecore_con/efl_net_ssl_ctx-openssl.c +++ b/src/lib/ecore_con/efl_net_ssl_ctx-openssl.c @@ -50,7 +50,11 @@ _efl_net_ssl_ctx_load_lists(Efl_Net_Ssl_Ctx *ctx, Efl_Net_Ssl_Ctx_Config cfg) int err_line, err_flags; X509_STORE *x509_store; X509_LOOKUP *x509_lookup; - unsigned long x509_store_flags = X509_V_FLAG_TRUSTED_FIRST; + unsigned long x509_store_flags = 0; + +#ifdef X509_V_FLAG_TRUSTED_FIRST + x509_store_flags |= X509_V_FLAG_TRUSTED_FIRST; +#endif if (cfg.load_defaults) { --
