Commit 429bba05 authored by Oleksiy Ivanov's avatar Oleksiy Ivanov Committed by Facebook Github Bot

Use #ifdef OPENSSL_IS_BORINGSSL instead of #if (#909)

Summary:
In some cases OPENSSL_IS_BORINGSSL can be defined as simple as:

or in copts:

-DOPENSSL_IS_BORINGSSL

this causing folly to fail compilation.
Pull Request resolved: https://github.com/facebook/folly/pull/909

Reviewed By: ngoyal

Differential Revision: D9308739

Pulled By: yfeldblum

fbshipit-source-id: 2ce6170cd97b75ad2322ac57b45824202fe34f21
parent 48a1dd79
...@@ -22,7 +22,7 @@ namespace folly { ...@@ -22,7 +22,7 @@ namespace folly {
namespace portability { namespace portability {
namespace ssl { namespace ssl {
#if OPENSSL_IS_BORINGSSL #ifdef OPENSSL_IS_BORINGSSL
int SSL_CTX_set1_sigalgs_list(SSL_CTX*, const char*) { int SSL_CTX_set1_sigalgs_list(SSL_CTX*, const char*) {
return 1; // 0 implies error return 1; // 0 implies error
} }
......
...@@ -61,13 +61,13 @@ ...@@ -61,13 +61,13 @@
#define FOLLY_OPENSSL_IS_110 (OPENSSL_VERSION_NUMBER >= 0x10100000L) #define FOLLY_OPENSSL_IS_110 (OPENSSL_VERSION_NUMBER >= 0x10100000L)
#endif #endif
#if !OPENSSL_IS_BORINGSSL && !FOLLY_OPENSSL_IS_100 && !FOLLY_OPENSSL_IS_101 && \ #if !defined(OPENSSL_IS_BORINGSSL) && !FOLLY_OPENSSL_IS_100 && \
!FOLLY_OPENSSL_IS_102 && !FOLLY_OPENSSL_IS_110 !FOLLY_OPENSSL_IS_101 && !FOLLY_OPENSSL_IS_102 && !FOLLY_OPENSSL_IS_110
#warning Compiling with unsupported OpenSSL version #warning Compiling with unsupported OpenSSL version
#endif #endif
// BoringSSL and OpenSSL 0.9.8f later with TLS extension support SNI. // BoringSSL and OpenSSL 0.9.8f later with TLS extension support SNI.
#if OPENSSL_IS_BORINGSSL || \ #if defined(OPENSSL_IS_BORINGSSL) || \
(OPENSSL_VERSION_NUMBER >= 0x00908070L && !defined(OPENSSL_NO_TLSEXT)) (OPENSSL_VERSION_NUMBER >= 0x00908070L && !defined(OPENSSL_NO_TLSEXT))
#define FOLLY_OPENSSL_HAS_SNI 1 #define FOLLY_OPENSSL_HAS_SNI 1
#else #else
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
#endif #endif
// BoringSSL and OpenSSL 1.0.2 later with TLS extension support ALPN. // BoringSSL and OpenSSL 1.0.2 later with TLS extension support ALPN.
#if OPENSSL_IS_BORINGSSL || \ #if defined(OPENSSL_IS_BORINGSSL) || \
(OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(OPENSSL_NO_TLSEXT)) (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(OPENSSL_NO_TLSEXT))
#define FOLLY_OPENSSL_HAS_ALPN 1 #define FOLLY_OPENSSL_HAS_ALPN 1
#else #else
...@@ -92,7 +92,7 @@ namespace folly { ...@@ -92,7 +92,7 @@ namespace folly {
namespace portability { namespace portability {
namespace ssl { namespace ssl {
#if OPENSSL_IS_BORINGSSL #ifdef OPENSSL_IS_BORINGSSL
int SSL_CTX_set1_sigalgs_list(SSL_CTX* ctx, const char* sigalgs_list); int SSL_CTX_set1_sigalgs_list(SSL_CTX* ctx, const char* sigalgs_list);
int TLS1_get_client_version(SSL* s); int TLS1_get_client_version(SSL* s);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment