From: Lukas Tribus <luky-37@hotmail.com>
Date: Sun, 17 Aug 2014 22:56:30 +0000 (+0200)
Subject: BUILD: ssl: handle boringssl in openssl version detection
X-Git-Tag: v1.6-dev1~337
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=581cc8d2b8295b46aa0b7b28a88aa53e12e551dd;p=thirdparty%2Fhaproxy.git

BUILD: ssl: handle boringssl in openssl version detection

Google's boringssl doesn't have OPENSSL_VERSION_TEXT, SSLeay_version()
or SSLEAY_VERSION, in fact, it doesn't have any real versioning, its
just git-based.

So in case we build against boringssl, we can't access those values.

Instead, we just inform the user that HAProxy was build against
boringssl.

Signed-off-by: Lukas Tribus <luky-37@hotmail.com>
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 9f742c75b1..74b268787a 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -269,10 +269,15 @@ void display_build_opts()
 	printf("\n");
 
 #ifdef USE_OPENSSL
-	printf("Built with OpenSSL version : " OPENSSL_VERSION_TEXT "\n");
+	printf("Built with OpenSSL version : "
+#ifdef OPENSSL_IS_BORINGSSL
+	       "BoringSSL\n");
+#else /* OPENSSL_IS_BORINGSSL */
+	        OPENSSL_VERSION_TEXT "\n");
 	printf("Running on OpenSSL version : %s%s\n",
 	       SSLeay_version(SSLEAY_VERSION),
 	       ((OPENSSL_VERSION_NUMBER ^ SSLeay()) >> 8) ? " (VERSIONS DIFFER!)" : "");
+#endif
 	printf("OpenSSL library supports TLS extensions : "
 #if OPENSSL_VERSION_NUMBER < 0x00907000L
 	       "no (library version too old)"