diff options
| author | cy <cy@FreeBSD.org> | 2018-04-01 21:36:57 +0800 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2018-04-01 21:36:57 +0800 |
| commit | 5f0a2c5643f65e5ae54e538fa0c624aa70719ca0 (patch) | |
| tree | b21555c0edfac6d49d3e485d89320df9020d56fb | |
| parent | 6aabd77081037783d2dc1077c6825b8c14676b07 (diff) | |
| download | freebsd-ports-gnome-5f0a2c5643f65e5ae54e538fa0c624aa70719ca0.tar.gz freebsd-ports-gnome-5f0a2c5643f65e5ae54e538fa0c624aa70719ca0.tar.zst freebsd-ports-gnome-5f0a2c5643f65e5ae54e538fa0c624aa70719ca0.zip | |
Fix build with LibreSSL 2.7
PR: 227173
Submitted by: brnrd@
MFH: 2018Q3
| -rw-r--r-- | security/wpa_supplicant/files/patch-src_crypto_crypto__openssl.c | 16 | ||||
| -rw-r--r-- | security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c | 11 |
2 files changed, 23 insertions, 4 deletions
diff --git a/security/wpa_supplicant/files/patch-src_crypto_crypto__openssl.c b/security/wpa_supplicant/files/patch-src_crypto_crypto__openssl.c index b19fedd228a9..3f972450916e 100644 --- a/security/wpa_supplicant/files/patch-src_crypto_crypto__openssl.c +++ b/security/wpa_supplicant/files/patch-src_crypto_crypto__openssl.c @@ -1,6 +1,16 @@ ---- 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) { @@ -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) { diff --git a/security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c b/security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c index 79887ae05e2c..1d6b51a65102 100644 --- a/security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c +++ b/security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c @@ -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 */ |