Attachment 192053 Details for Bug 227173 – svn diff for security/wpa_supplicant

[patch] svn diff for security/wpa_supplicant

patch-security_wpa_supplicant-LibreSSL2.7 (text/plain), 2.24 KB, created by Bernard Spil on 2018-04-01 12:50:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2018-04-01 12:50:03 UTC

Size: 2.24 KB

patch

obsolete

>Index: security/wpa_supplicant/files/patch-src_crypto_crypto__openssl.c
>===================================================================
>--- security/wpa_supplicant/files/patch-src_crypto_crypto__openssl.c	(revision 465230)
>+++ security/wpa_supplicant/files/patch-src_crypto_crypto__openssl.c	(working copy)
>@@ -1,7 +1,17 @@
>---- 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)
>  {
> -#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: security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c
>===================================================================
>--- security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c	(revision 465230)
>+++ security/wpa_supplicant/files/patch-src_crypto_tls__openssl.c	(working copy)
>@@ -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 */

Actions: View | Diff

Attachments on bug 227173: 192053