diff options
| author | Craig Leres <leres@FreeBSD.org> | 2018-04-03 21:32:40 +0000 |
|---|---|---|
| committer | Craig Leres <leres@FreeBSD.org> | 2018-04-03 21:32:40 +0000 |
| commit | 2927262ed56cbce2caccbd7dca741adf5e6dd334 (patch) | |
| tree | e5824bed00bf76f25111b05a72f9ca6ddb568df8 | |
| parent | 7c8400738678bddc4cc13f6328343afdb349540a (diff) | |
| download | ports-2927262ed56cbce2caccbd7dca741adf5e6dd334.tar.gz ports-2927262ed56cbce2caccbd7dca741adf5e6dd334.zip | |
Notes
| -rw-r--r-- | net/hostapd/files/patch-crypto__openssl.c | 16 | ||||
| -rw-r--r-- | net/hostapd/files/patch-src_crypto_tls__openssl.c | 11 |
2 files changed, 24 insertions, 3 deletions
diff --git a/net/hostapd/files/patch-crypto__openssl.c b/net/hostapd/files/patch-crypto__openssl.c index 1b20dddd403a..213c648ed07c 100644 --- a/net/hostapd/files/patch-crypto__openssl.c +++ b/net/hostapd/files/patch-crypto__openssl.c @@ -1,6 +1,16 @@ ---- 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) { @@ -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/net/hostapd/files/patch-src_crypto_tls__openssl.c b/net/hostapd/files/patch-src_crypto_tls__openssl.c new file mode 100644 index 000000000000..04f34b268584 --- /dev/null +++ b/net/hostapd/files/patch-src_crypto_tls__openssl.c @@ -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 |