forked from pool/wpa_supplicant
Clemens Famulla-Conrad
d3a95bf049
* Wi-Fi Easy Connect - add support for DPP release 3 - allow Configurator parameters to be provided during config exchange * HE/IEEE 802.11ax/Wi-Fi 6 - various fixes * EHT/IEEE 802.11be/Wi-Fi 7 - add preliminary support * SAE: add support for fetching the password from a RADIUS server * support OpenSSL 3.0 API changes * support background radar detection and CAC with some additional drivers * support RADIUS ACL/PSK check during 4-way handshake (wpa_psk_radius=3) * EAP-SIM/AKA: support IMSI privacy * improve 4-way handshake operations - use Secure=1 in message 3 during PTK rekeying * OCV: do not check Frequency Segment 1 Channel Number for 160 MHz cases to avoid interoperability issues * support new SAE AKM suites with variable length keys * support new AKM for 802.1X/EAP with SHA384 * extend PASN support for secure ranging * FT: Use SHA256 to derive PMKID for AKM 00-0F-AC:3 (FT-EAP) - this is based on additional details being added in the IEEE 802.11 standard - the new implementation is not backwards compatible * improved ACS to cover additional channel types/bandwidths * extended Multiple BSSID support * fix beacon protection with FT protocol (incorrect BIGTK was provided) * support unsynchronized service discovery (USD) * add preliminary support for RADIUS/TLS * add support for explicit SSID protection in 4-way handshake (a mitigation for CVE-2023-52424; disabled by default for now, can be enabled with ssid_protection=1) * fix SAE H2E rejected groups validation to avoid downgrade attacks * use stricter validation for some RADIUS messages * a large number of other fixes, cleanup, and extensions - refresh patches: wpa_supplicant-dump-certificate-as-PEM-in-debug-mode.diff wpa_supplicant-sigusr1-changes-debuglevel.patch - drop patches: CVE-2023-52160.patche dbus-Fix-property-DebugShowKeys-and-DebugTimestamp.patch OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=145
72 lines
2.0 KiB
Diff
72 lines
2.0 KiB
Diff
From f40c1d989762c4f3b585c86ca5d9a216d120fa12 Mon Sep 17 00:00:00 2001
|
|
From: Ludwig Nussel <ludwig.nussel@suse.de>
|
|
Date: Fri, 16 Sep 2011 11:41:16 +0200
|
|
Subject: [PATCH] dump certificate as PEM in debug mode
|
|
|
|
---
|
|
src/crypto/tls_openssl.c | 13 +++++++++++++
|
|
src/utils/wpa_debug.c | 5 +++++
|
|
src/utils/wpa_debug.h | 8 ++++++++
|
|
3 files changed, 26 insertions(+)
|
|
|
|
--- a/src/crypto/tls_openssl.c
|
|
+++ b/src/crypto/tls_openssl.c
|
|
@@ -2515,6 +2515,19 @@
|
|
debug_print_cert(err_cert, buf);
|
|
X509_NAME_oneline(X509_get_subject_name(err_cert), buf, sizeof(buf));
|
|
|
|
+ if (wpa_debug_enabled(MSG_DEBUG)) {
|
|
+ long len;
|
|
+ char* data = NULL;
|
|
+ BIO* bio = BIO_new(BIO_s_mem());
|
|
+ //X509_print_ex(bio, err_cert, (XN_FLAG_MULTILINE|ASN1_STRFLGS_UTF8_CONVERT)&~ASN1_STRFLGS_ESC_MSB, 0);
|
|
+ PEM_write_bio_X509(bio, err_cert);
|
|
+ len = BIO_get_mem_data(bio, &data);
|
|
+ if (len) {
|
|
+ wpa_printf(MSG_DEBUG, "OpenSSL certificate at depth %d:\n%*s", depth, (int)len, data);
|
|
+ }
|
|
+ BIO_free(bio);
|
|
+ }
|
|
+
|
|
conn = SSL_get_app_data(ssl);
|
|
if (conn == NULL)
|
|
return 0;
|
|
--- a/src/utils/wpa_debug.c
|
|
+++ b/src/utils/wpa_debug.c
|
|
@@ -66,6 +66,11 @@
|
|
#endif /* CONFIG_DEBUG_FILE */
|
|
|
|
|
|
+int wpa_debug_enabled(int level)
|
|
+{
|
|
+ return level >= wpa_debug_level;
|
|
+}
|
|
+
|
|
void wpa_debug_print_timestamp(void)
|
|
{
|
|
#ifndef CONFIG_ANDROID_LOG
|
|
--- a/src/utils/wpa_debug.h
|
|
+++ b/src/utils/wpa_debug.h
|
|
@@ -25,6 +25,7 @@
|
|
|
|
#ifdef CONFIG_NO_STDOUT_DEBUG
|
|
|
|
+#define wpa_debug_enabled(x) do { } while (0)
|
|
#define wpa_debug_print_timestamp() do { } while (0)
|
|
#define wpa_printf(args...) do { } while (0)
|
|
#define wpa_hexdump(l,t,b,le) do { } while (0)
|
|
@@ -52,6 +53,13 @@
|
|
void wpa_debug_stop_log(void);
|
|
|
|
/**
|
|
+ * wpa_debug_enabled: check whether given debug level is enabled
|
|
+ * @level: priority level (MSG_*) of the message
|
|
+ * @return: 0 or 1
|
|
+ */
|
|
+int wpa_debug_enabled(int level);
|
|
+
|
|
+/**
|
|
* wpa_debug_printf_timestamp - Print timestamp for debug output
|
|
*
|
|
* This function prints a timestamp in seconds_from_1970.microsoconds
|