Skip to content
Snippets Groups Projects
Commit 5fe75e80 authored by Rosen Penev's avatar Rosen Penev Committed by Andy Green
Browse files

OpenSSL: fix ECC support build-time check

With at least OpenSSL 1.1.0, checking the header is not enough. OpenSSL
does provide a way to check it directly though.

Fixes compilation without ECC support.
parent 89eedcaa
No related branches found
No related tags found
No related merge requests found
...@@ -147,7 +147,7 @@ lws_tls_server_certs_load(struct lws_vhost *vhost, struct lws *wsi, ...@@ -147,7 +147,7 @@ lws_tls_server_certs_load(struct lws_vhost *vhost, struct lws *wsi,
const char *mem_cert, size_t len_mem_cert, const char *mem_cert, size_t len_mem_cert,
const char *mem_privkey, size_t mem_privkey_len) const char *mem_privkey, size_t mem_privkey_len)
{ {
#if defined(LWS_HAVE_OPENSSL_ECDH_H) #if !defined(OPENSSL_NO_EC)
const char *ecdh_curve = "prime256v1"; const char *ecdh_curve = "prime256v1";
#if !defined(LWS_WITH_BORINGSSL) && defined(LWS_HAVE_SSL_EXTRA_CHAIN_CERTS) #if !defined(LWS_WITH_BORINGSSL) && defined(LWS_HAVE_SSL_EXTRA_CHAIN_CERTS)
STACK_OF(X509) *extra_certs = NULL; STACK_OF(X509) *extra_certs = NULL;
...@@ -263,7 +263,7 @@ check_key: ...@@ -263,7 +263,7 @@ check_key:
return 1; return 1;
} }
#if defined(LWS_HAVE_OPENSSL_ECDH_H) #if !defined(OPENSSL_NO_EC)
if (vhost->tls.ecdh_curve[0]) if (vhost->tls.ecdh_curve[0])
ecdh_curve = vhost->tls.ecdh_curve; ecdh_curve = vhost->tls.ecdh_curve;
...@@ -333,7 +333,7 @@ check_key: ...@@ -333,7 +333,7 @@ check_key:
#else #else
lwsl_notice(" OpenSSL doesn't support ECDH\n"); lwsl_notice(" OpenSSL doesn't support ECDH\n");
#endif #endif
#if defined(LWS_HAVE_OPENSSL_ECDH_H) && !defined(LWS_WITH_BORINGSSL) #if !defined(OPENSSL_NO_EC) && !defined(LWS_WITH_BORINGSSL)
post_ecdh: post_ecdh:
#endif #endif
vhost->tls.skipped_certs = 0; vhost->tls.skipped_certs = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment