View | Details | Raw Unified | Return to bug 227172
Collapse All | Expand All

(-)net/hostapd/files/patch-crypto__openssl.c (-3 / +13 lines)
Lines 1-7 Link Here
1
--- src/crypto/crypto_openssl.c.orig	2017-04-21 20:53:34 UTC
1
--- src/crypto/crypto_openssl.c.orig	2016-10-02 18:51:11 UTC
2
+++ src/crypto/crypto_openssl.c
2
+++ src/crypto/crypto_openssl.c
3
@@ -611,7 +611,7 @@ void crypto_cipher_deinit(struct crypto_
3
@@ -33,7 +33,8 @@
4
 #include "aes_wrap.h"
5
 #include "crypto.h"
4
 
6
 
7
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
8
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
9
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
10
 /* Compatibility wrappers for older versions. */
11
 
12
 static HMAC_CTX * HMAC_CTX_new(void)
13
@@ -611,7 +612,7 @@ void crypto_cipher_deinit(struct crypto_
14
 
5
 void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
15
 void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
6
 {
16
 {
7
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
17
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
Lines 9-15 Link Here
9
 	DH *dh;
19
 	DH *dh;
10
 	struct wpabuf *pubkey = NULL, *privkey = NULL;
20
 	struct wpabuf *pubkey = NULL, *privkey = NULL;
11
 	size_t publen, privlen;
21
 	size_t publen, privlen;
12
@@ -712,7 +712,7 @@ err:
22
@@ -712,7 +713,7 @@ err:
13
 
23
 
14
 void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
24
 void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
15
 {
25
 {
(-)net/hostapd/files/patch-src_crypto_tls__openssl.c (+11 lines)
Line 0 Link Here
1
--- src/crypto/tls_openssl.c.orig	2016-10-02 18:51:11 UTC
2
+++ src/crypto/tls_openssl.c
3
@@ -59,7 +59,7 @@ typedef int stack_index_t;
4
 #endif /* SSL_set_tlsext_status_type */
5
 
6
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L || \
7
-     defined(LIBRESSL_VERSION_NUMBER)) &&    \
8
+     (defined(LIBRESSL_VERSION_NUMBER)) && LIBRESSL_VERSION_NUMBER < 0x20700000L) && \
9
     !defined(BORINGSSL_API_VERSION)
10
 /*
11
  * SSL_get_client_random() and SSL_get_server_random() were added in OpenSSL

Return to bug 227172