Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (66608fb70ecb8d34b048859d4ffe320f45c10837)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (66608fb70ecb8d34b048859d4ffe320f45c10837)
  • Date: Thu, 6 Sep 2018 22:13:07 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

net/wpa_supplicant/HISTORY | 3 +++
net/wpa_supplicant/libressl.patch | 37
+++++++++++++++++++++++++++++++++----
2 files changed, 36 insertions(+), 4 deletions(-)

New commits:
commit 66608fb70ecb8d34b048859d4ffe320f45c10837
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

wpa_supplicant: Fix build against libressl 2.7.x

diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 5dbf998..091673b 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,6 @@
+2018-09-06 Ismael Luceno <ismael AT iodev.co.uk>
+ * libressl.patch: updated patch for libressl 2.7
+
2018-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: make the dependency on crda a suggestion

diff --git a/net/wpa_supplicant/libressl.patch
b/net/wpa_supplicant/libressl.patch
index 56146ea..209f3b7 100644
--- a/net/wpa_supplicant/libressl.patch
+++ b/net/wpa_supplicant/libressl.patch
@@ -1,6 +1,16 @@
--- a/src/crypto/crypto_openssl.c.orig
+++ b/src/crypto/crypto_openssl.c
-@@ -611,7 +611,7 @@
+@@ -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 @@
+@@ -712,7 +713,7 @@ err:

void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
{
@@ -20,6 +30,15 @@
dh = DH_new();
--- a/src/crypto/tls_openssl.c.orig
+++ b/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 @@
}
#endif /* OPENSSL_FIPS */
@@ -38,12 +57,22 @@
#ifndef OPENSSL_NO_ENGINE
ENGINE_cleanup();
#endif /* OPENSSL_NO_ENGINE */
-@@ -2334,7 +2334,7 @@
+@@ -2334,7 +2334,8 @@
return 0;

#ifdef PKCS12_FUNCS
-#if OPENSSL_VERSION_NUMBER < 0x10002000L
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10002000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <
0x20700000L)
/*
* Clear previously set extra chain certificates, if any, from PKCS#12
* processing in tls_parse_pkcs12() to allow OpenSSL to build a new
+@@ -3976,7 +3976,7 @@ int tls_connection_set_params(void *tls_
+ engine_id = "pkcs11";
+
+ #if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) ||
defined(EAP_SERVER_FAST)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ if (params->flags & TLS_CONN_EAP_FAST) {
+ wpa_printf(MSG_DEBUG,
+ "OpenSSL: Use TLSv1_method() for EAP-FAST");



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (66608fb70ecb8d34b048859d4ffe320f45c10837), Ismael Luceno, 09/06/2018

Archive powered by MHonArc 2.6.24.

Top of Page