From: Zonr Chang <zonr.net@gmail.com>
Date: Thu, 13 Oct 2016 21:07:57 +0000 (-0700)
Subject: Avoid setting OPENSSL_IS_{101,102,110} when using BoringSSL.
X-Git-Tag: v2016.10.17.00~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9fa5146d2b7aec3316cc56333ec24b85c91dd312;p=folly.git

Avoid setting OPENSSL_IS_{101,102,110} when using BoringSSL.

Summary: Closes https://github.com/facebook/folly/pull/497

Reviewed By: anirudhvr

Differential Revision: D4016114

Pulled By: Orvid

fbshipit-source-id: ce9da1e20390a2c834e376a7a06f6002103ff1e4
---

diff --git a/folly/ssl/detail/OpenSSLVersionFinder.h b/folly/ssl/detail/OpenSSLVersionFinder.h
index 8ff6cdd9..5360ff69 100644
--- a/folly/ssl/detail/OpenSSLVersionFinder.h
+++ b/folly/ssl/detail/OpenSSLVersionFinder.h
@@ -20,13 +20,18 @@
 #include <openssl/crypto.h>
 #include <openssl/opensslv.h>
 
-#define OPENSSL_IS_101                      \
-  (OPENSSL_VERSION_NUMBER >= 0x1000105fL && \
-   OPENSSL_VERSION_NUMBER < 0x1000200fL)
-#define OPENSSL_IS_102                      \
-  (OPENSSL_VERSION_NUMBER >= 0x1000200fL && \
-   OPENSSL_VERSION_NUMBER < 0x10100000L)
-#define OPENSSL_IS_110 (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+// BoringSSL doesn't have notion of versioning although it defines
+// OPENSSL_VERSION_NUMBER to maintain compatibility. The following variables are
+// intended to be specific to OpenSSL.
+#if !defined(OPENSSL_IS_BORINGSSL)
+# define OPENSSL_IS_101                       \
+    (OPENSSL_VERSION_NUMBER >= 0x1000105fL && \
+     OPENSSL_VERSION_NUMBER < 0x1000200fL)
+# define OPENSSL_IS_102                       \
+    (OPENSSL_VERSION_NUMBER >= 0x1000200fL && \
+     OPENSSL_VERSION_NUMBER < 0x10100000L)
+# define OPENSSL_IS_110 (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+#endif  // !defined(OPENSSL_IS_BORINGSSL)
 
 // This is used to find the OpenSSL version at runtime. Just returning
 // OPENSSL_VERSION_NUMBER is insufficient as runtime version may be different