Page MenuHomeFreeBSD
Differential D14957 Diff 41060 head/net/hostapd/files/patch-crypto__openssl.c

Changeset View

Standalone View

View Options

head/net/hostapd/files/patch-crypto__openssl.c

--- 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 +++ 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) void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
{ {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L -#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
DH *dh; DH *dh;
struct wpabuf *pubkey = NULL, *privkey = NULL; struct wpabuf *pubkey = NULL, *privkey = NULL;
size_t publen, privlen; 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) void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
{ {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L -#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
DH *dh; DH *dh;
dh = DH_new(); dh = DH_new();