From owner-svn-ports-head@freebsd.org Sat Feb 13 17:17:02 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C75C2532D65; Sat, 13 Feb 2021 17:17:02 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DdH9B5Frdz4lkk; Sat, 13 Feb 2021 17:17:02 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A70861AEC4; Sat, 13 Feb 2021 17:17:02 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11DHH2fA021965; Sat, 13 Feb 2021 17:17:02 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11DHH2mq021964; Sat, 13 Feb 2021 17:17:02 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202102131717.11DHH2mq021964@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 13 Feb 2021 17:17:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r565148 - head/security/tor/files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/security/tor/files X-SVN-Commit-Revision: 565148 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2021 17:17:02 -0000 Author: yuri Date: Sat Feb 13 17:17:02 2021 New Revision: 565148 URL: https://svnweb.freebsd.org/changeset/ports/565148 Log: security/tor: Fix build with LibreSSL 3.2 PR: 253486 Submitted by: brnrd Added: head/security/tor/files/patch-src_lib_crypt__ops_compat__openssl.h (contents, props changed) Added: head/security/tor/files/patch-src_lib_crypt__ops_compat__openssl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/tor/files/patch-src_lib_crypt__ops_compat__openssl.h Sat Feb 13 17:17:02 2021 (r565148) @@ -0,0 +1,64 @@ +- submitted by brnrd@ in PR#253486 + +From b22568a54506e4b79b72530f89f21032e6435414 Mon Sep 17 00:00:00 2001 +From: Nick Mathewson +Date: Fri, 6 Nov 2020 10:29:28 -0500 +Subject: [PATCH] Rename OpenSSL_version_num() as defined in Tor + +This way, if we guess wrong about whether the library has it, +we don't conflict with the library's headers. + +Fixes #40181; bug not in any released version. +--- + src/lib/crypt_ops/compat_openssl.h | 3 ++- + src/lib/crypt_ops/crypto_openssl_mgt.c | 2 +- + src/lib/tls/tortls_openssl.c | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/lib/crypt_ops/compat_openssl.h b/src/lib/crypt_ops/compat_openssl.h +index c2e1459078..aa66e0c3fa 100644 +--- src/lib/crypt_ops/compat_openssl.h.orig ++++ src/lib/crypt_ops/compat_openssl.h +@@ -34,7 +34,7 @@ + + #ifndef OPENSSL_1_1_API + #define OpenSSL_version(v) SSLeay_version(v) +-#define OpenSSL_version_num() SSLeay() ++#define tor_OpenSSL_version_num() SSLeay() + #define RAND_OpenSSL() RAND_SSLeay() + #define STATE_IS_SW_SERVER_HELLO(st) \ + (((st) == SSL3_ST_SW_SRVR_HELLO_A) || \ +@@ -42,6 +42,7 @@ + #define OSSL_HANDSHAKE_STATE int + #define CONST_IF_OPENSSL_1_1_API + #else /* defined(OPENSSL_1_1_API) */ ++#define tor_OpenSSL_version_num() OpenSSL_version_num() + #define STATE_IS_SW_SERVER_HELLO(st) \ + ((st) == TLS_ST_SW_SRVR_HELLO) + #define CONST_IF_OPENSSL_1_1_API const +diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c +index 065cbca1cc..e763491a11 100644 +--- src/lib/crypt_ops/crypto_openssl_mgt.c.orig ++++ src/lib/crypt_ops/crypto_openssl_mgt.c +@@ -222,7 +222,7 @@ crypto_openssl_early_init(void) + + setup_openssl_threading(); + +- unsigned long version_num = OpenSSL_version_num(); ++ unsigned long version_num = tor_OpenSSL_version_num(); + const char *version_str = crypto_openssl_get_version_str(); + if (version_num == OPENSSL_VERSION_NUMBER && + !strcmp(version_str, OPENSSL_VERSION_TEXT)) { +diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c +index 2269714141..ad9b49ab4f 100644 +--- src/lib/tls/tortls_openssl.c.orig ++++ src/lib/tls/tortls_openssl.c +@@ -342,7 +342,7 @@ tor_tls_init(void) + + #if (SIZEOF_VOID_P >= 8 && \ + OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,1)) +- long version = OpenSSL_version_num(); ++ long version = tor_OpenSSL_version_num(); + + /* LCOV_EXCL_START : we can't test these lines on the same machine */ + if (version >= OPENSSL_V_SERIES(1,0,1)) {