gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnurl] 40/73: openssl: don't use old BORINGSSL_YYYYMM macr


From: gnunet
Subject: [GNUnet-SVN] [gnurl] 40/73: openssl: don't use old BORINGSSL_YYYYMM macros
Date: Tue, 24 Oct 2017 18:54:21 +0200

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit de7597f155beea1cfba341bd7d8d7bb6202edba0
Author: David Benjamin <address@hidden>
AuthorDate: Mon Oct 9 11:41:02 2017 -0400

    openssl: don't use old BORINGSSL_YYYYMM macros
    
    Those were temporary things we'd add and remove for our own convenience
    long ago. The last few stayed around for too long as an oversight but
    have since been removed. These days we have a running
    BORINGSSL_API_VERSION counter which is bumped when we find it
    convenient, but 2015-11-19 was quite some time ago, so just check
    OPENSSL_IS_BORINGSSL.
    
    Closes #1979
---
 lib/vtls/openssl.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 2ee27d5b5..b9a061f31 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -153,14 +153,13 @@ static unsigned long OpenSSL_version_num(void)
 /*
  * Whether SSL_CTX_set_keylog_callback is available.
  * OpenSSL: supported since 1.1.1 https://github.com/openssl/openssl/pull/2287
- * BoringSSL: supported since d28f59c27bac (committed 2015-11-19), the
- *            BORINGSSL_201512 macro from 2016-01-21 should be close enough.
+ * BoringSSL: supported since d28f59c27bac (committed 2015-11-19)
  * LibreSSL: unsupported in at least 2.5.1 (explicitly check for it since it
  *           lies and pretends to be OpenSSL 2.0.0).
  */
 #if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \
      !defined(LIBRESSL_VERSION_NUMBER)) || \
-    defined(BORINGSSL_201512)
+    defined(OPENSSL_IS_BORINGSSL)
 #define HAVE_KEYLOG_CALLBACK
 #endif
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]