Skip to contentSkip to conversation

Fix building with LibreSSL 2.5.1 by cleaning a hack.

PATCH New [email protected]... 1 participant 1 message Feb 12, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix building with LibreSSL 2.5.1 by cleaning a hack.

From: Olivier W <[email protected]...>

---
 src/openvpn/ssl_openssl.c | 5 +++++
 1 file changed, 5 insertions(+)
src/openvpn/ssl_openssl.c +5 -0
index a889332..abf69c9 100644
@@ -508,6 +508,10 @@ tls_ctx_load_ecdh_params(struct tls_root_ctx *ctx, const char *curve_name
         const EC_GROUP *ecgrp = NULL;
         EVP_PKEY *pkey = NULL;
 
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+        pkey = SSL_CTX_get0_privatekey(ctx->ctx);
+#else
+        /* Little hack to get private key ref from SSL_CTX, yay OpenSSL... */
         SSL *ssl = SSL_new(ctx->ctx);
         if (!ssl)
         {
@@ -515,6 +519,7 @@ tls_ctx_load_ecdh_params(struct tls_root_ctx *ctx, const char *curve_name
         }
         pkey = SSL_get_privatekey(ssl);
         SSL_free(ssl);
+#endif
 
         msg(D_TLS_DEBUG, "Extracting ECDH curve from private key");
 
Signature · 1 line
2.11.1