Page MenuHomeFreeBSD
Files F163910992

D14957.diff
No OneTemporary
Actions

D14957.diff
View Options

Index: head/net/hostapd/files/patch-crypto__openssl.c
===================================================================
--- head/net/hostapd/files/patch-crypto__openssl.c
+++ head/net/hostapd/files/patch-crypto__openssl.c
@@ -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)
{
Index: head/net/hostapd/files/patch-src_crypto_tls__openssl.c
===================================================================
--- head/net/hostapd/files/patch-src_crypto_tls__openssl.c
+++ head/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

File Metadata

Mime Type
text/plain
Expires
Tue, Jul 28, 3:21 AM (4 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35624791
Default Alt Text
D14957.diff (1 KB)

Event Timeline