svn commit: r466381 - head/net/hostapd/files

[Craig Leres]

Author: leres
Date: Tue Apr  3 21:32:40 2018
New Revision: 466381
URL: https://svnweb.freebsd.org/changeset/ports/466381

Log:
  Update patches to unbreak build with LibreSSL 2.7 and the
  OpenSSL 1.1 API.
  
  PR:		227172
  Submitted by:	brnrd
  Reported by:	brnrd
  Reviewed by:	ler (mentor)
  Approved by:	ler (mentor)
  Differential Revision:	https://reviews.freebsd.org/D14957

Added:
  head/net/hostapd/files/patch-src_crypto_tls__openssl.c   (contents, props changed)
Modified:
  head/net/hostapd/files/patch-crypto__openssl.c

Modified: head/net/hostapd/files/patch-crypto__openssl.c
==============================================================================
--- head/net/hostapd/files/patch-crypto__openssl.c	Tue Apr  3 21:22:55 2018	(r466380)
+++ head/net/hostapd/files/patch-crypto__openssl.c	Tue Apr  3 21:32:40 2018	(r466381)
@@ -1,7 +1,17 @@
---- src/crypto/crypto_openssl.c.orig	2017-04-21 20:53:34 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)
  {

Added: head/net/hostapd/files/patch-src_crypto_tls__openssl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/hostapd/files/patch-src_crypto_tls__openssl.c	Tue Apr  3 21:32:40 2018	(r466381)
@@ -0,0 +1,11 @@
+--- 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