[tor-commits] [tor] branch main updated: tls: Disable a warning with LibreSSL >= 3.8.0

[gitolite role]

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

dgoulet pushed a commit to branch main
in repository tor.

The following commit(s) were added to refs/heads/main by this push:
     new 9850dc59c0 tls: Disable a warning with LibreSSL >= 3.8.0
     new 925201c946 Merge branch 'tor-gitlab/mr/713'
9850dc59c0 is described below

commit 9850dc59c0db5cbcadc314be8d324a992880fce1
Author: orbea <orbea at riseup.net>
AuthorDate: Mon May 29 12:56:37 2023 -0700

    tls: Disable a warning with LibreSSL >= 3.8.0
    
    Skip a warning using EC_GFp_nist_method() which was removed in LibreSSL
    3.8.
    
    Based on a patch from OpenBSD.
    
    https://github.com/openbsd/ports/commit/33fe251a08cb11f30ce6094a2e0759c3bb63ed16
    
    These functions are deprecated since OpenSSL 3.0.
    
    https://www.openssl.org/docs/man3.1/man3/EC_GFp_nist_method.html
---
 src/lib/tls/tortls_openssl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c
index 12260c09d3..c0a89ac272 100644
--- a/src/lib/tls/tortls_openssl.c
+++ b/src/lib/tls/tortls_openssl.c
@@ -340,8 +340,10 @@ tor_tls_init(void)
     SSL_load_error_strings();
 #endif /* defined(OPENSSL_1_1_API) */
 
-#if (SIZEOF_VOID_P >= 8 &&                              \
-     OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,1))
+#if (SIZEOF_VOID_P >= 8 &&                                \
+     OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,1) && \
+     (!defined(LIBRESSL_VERSION_NUMBER) ||                \
+      LIBRESSL_VERSION_NUMBER < 0x3080000fL))
     long version = tor_OpenSSL_version_num();
 
     /* LCOV_EXCL_START : we can't test these lines on the same machine */

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.