From owner-svn-ports-all@freebsd.org Sun Apr 1 13:36:58 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97E33F9B995; Sun, 1 Apr 2018 13:36:58 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B4946C3B4; Sun, 1 Apr 2018 13:36:58 +0000 (UTC) (envelope-from cy@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 2C74A27826; Sun, 1 Apr 2018 13:36:58 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w31Dawm7040054; Sun, 1 Apr 2018 13:36:58 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w31DavFk040052; Sun, 1 Apr 2018 13:36:57 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201804011336.w31DavFk040052@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sun, 1 Apr 2018 13:36:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466153 - head/security/wpa_supplicant/files X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/security/wpa_supplicant/files X-SVN-Commit-Revision: 466153 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Apr 2018 13:36:58 -0000 Author: cy Date: Sun Apr 1 13:36:57 2018 New Revision: 466153 URL: https://svnweb.freebsd.org/changeset/ports/466153 Log: Fix build with LibreSSL 2.7 PR: 227173 Submitted by: brnrd@ MFH: 2018Q3 Modified: head/security/wpa_supplicant/files/patch-src_crypto_crypto__openssl.c head/security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c Modified: head/security/wpa_supplicant/files/patch-src_crypto_crypto__openssl.c ============================================================================== --- head/security/wpa_supplicant/files/patch-src_crypto_crypto__openssl.c Sun Apr 1 13:35:27 2018 (r466152) +++ head/security/wpa_supplicant/files/patch-src_crypto_crypto__openssl.c Sun Apr 1 13:36:57 2018 (r466153) @@ -1,7 +1,17 @@ ---- src/crypto/crypto_openssl.c.orig 2016-11-02 18:04:18 UTC +--- src/crypto/crypto_openssl.c.orig 2016-10-02 18:51:11 UTC +++ src/crypto/crypto_openssl.c -@@ -611,7 +611,7 @@ void crypto_cipher_deinit(struct crypto_ +@@ -33,7 +33,8 @@ + #include "aes_wrap.h" + #include "crypto.h" +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + /* Compatibility wrappers for older versions. */ + + static HMAC_CTX * HMAC_CTX_new(void) +@@ -611,7 +612,7 @@ void crypto_cipher_deinit(struct crypto_ + void * dh5_init(struct wpabuf **priv, struct wpabuf **publ) { -#if OPENSSL_VERSION_NUMBER < 0x10100000L @@ -9,7 +19,7 @@ DH *dh; struct wpabuf *pubkey = NULL, *privkey = NULL; size_t publen, privlen; -@@ -712,7 +712,7 @@ err: +@@ -712,7 +713,7 @@ err: void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ) { Modified: head/security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c ============================================================================== --- head/security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c Sun Apr 1 13:35:27 2018 (r466152) +++ head/security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c Sun Apr 1 13:36:57 2018 (r466153) @@ -1,5 +1,14 @@ ---- src/crypto/tls_openssl.c.orig 2016-11-02 18:46:25 UTC +--- src/crypto/tls_openssl.c.orig 2016-10-02 18:51:11 UTC +++ src/crypto/tls_openssl.c +@@ -59,7 +59,7 @@ typedef int stack_index_t; + #endif /* SSL_set_tlsext_status_type */ + + #if (OPENSSL_VERSION_NUMBER < 0x10100000L || \ +- defined(LIBRESSL_VERSION_NUMBER)) && \ ++ (defined(LIBRESSL_VERSION_NUMBER)) && LIBRESSL_VERSION_NUMBER < 0x20700000L) && \ + !defined(BORINGSSL_API_VERSION) + /* + * SSL_get_client_random() and SSL_get_server_random() were added in OpenSSL @@ -919,7 +919,7 @@ void * tls_init(const struct tls_config } #endif /* OPENSSL_FIPS */