Date: Mon, 2 Apr 2018 07:39:30 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466206 - head/net-mgmt/sx/files Message-ID: <201804020739.w327dUR3085017@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Mon Apr 2 07:39:29 2018 New Revision: 466206 URL: https://svnweb.freebsd.org/changeset/ports/466206 Log: net-mgmt/sx: Fix build with LibreSSL 2.7 - LibreSSL 2.7 implements OpenSSL 1.1 API PR: 227188 Approved by: Neel Chauhan <neel neelc org> (maintainer) Added: head/net-mgmt/sx/files/patch-libsxclient_src_opensslcompat.h (contents, props changed) Added: head/net-mgmt/sx/files/patch-libsxclient_src_opensslcompat.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/sx/files/patch-libsxclient_src_opensslcompat.h Mon Apr 2 07:39:29 2018 (r466206) @@ -0,0 +1,27 @@ +--- libsxclient/src/opensslcompat.h.orig 2016-11-16 13:50:12 UTC ++++ libsxclient/src/opensslcompat.h +@@ -13,7 +13,7 @@ + #define hmac_final(a, b, c) (HMAC_Final((a), (b), (c)), 1) + #endif + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L|| defined (LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L|| (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + /* https://wiki.openssl.org/index.php/1.1_API_Changes#Adding_forward-compatible_code_to_older_versions */ + static HMAC_CTX *HMAC_CTX_new(void) + { +@@ -32,13 +32,13 @@ static void HMAC_CTX_free(HMAC_CTX *ctx) + } + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + /* EVP_MD_CTX_create() and EVP_MD_CTX_destroy() were renamed to EVP_MD_CTX_new() and EVP_MD_CTX_free() in OpenSSL 1.1. */ + #define EVP_MD_CTX_new EVP_MD_CTX_create + #define EVP_MD_CTX_free EVP_MD_CTX_destroy + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + #define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) + #endif +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804020739.w327dUR3085017>