Gitiles
Code Review Sign In
git01.mediatek.com / filogic / rdk-b / meta-filogic / 4727c1e944f23eec16dee62937dabc6fb0a23295 / . / recipes-wifi / wpa-supplicant / files / patches-2.10.3 / 0010-sync-2024-08-13-openwrt-trunk-patches-folder.patch
blob: 6fe601bb6113b2a413383ca976a2b9ec35a53a25 [file] [log] [blame]
From 1a9b003e08a15df0e52604b991c1dd851a9bd265 Mon Sep 17 00:00:00 2001
From: Shayne Chen <shayne.chen@mediatek.com>
Date: Fri, 19 Jul 2024 15:26:42 +0800
Subject: [PATCH 010/126] sync 2024-08-13 openwrt/trunk patches folder
Sync to e80520197c9ca7bced50d3605d6baba6dead6e35
"hostapd: Add support for APuP"
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
---
hostapd/Makefile | 153 +-
hostapd/config_file.c | 42 +-
hostapd/ctrl_iface.c | 4 +
hostapd/defconfig | 15 +-
hostapd/hostapd_cli.c | 10 +-
hostapd/main.c | 21 +-
src/ap/acs.c | 5 +-
src/ap/airtime_policy.c | 15 +-
src/ap/ap_config.h | 37 +
src/ap/ap_drv_ops.c | 28 +-
src/ap/ap_drv_ops.h | 24 +-
src/ap/apup.c | 168 +
src/ap/apup.h | 24 +
src/ap/beacon.c | 16 +-
src/ap/ctrl_iface_ap.c | 45 +-
src/ap/dfs.c | 22 +-
src/ap/drv_callbacks.c | 16 +-
src/ap/hostapd.c | 59 +-
src/ap/hostapd.h | 41 +
src/ap/hw_features.c | 3 +-
src/ap/ieee802_11.c | 55 +-
src/ap/ieee802_11.h | 2 +
src/ap/ieee802_11_ht.c | 15 +
src/ap/ieee802_11_vht.c | 17 +
src/ap/ieee802_1x.c | 6 +
src/ap/rrm.c | 10 +
src/ap/sta_info.c | 35 +-
src/ap/sta_info.h | 16 +-
src/ap/ubus.c | 15 +
src/ap/ubus.h | 5 +
src/ap/ucode.c | 17 +
src/ap/ucode.h | 4 +
src/ap/vlan_full.c | 4 +
src/ap/vlan_init.c | 8 +-
src/ap/wnm_ap.c | 16 +-
src/ap/wpa_auth.c | 3 +-
src/ap/wpa_auth_glue.c | 9 +-
src/ap/wps_hostapd.c | 6 +-
src/ap/x_snoop.c | 22 +-
src/common/defs.h | 4 +
src/common/dpp_crypto.c | 10 +-
src/common/hw_features_common.c | 1 +
src/common/ieee802_11_defs.h | 2 +
src/common/sae.c | 7 +
src/common/wpa_ctrl.c | 10 +-
src/crypto/Makefile | 129 +-
src/crypto/crypto_mbedtls.c | 4228 +++++++++++++++++++++
src/crypto/crypto_module_tests.c | 134 +
src/crypto/tls_mbedtls.c | 3313 ++++++++++++++++
src/drivers/driver.h | 38 +-
src/drivers/driver_nl80211.c | 174 +-
src/drivers/driver_nl80211_capa.c | 4 +
src/drivers/driver_nl80211_event.c | 5 +
src/drivers/driver_nl80211_scan.c | 2 +-
src/drivers/drivers.c | 4 +
src/drivers/drivers.mak | 4 +-
src/drivers/rfkill.h | 16 +
src/radius/radius_client.c | 34 +
src/radius/radius_client.h | 2 +
src/radius/radius_das.c | 201 +-
src/radius/radius_das.h | 1 +
src/radius/radius_server.c | 61 +-
src/rsn_supp/wpa.c | 3 +
src/tls/Makefile | 11 +
src/utils/eloop.c | 20 +-
src/utils/eloop.h | 8 +
src/utils/uloop.c | 64 +
src/utils/wpa_debug.c | 49 +-
src/utils/wpa_debug.h | 73 +-
tests/Makefile | 76 +-
tests/hwsim/example-hostapd.config | 8 +-
tests/hwsim/example-wpa_supplicant.config | 9 +-
tests/hwsim/test_ap_eap.py | 114 +-
tests/hwsim/test_ap_ft.py | 4 +-
tests/hwsim/test_authsrv.py | 9 +-
tests/hwsim/test_dpp.py | 19 +-
tests/hwsim/test_erp.py | 16 +-
tests/hwsim/test_fils.py | 4 +
tests/hwsim/test_pmksa_cache.py | 4 +-
tests/hwsim/test_sae.py | 7 +
tests/hwsim/test_suite_b.py | 3 +
tests/hwsim/test_wpas_ctrl.py | 2 +-
tests/hwsim/utils.py | 8 +-
tests/test-crypto_module.c | 16 +
tests/test-https.c | 12 +-
tests/test-https_server.c | 12 +-
wpa_supplicant/Makefile | 143 +-
wpa_supplicant/ap.c | 28 +-
wpa_supplicant/config.c | 95 +
wpa_supplicant/config_file.c | 8 +-
wpa_supplicant/config_ssid.h | 5 +
wpa_supplicant/ctrl_iface.c | 12 +-
wpa_supplicant/defconfig | 6 +-
wpa_supplicant/eapol_test.c | 11 +
wpa_supplicant/events.c | 7 +-
wpa_supplicant/main.c | 14 +-
wpa_supplicant/mesh.c | 3 +
wpa_supplicant/wpa_cli.c | 9 +
wpa_supplicant/wpa_priv.c | 8 +-
wpa_supplicant/wpa_supplicant.c | 76 +-
wpa_supplicant/wpa_supplicant_i.h | 6 +
wpa_supplicant/wps_supplicant.c | 3 +
wpa_supplicant/wps_supplicant.h | 3 +-
103 files changed, 9984 insertions(+), 401 deletions(-)
create mode 100644 src/ap/apup.c
create mode 100644 src/ap/apup.h
create mode 100644 src/crypto/crypto_mbedtls.c
create mode 100644 src/crypto/tls_mbedtls.c
create mode 100644 src/utils/uloop.c
create mode 100644 tests/test-crypto_module.c
diff --git a/hostapd/Makefile b/hostapd/Makefile
index 78171025e..8dc6e6216 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -1,6 +1,7 @@
ALL=hostapd hostapd_cli
CONFIG_FILE = .config
+-include $(if $(MULTICALL), ../wpa_supplicant/.config)
include ../src/build.rules
ifdef LIBS
@@ -62,6 +63,10 @@ endif
OBJS += main.o
OBJS += config_file.o
+ifdef CONFIG_RADIUS_SERVER
+OBJS += radius.o
+endif
+
OBJS += ../src/ap/hostapd.o
OBJS += ../src/ap/wpa_auth_glue.o
OBJS += ../src/ap/drv_callbacks.o
@@ -174,6 +179,24 @@ OBJS += ../src/common/hw_features_common.o
OBJS += ../src/eapol_auth/eapol_auth_sm.o
+ifdef CONFIG_UBUS
+CFLAGS += -DUBUS_SUPPORT
+OBJS += ../src/ap/ubus.o
+LIBS += -lubus
+NEED_ULOOP:=y
+endif
+
+ifdef CONFIG_UCODE
+CFLAGS += -DUCODE_SUPPORT
+OBJS += ../src/utils/ucode.o
+OBJS += ../src/ap/ucode.o
+NEED_ULOOP:=y
+endif
+
+ifdef NEED_ULOOP
+OBJS += ../src/utils/uloop.o
+LIBS += -lubox
+endif
ifdef CONFIG_CODE_COVERAGE
CFLAGS += -O0 -fprofile-arcs -ftest-coverage -U_FORTIFY_SOURCE
@@ -208,7 +231,8 @@ endif
ifdef CONFIG_NO_VLAN
CFLAGS += -DCONFIG_NO_VLAN
-else
+endif
+ifneq ($(findstring CONFIG_NO_VLAN,$(CFLAGS)), CONFIG_NO_VLAN)
OBJS += ../src/ap/vlan_init.o
OBJS += ../src/ap/vlan_ifconfig.o
OBJS += ../src/ap/vlan.o
@@ -228,6 +252,9 @@ endif
ifdef CONFIG_NO_CTRL_IFACE
CFLAGS += -DCONFIG_NO_CTRL_IFACE
else
+ifdef CONFIG_CTRL_IFACE_MIB
+CFLAGS += -DCONFIG_CTRL_IFACE_MIB
+endif
ifeq ($(CONFIG_CTRL_IFACE), udp)
CFLAGS += -DCONFIG_CTRL_IFACE_UDP
else
@@ -367,10 +394,14 @@ CFLAGS += -DCONFIG_MBO
OBJS += ../src/ap/mbo_ap.o
endif
+ifndef MULTICALL
+CFLAGS += -DNO_SUPPLICANT
+endif
+
include ../src/drivers/drivers.mak
-OBJS += $(DRV_AP_OBJS)
-CFLAGS += $(DRV_AP_CFLAGS)
-LDFLAGS += $(DRV_AP_LDFLAGS)
+OBJS += $(sort $(DRV_AP_OBJS) $(if $(MULTICALL),$(DRV_WPA_OBJS)))
+CFLAGS += $(DRV_AP_CFLAGS) $(if $(MULTICALL),$(DRV_WPA_CFLAGS))
+LDFLAGS += $(DRV_AP_LDFLAGS) $(if $(MULTICALL),$(DRV_WPA_LDFLAGS))
LIBS += $(DRV_AP_LIBS)
ifdef CONFIG_L2_PACKET
@@ -716,6 +747,7 @@ CFLAGS += -DCONFIG_TLSV12
endif
ifeq ($(CONFIG_TLS), wolfssl)
+CFLAGS += -DCONFIG_TLS_WOLFSSL
CONFIG_CRYPTO=wolfssl
ifdef TLS_FUNCS
OBJS += ../src/crypto/tls_wolfssl.o
@@ -736,6 +768,7 @@ endif
endif
ifeq ($(CONFIG_TLS), openssl)
+CFLAGS += -DCONFIG_TLS_OPENSSL
CFLAGS += -DCRYPTO_RSA_OAEP_SHA256
CONFIG_CRYPTO=openssl
ifdef TLS_FUNCS
@@ -765,7 +798,39 @@ endif
CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\"
endif
+ifeq ($(CONFIG_TLS), mbedtls)
+CFLAGS += -DCONFIG_TLS_MBEDTLS
+ifndef CONFIG_CRYPTO
+CONFIG_CRYPTO=mbedtls
+endif
+ifdef TLS_FUNCS
+OBJS += ../src/crypto/tls_mbedtls.o
+LIBS += -lmbedtls
+ifndef CONFIG_DPP
+LIBS += -lmbedx509
+endif
+endif
+OBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
+HOBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
+SOBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
+ifeq ($(CONFIG_CRYPTO), mbedtls)
+ifdef CONFIG_DPP
+LIBS += -lmbedx509
+LIBS_h += -lmbedx509
+LIBS_n += -lmbedx509
+LIBS_s += -lmbedx509
+endif
+LIBS += -lmbedcrypto
+LIBS_h += -lmbedcrypto
+LIBS_n += -lmbedcrypto
+LIBS_s += -lmbedcrypto
+# XXX: create a config option?
+CFLAGS += -DCRYPTO_RSA_OAEP_SHA256
+endif
+endif
+
ifeq ($(CONFIG_TLS), gnutls)
+CFLAGS += -DCONFIG_TLS_GNUTLS
ifndef CONFIG_CRYPTO
# default to libgcrypt
CONFIG_CRYPTO=gnutls
@@ -796,6 +861,7 @@ endif
endif
ifeq ($(CONFIG_TLS), internal)
+CFLAGS += -DCONFIG_TLS_INTERNAL
ifndef CONFIG_CRYPTO
CONFIG_CRYPTO=internal
endif
@@ -874,6 +940,7 @@ endif
endif
ifeq ($(CONFIG_TLS), linux)
+CFLAGS += -DCONFIG_TLS_INTERNAL
OBJS += ../src/crypto/crypto_linux.o
ifdef TLS_FUNCS
OBJS += ../src/crypto/crypto_internal-rsa.o
@@ -944,9 +1011,11 @@ endif
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
AESOBJS += ../src/crypto/aes-wrap.o
endif
endif
+endif
ifdef NEED_AES_EAX
AESOBJS += ../src/crypto/aes-eax.o
NEED_AES_CTR=y
@@ -956,38 +1025,48 @@ AESOBJS += ../src/crypto/aes-siv.o
NEED_AES_CTR=y
endif
ifdef NEED_AES_CTR
+ifneq ($(CONFIG_TLS), mbedtls)
AESOBJS += ../src/crypto/aes-ctr.o
endif
+endif
ifdef NEED_AES_ENCBLOCK
+ifneq ($(CONFIG_TLS), mbedtls)
AESOBJS += ../src/crypto/aes-encblock.o
endif
+endif
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
AESOBJS += ../src/crypto/aes-omac1.o
endif
endif
endif
+endif
ifdef NEED_AES_UNWRAP
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
NEED_AES_DEC=y
AESOBJS += ../src/crypto/aes-unwrap.o
endif
endif
endif
endif
+endif
ifdef NEED_AES_CBC
NEED_AES_DEC=y
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
AESOBJS += ../src/crypto/aes-cbc.o
endif
endif
endif
endif
+endif
ifdef NEED_AES_DEC
ifdef CONFIG_INTERNAL_AES
AESOBJS += ../src/crypto/aes-internal-dec.o
@@ -1002,12 +1081,16 @@ ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
SHA1OBJS += ../src/crypto/sha1.o
endif
endif
endif
endif
+endif
+ifneq ($(CONFIG_TLS), mbedtls)
SHA1OBJS += ../src/crypto/sha1-prf.o
+endif
ifdef CONFIG_INTERNAL_SHA1
SHA1OBJS += ../src/crypto/sha1-internal.o
ifdef NEED_FIPS186_2_PRF
@@ -1016,16 +1099,22 @@ endif
endif
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
SHA1OBJS += ../src/crypto/sha1-pbkdf2.o
endif
endif
+endif
ifdef NEED_T_PRF
+ifneq ($(CONFIG_TLS), mbedtls)
SHA1OBJS += ../src/crypto/sha1-tprf.o
endif
+endif
ifdef NEED_TLS_PRF
+ifneq ($(CONFIG_TLS), mbedtls)
SHA1OBJS += ../src/crypto/sha1-tlsprf.o
endif
endif
+endif
ifdef NEED_SHA1
OBJS += $(SHA1OBJS)
@@ -1035,11 +1124,13 @@ ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/md5.o
endif
endif
endif
endif
+endif
ifdef NEED_MD5
ifdef CONFIG_INTERNAL_MD5
@@ -1078,56 +1169,81 @@ ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha256.o
endif
endif
endif
endif
+endif
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha256-prf.o
+endif
ifdef CONFIG_INTERNAL_SHA256
OBJS += ../src/crypto/sha256-internal.o
endif
ifdef NEED_TLS_PRF_SHA256
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha256-tlsprf.o
endif
+endif
ifdef NEED_TLS_PRF_SHA384
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha384-tlsprf.o
endif
+endif
ifdef NEED_HMAC_SHA256_KDF
+CFLAGS += -DCONFIG_HMAC_SHA256_KDF
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha256-kdf.o
endif
+endif
ifdef NEED_HMAC_SHA384_KDF
+CFLAGS += -DCONFIG_HMAC_SHA384_KDF
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha384-kdf.o
endif
+endif
ifdef NEED_HMAC_SHA512_KDF
+CFLAGS += -DCONFIG_HMAC_SHA512_KDF
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha512-kdf.o
endif
+endif
ifdef NEED_SHA384
CFLAGS += -DCONFIG_SHA384
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha384.o
endif
endif
endif
endif
+endif
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha384-prf.o
endif
+endif
ifdef NEED_SHA512
CFLAGS += -DCONFIG_SHA512
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha512.o
endif
endif
endif
endif
+endif
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha512-prf.o
endif
+endif
ifdef CONFIG_INTERNAL_SHA384
CFLAGS += -DCONFIG_INTERNAL_SHA384
@@ -1172,11 +1288,13 @@ HOBJS += $(SHA1OBJS)
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
HOBJS += ../src/crypto/md5.o
endif
endif
endif
endif
+endif
ifdef CONFIG_RADIUS_SERVER
CFLAGS += -DRADIUS_SERVER
@@ -1306,6 +1424,11 @@ ifdef CONFIG_NO_TKIP
CFLAGS += -DCONFIG_NO_TKIP
endif
+ifdef CONFIG_APUP
+CFLAGS += -DCONFIG_APUP
+OBJS += ../src/ap/apup.o
+endif
+
$(DESTDIR)$(BINDIR)/%: %
install -D $(<) $(@)
@@ -1314,8 +1437,14 @@ install: $(addprefix $(DESTDIR)$(BINDIR)/,$(ALL))
_OBJS_VAR := OBJS
include ../src/objs.mk
+hostapd_multi.a: $(BCHECK) $(OBJS)
+ $(Q)$(CC) -c -o hostapd_multi.o -Dmain=hostapd_main $(CFLAGS) main.c
+ @$(E) " CC " $<
+ @rm -f $@
+ @$(AR) cr $@ hostapd_multi.o $(OBJS)
+
hostapd: $(OBJS)
- $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
+ +$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
@$(E) " LD " $@
ifdef CONFIG_WPA_TRACE
@@ -1326,7 +1455,7 @@ _OBJS_VAR := OBJS_c
include ../src/objs.mk
hostapd_cli: $(OBJS_c)
- $(Q)$(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c) $(LIBS_c)
+ +$(Q)$(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c) $(LIBS_c)
@$(E) " LD " $@
NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o $(SHA1OBJS)
@@ -1350,7 +1479,9 @@ NOBJS += ../src/utils/trace.o
endif
HOBJS += hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/utils/wpabuf.o ../src/crypto/milenage.o
+ifneq ($(CONFIG_TLS), mbedtls)
HOBJS += ../src/crypto/aes-encblock.o
+endif
ifdef CONFIG_INTERNAL_AES
HOBJS += ../src/crypto/aes-internal.o
HOBJS += ../src/crypto/aes-internal-enc.o
@@ -1373,13 +1504,17 @@ SOBJS += ../src/common/sae.o
SOBJS += ../src/common/sae_pk.o
SOBJS += ../src/common/dragonfly.o
SOBJS += $(AESOBJS)
+ifneq ($(CONFIG_TLS), mbedtls)
SOBJS += ../src/crypto/sha256-prf.o
SOBJS += ../src/crypto/sha384-prf.o
SOBJS += ../src/crypto/sha512-prf.o
+endif
SOBJS += ../src/crypto/dh_groups.o
+ifneq ($(CONFIG_TLS), mbedtls)
SOBJS += ../src/crypto/sha256-kdf.o
SOBJS += ../src/crypto/sha384-kdf.o
SOBJS += ../src/crypto/sha512-kdf.o
+endif
_OBJS_VAR := NOBJS
include ../src/objs.mk
@@ -1388,6 +1523,12 @@ include ../src/objs.mk
_OBJS_VAR := SOBJS
include ../src/objs.mk
+dump_cflags:
+ @printf "%s " "$(CFLAGS)"
+
+dump_ldflags:
+ @printf "%s " "$(LDFLAGS) $(LIBS) $(EXTRALIBS)"
+
nt_password_hash: $(NOBJS)
$(Q)$(CC) $(LDFLAGS) -o nt_password_hash $(NOBJS) $(LIBS_n)
@$(E) " LD " $@
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index a86621ed9..f3968ec95 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -1229,6 +1229,8 @@ static int hostapd_config_vht_capab(struct hostapd_config *conf,
conf->vht_capab |= VHT_CAP_RX_ANTENNA_PATTERN;
if (os_strstr(capab, "[TX-ANTENNA-PATTERN]"))
conf->vht_capab |= VHT_CAP_TX_ANTENNA_PATTERN;
+ if (os_strstr(capab, "[EXT-NSS-BW-SUPP]"))
+ conf->vht_capab |= VHT_CAP_EXTENDED_NSS_BW_SUPPORT;
return 0;
}
#endif /* CONFIG_IEEE80211AC */
@@ -2654,8 +2656,12 @@ static int hostapd_config_fill(struct hostapd_config *conf,
sizeof(conf->bss[0]->iface));
} else if (os_strcmp(buf, "bridge") == 0) {
os_strlcpy(bss->bridge, pos, sizeof(bss->bridge));
+ if (!bss->wds_bridge[0])
+ os_strlcpy(bss->wds_bridge, pos, sizeof(bss->wds_bridge));
} else if (os_strcmp(buf, "bridge_hairpin") == 0) {
bss->bridge_hairpin = atoi(pos);
+ } else if (os_strcmp(buf, "snoop_iface") == 0) {
+ os_strlcpy(bss->snoop_iface, pos, sizeof(bss->snoop_iface));
} else if (os_strcmp(buf, "vlan_bridge") == 0) {
os_strlcpy(bss->vlan_bridge, pos, sizeof(bss->vlan_bridge));
} else if (os_strcmp(buf, "wds_bridge") == 0) {
@@ -3043,6 +3049,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
} else if (os_strcmp(buf, "iapp_interface") == 0) {
wpa_printf(MSG_INFO, "DEPRECATED: iapp_interface not used");
#endif /* CONFIG_IAPP */
+ } else if (os_strcmp(buf, "dynamic_own_ip_addr") == 0) {
+ bss->dynamic_own_ip_addr = atoi(pos);
} else if (os_strcmp(buf, "own_ip_addr") == 0) {
if (hostapd_parse_ip_addr(pos, &bss->own_ip_addr)) {
wpa_printf(MSG_ERROR,
@@ -3270,6 +3278,14 @@ static int hostapd_config_fill(struct hostapd_config *conf,
line, bss->max_num_sta, MAX_STA_COUNT);
return 1;
}
+ } else if (os_strcmp(buf, "iface_max_num_sta") == 0) {
+ conf->max_num_sta = atoi(pos);
+ if (conf->max_num_sta < 0 ||
+ conf->max_num_sta > MAX_STA_COUNT) {
+ wpa_printf(MSG_ERROR, "Line %d: Invalid max_num_sta=%d; allowed range 0..%d",
+ line, conf->max_num_sta, MAX_STA_COUNT);
+ return 1;
+ }
} else if (os_strcmp(buf, "wpa") == 0) {
bss->wpa = atoi(pos);
} else if (os_strcmp(buf, "extended_key_id") == 0) {
@@ -3459,6 +3475,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
wpa_printf(MSG_INFO,
"Line %d: Obsolete peerkey parameter ignored", line);
#ifdef CONFIG_IEEE80211R_AP
+ } else if (os_strcmp(buf, "ft_iface") == 0) {
+ os_strlcpy(bss->ft_iface, pos, sizeof(bss->ft_iface));
} else if (os_strcmp(buf, "mobility_domain") == 0) {
if (os_strlen(pos) != 2 * MOBILITY_DOMAIN_ID_LEN ||
hexstr2bin(pos, bss->mobility_domain,
@@ -3828,6 +3846,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
#ifndef CONFIG_NO_VLAN
} else if (os_strcmp(buf, "dynamic_vlan") == 0) {
bss->ssid.dynamic_vlan = atoi(pos);
+ } else if (os_strcmp(buf, "vlan_no_bridge") == 0) {
+ bss->ssid.vlan_no_bridge = atoi(pos);
} else if (os_strcmp(buf, "per_sta_vif") == 0) {
bss->ssid.per_sta_vif = atoi(pos);
} else if (os_strcmp(buf, "vlan_file") == 0) {
@@ -3929,6 +3949,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
if (bss->ocv && !bss->ieee80211w)
bss->ieee80211w = 1;
#endif /* CONFIG_OCV */
+ } else if (os_strcmp(buf, "noscan") == 0) {
+ conf->noscan = atoi(pos);
+ } else if (os_strcmp(buf, "ht_coex") == 0) {
+ conf->no_ht_coex = !atoi(pos);
} else if (os_strcmp(buf, "ieee80211n") == 0) {
conf->ieee80211n = atoi(pos);
} else if (os_strcmp(buf, "ht_capab") == 0) {
@@ -3979,6 +4003,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
} else if (os_strcmp(buf, "he_bss_color") == 0) {
conf->he_op.he_bss_color = atoi(pos) & 0x3f;
conf->he_op.he_bss_color_disabled = 0;
+ if (atoi(pos) > 63)
+ conf->he_op.he_bss_color = os_random() % 63 + 1;
} else if (os_strcmp(buf, "he_bss_color_partial") == 0) {
conf->he_op.he_bss_color_partial = atoi(pos);
} else if (os_strcmp(buf, "he_default_pe_duration") == 0) {
@@ -5435,6 +5461,15 @@ static int hostapd_config_fill(struct hostapd_config *conf,
bss->mld_indicate_disabled = atoi(pos);
#endif /* CONFIG_TESTING_OPTIONS */
#endif /* CONFIG_IEEE80211BE */
+#ifdef CONFIG_APUP
+ } else if (os_strcmp(buf, "apup") == 0) {
+ bss->apup = !!atoi(pos);
+ if (bss->apup)
+ bss->wds_sta = 1;
+ } else if (os_strcmp(buf, "apup_peer_ifname_prefix") == 0) {
+ os_strlcpy(bss->apup_peer_ifname_prefix,
+ pos, sizeof(bss->apup_peer_ifname_prefix));
+#endif // def CONFIG_APUP
} else {
wpa_printf(MSG_ERROR,
"Line %d: unknown configuration item '%s'",
@@ -5460,7 +5495,12 @@ struct hostapd_config * hostapd_config_read(const char *fname)
int errors = 0;
size_t i;
- f = fopen(fname, "r");
+ if (!strncmp(fname, "data:", 5)) {
+ f = fmemopen((void *)(fname + 5), strlen(fname + 5), "r");
+ fname = "<inline>";
+ } else {
+ f = fopen(fname, "r");
+ }
if (f == NULL) {
wpa_printf(MSG_ERROR, "Could not open configuration file '%s' "
"for reading.", fname);
diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index a584d370e..1d5922fab 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -4005,6 +4005,7 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
reply_size);
} else if (os_strcmp(buf, "STATUS-DRIVER") == 0) {
reply_len = hostapd_drv_status(hapd, reply, reply_size);
+#ifdef CONFIG_CTRL_IFACE_MIB
} else if (os_strcmp(buf, "MIB") == 0) {
reply_len = ieee802_11_get_mib(hapd, reply, reply_size);
if (reply_len >= 0) {
@@ -4046,6 +4047,7 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
} else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
reply_len = hostapd_ctrl_iface_sta_next(hapd, buf + 9, reply,
reply_size);
+#endif
} else if (os_strcmp(buf, "ATTACH") == 0) {
if (hostapd_ctrl_iface_attach(hapd, from, fromlen, NULL))
reply_len = -1;
@@ -5994,6 +5996,7 @@ try_again:
return -1;
}
+ interface->ctrl_iface_recv = hostapd_ctrl_iface_receive_process;
wpa_msg_register_cb(hostapd_ctrl_iface_msg_cb);
return 0;
@@ -6095,6 +6098,7 @@ fail:
os_free(fname);
interface->global_ctrl_sock = s;
+ interface->ctrl_iface_recv = hostapd_ctrl_iface_receive_process;
eloop_register_read_sock(s, hostapd_global_ctrl_iface_receive,
interface, NULL);
diff --git a/hostapd/defconfig b/hostapd/defconfig
index 66bf894eb..f716553bb 100644
--- a/hostapd/defconfig
+++ b/hostapd/defconfig
@@ -6,9 +6,21 @@
# just setting VARIABLE=n is not disabling that variable.
#
# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-# be modified from here. In most cass, these lines should use += in order not
+# be modified from here. In most cases, these lines should use += in order not
# to override previous values of the variables.
+
+# Uncomment following two lines and fix the paths if you have installed TLS
+# libraries in a non-default location
+#CFLAGS += -I/usr/local/openssl/include
+#LIBS += -L/usr/local/openssl/lib
+
+# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
+# the kerberos files are not in the default include path. Following line can be
+# used to fix build issues on such systems (krb5.h not found).
+#CFLAGS += -I/usr/include/kerberos
+
+
# Driver interface for Host AP driver
CONFIG_DRIVER_HOSTAP=y
@@ -281,6 +293,7 @@ CONFIG_IPV6=y
# openssl = OpenSSL (default)
# gnutls = GnuTLS
# internal = Internal TLSv1 implementation (experimental)
+# mbedtls = mbed TLS
# linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental)
# none = Empty template
#CONFIG_TLS=openssl
diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
index d69525502..ebf8addc1 100644
--- a/hostapd/hostapd_cli.c
+++ b/hostapd/hostapd_cli.c
@@ -410,7 +410,6 @@ static int hostapd_cli_cmd_disassociate(struct wpa_ctrl *ctrl, int argc,
}
-#ifdef CONFIG_TAXONOMY
static int hostapd_cli_cmd_signature(struct wpa_ctrl *ctrl, int argc,
char *argv[])
{
@@ -423,7 +422,6 @@ static int hostapd_cli_cmd_signature(struct wpa_ctrl *ctrl, int argc,
os_snprintf(buf, sizeof(buf), "SIGNATURE %s", argv[0]);
return wpa_ctrl_command(ctrl, buf);
}
-#endif /* CONFIG_TAXONOMY */
static int hostapd_cli_cmd_sa_query(struct wpa_ctrl *ctrl, int argc,
@@ -440,7 +438,6 @@ static int hostapd_cli_cmd_sa_query(struct wpa_ctrl *ctrl, int argc,
}
-#ifdef CONFIG_WPS
static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc,
char *argv[])
{
@@ -666,7 +663,6 @@ static int hostapd_cli_cmd_wps_config(struct wpa_ctrl *ctrl, int argc,
ssid_hex, argv[1]);
return wpa_ctrl_command(ctrl, buf);
}
-#endif /* CONFIG_WPS */
static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc,
@@ -766,7 +762,7 @@ static int wpa_ctrl_command_sta(struct wpa_ctrl *ctrl, const char *cmd,
}
buf[len] = '\0';
- if (memcmp(buf, "FAIL", 4) == 0)
+ if (memcmp(buf, "FAIL", 4) == 0 || memcmp(buf, "UNKNOWN COMMAND", 15) == 0)
return -1;
if (print)
printf("%s", buf);
@@ -1695,13 +1691,10 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
{ "disassociate", hostapd_cli_cmd_disassociate,
hostapd_complete_stations,
"<addr> = disassociate a station" },
-#ifdef CONFIG_TAXONOMY
{ "signature", hostapd_cli_cmd_signature, hostapd_complete_stations,
"<addr> = get taxonomy signature for a station" },
-#endif /* CONFIG_TAXONOMY */
{ "sa_query", hostapd_cli_cmd_sa_query, hostapd_complete_stations,
"<addr> = send SA Query to a station" },
-#ifdef CONFIG_WPS
{ "wps_pin", hostapd_cli_cmd_wps_pin, NULL,
"<uuid> <pin> [timeout] [addr] = add WPS Enrollee PIN" },
{ "wps_check_pin", hostapd_cli_cmd_wps_check_pin, NULL,
@@ -1726,7 +1719,6 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
"<SSID> <auth> <encr> <key> = configure AP" },
{ "wps_get_status", hostapd_cli_cmd_wps_get_status, NULL,
"= show current WPS status" },
-#endif /* CONFIG_WPS */
{ "disassoc_imminent", hostapd_cli_cmd_disassoc_imminent, NULL,
"= send Disassociation Imminent notification" },
{ "ess_disassoc", hostapd_cli_cmd_ess_disassoc, NULL,
diff --git a/hostapd/main.c b/hostapd/main.c
index aa1f69812..e790f18ce 100644
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -31,7 +31,7 @@
#include "config_file.h"
#include "eap_register.h"
#include "ctrl_iface.h"
-
+#include "build_features.h"
struct hapd_global {
void **drv_priv;
@@ -40,6 +40,7 @@ struct hapd_global {
static struct hapd_global global;
+extern int radius_main(int argc, char **argv);
#ifndef CONFIG_NO_HOSTAPD_LOGGER
static void hostapd_logger_cb(void *ctx, const u8 *addr, unsigned int module,
@@ -692,6 +693,11 @@ fail:
return -1;
}
+void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data);
+
+void hostapd_wpa_event_global(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data);
#ifdef CONFIG_WPS
static int gen_uuid(const char *txt_addr)
@@ -784,6 +790,11 @@ int main(int argc, char *argv[])
if (os_program_init())
return -1;
+#ifdef RADIUS_SERVER
+ if (strstr(argv[0], "radius"))
+ return radius_main(argc, argv);
+#endif
+
os_memset(&interfaces, 0, sizeof(interfaces));
interfaces.reload_config = hostapd_reload_config;
interfaces.config_read_cb = hostapd_config_read;
@@ -813,8 +824,10 @@ int main(int argc, char *argv[])
return -1;
#endif /* CONFIG_DPP */
+ wpa_supplicant_event = hostapd_wpa_event;
+ wpa_supplicant_event_global = hostapd_wpa_event_global;
for (;;) {
- c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:vg:G:q");
+ c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:g:G:qv::");
if (c < 0)
break;
switch (c) {
@@ -851,6 +864,8 @@ int main(int argc, char *argv[])
break;
#endif /* CONFIG_DEBUG_LINUX_TRACING */
case 'v':
+ if (optarg)
+ exit(!has_feature(optarg));
show_version();
exit(1);
case 'g':
@@ -1020,6 +1035,7 @@ int main(int argc, char *argv[])
}
hostapd_global_ctrl_iface_init(&interfaces);
+ hostapd_ucode_init(&interfaces);
if (hostapd_global_run(&interfaces, daemonize, pid_file)) {
wpa_printf(MSG_ERROR, "Failed to start eloop");
@@ -1029,6 +1045,7 @@ int main(int argc, char *argv[])
ret = 0;
out:
+ hostapd_ucode_free();
hostapd_global_ctrl_iface_deinit(&interfaces);
/* Deinitialize all interfaces */
for (i = 0; i < interfaces.count; i++) {
diff --git a/src/ap/acs.c b/src/ap/acs.c
index f5b36d327..25fec499a 100644
--- a/src/ap/acs.c
+++ b/src/ap/acs.c
@@ -471,17 +471,17 @@ static int acs_get_bw_center_chan(int freq, enum bw_type bw)
static int acs_survey_is_sufficient(struct freq_survey *survey)
{
if (!(survey->filled & SURVEY_HAS_NF)) {
+ survey->nf = -95;
wpa_printf(MSG_INFO,
"ACS: Survey for freq %d is missing noise floor",
survey->freq);
- return 0;
}
if (!(survey->filled & SURVEY_HAS_CHAN_TIME)) {
+ survey->channel_time = 0;
wpa_printf(MSG_INFO,
"ACS: Survey for freq %d is missing channel time",
survey->freq);
- return 0;
}
if (!(survey->filled & SURVEY_HAS_CHAN_TIME_BUSY) &&
@@ -489,7 +489,6 @@ static int acs_survey_is_sufficient(struct freq_survey *survey)
wpa_printf(MSG_INFO,
"ACS: Survey for freq %d is missing RX and busy time (at least one is required)",
survey->freq);
- return 0;
}
return 1;
diff --git a/src/ap/airtime_policy.c b/src/ap/airtime_policy.c
index 68443115f..26f11ad98 100644
--- a/src/ap/airtime_policy.c
+++ b/src/ap/airtime_policy.c
@@ -112,8 +112,14 @@ static void set_sta_weights(struct hostapd_data *hapd, unsigned int weight)
{
struct sta_info *sta;
- for (sta = hapd->sta_list; sta; sta = sta->next)
- sta_set_airtime_weight(hapd, sta, weight);
+ for (sta = hapd->sta_list; sta; sta = sta->next) {
+ unsigned int sta_weight = weight;
+
+ if (sta->dyn_airtime_weight)
+ sta_weight = (weight * sta->dyn_airtime_weight) / 256;
+
+ sta_set_airtime_weight(hapd, sta, sta_weight);
+ }
}
@@ -244,7 +250,10 @@ int airtime_policy_new_sta(struct hostapd_data *hapd, struct sta_info *sta)
unsigned int weight;
if (hapd->iconf->airtime_mode == AIRTIME_MODE_STATIC) {
- weight = get_weight_for_sta(hapd, sta->addr);
+ if (sta->dyn_airtime_weight)
+ weight = sta->dyn_airtime_weight;
+ else
+ weight = get_weight_for_sta(hapd, sta->addr);
if (weight)
return sta_set_airtime_weight(hapd, sta, weight);
}
diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
index e6669e6a3..29a9ae7db 100644
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -121,6 +121,7 @@ struct hostapd_ssid {
#define DYNAMIC_VLAN_OPTIONAL 1
#define DYNAMIC_VLAN_REQUIRED 2
int dynamic_vlan;
+ int vlan_no_bridge;
#define DYNAMIC_VLAN_NAMING_WITHOUT_DEVICE 0
#define DYNAMIC_VLAN_NAMING_WITH_DEVICE 1
#define DYNAMIC_VLAN_NAMING_END 2
@@ -282,6 +283,8 @@ struct airtime_sta_weight {
struct hostapd_bss_config {
char iface[IFNAMSIZ + 1];
char bridge[IFNAMSIZ + 1];
+ char ft_iface[IFNAMSIZ + 1];
+ char snoop_iface[IFNAMSIZ + 1];
char vlan_bridge[IFNAMSIZ + 1];
char wds_bridge[IFNAMSIZ + 1];
int bridge_hairpin; /* hairpin_mode on bridge members */
@@ -307,6 +310,7 @@ struct hostapd_bss_config {
unsigned int eap_sim_db_timeout;
int eap_server_erp; /* Whether ERP is enabled on internal EAP server */
struct hostapd_ip_addr own_ip_addr;
+ int dynamic_own_ip_addr;
char *nas_identifier;
struct hostapd_radius_servers *radius;
int radius_require_message_authenticator;
@@ -995,6 +999,35 @@ struct hostapd_bss_config {
bool mld_indicate_disabled;
#endif /* CONFIG_TESTING_OPTIONS */
#endif /* CONFIG_IEEE80211BE */
+
+#ifdef CONFIG_APUP
+ /**
+ * Access Point Micro Peering
+ * A simpler and more useful successor to Ad Hoc,
+ * Wireless Distribution System, 802.11s mesh mode, Multi-AP and EasyMesh.
+ *
+ * Almost plain APs communicate between them via 4-address mode, like in WDS
+ * but all of them are AP, so they can eventually communicate also with
+ * plain stations and more AP nodes in sight.
+ * Low hardware requirements, just AP mode support + 4-address mode, and no
+ * more unnecessary complications, like hardcoded bridging or routing
+ * algorithm in WiFi stack.
+ * For each AP in sight an interface is created, and then it can be used as
+ * convenient in each case, bridging, routing etc.
+ */
+ bool apup;
+
+ /**
+ * In 4-address mode each peer AP in sight is associated to its own
+ * interface so we have more flexibility in "user-space".
+ * Those interfaces could be simply bridged in a trivial topology (which
+ * happens automatically if wds_bridge is not an empty string), or feeded to
+ * a routing daemon.
+ *
+ * If not defined interface names are generated following the WDS convention.
+ */
+ char apup_peer_ifname_prefix[IFNAMSIZ + 1];
+#endif /* CONFIG_APUP */
};
/**
@@ -1085,6 +1118,8 @@ struct hostapd_config {
unsigned int track_sta_max_num;
unsigned int track_sta_max_age;
+ int max_num_sta;
+
char country[3]; /* first two octets: country code as described in
* ISO/IEC 3166-1. Third octet:
* ' ' (ascii 32): all environments
@@ -1122,6 +1157,8 @@ struct hostapd_config {
int ht_op_mode_fixed;
u16 ht_capab;
+ int noscan;
+ int no_ht_coex;
int ieee80211n;
int secondary_channel;
int no_pri_sec_switch;
diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index c47349110..7c9527cd3 100644
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -385,13 +385,37 @@ int hostapd_set_wds_sta(struct hostapd_data *hapd, char *ifname_wds,
const u8 *addr, int aid, int val)
{
const char *bridge = NULL;
+ char ifName[IFNAMSIZ + 1];
+
+ int mRet = 0;
if (hapd->driver == NULL || hapd->driver->set_wds_sta == NULL)
return -1;
+
+#ifdef CONFIG_APUP
+ if (hapd->conf->apup && hapd->conf->apup_peer_ifname_prefix[0]) {
+ mRet = os_snprintf(
+ ifName, sizeof(ifName), "%s%d",
+ hapd->conf->apup_peer_ifname_prefix, aid);
+ }
+ else
+#endif // def CONFIG_APUP
+ mRet = os_snprintf(
+ ifName, sizeof(ifName), "%s.sta%d",
+ hapd->conf->iface, aid);
+
+ if (mRet >= (int) sizeof(ifName))
+ wpa_printf(MSG_WARNING,
+ "nl80211: WDS interface name was truncated");
+ else if (mRet < 0)
+ return mRet;
+
+ // Pass back to the caller the resulting interface name
+ if (ifname_wds)
+ os_strlcpy(ifname_wds, ifName, IFNAMSIZ + 1);
+
if (hapd->conf->wds_bridge[0])
bridge = hapd->conf->wds_bridge;
- else if (hapd->conf->bridge[0])
- bridge = hapd->conf->bridge;
return hapd->driver->set_wds_sta(hapd->drv_priv, addr, aid, val,
bridge, ifname_wds);
}
diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
index d7e79c840..58ca046c6 100644
--- a/src/ap/ap_drv_ops.h
+++ b/src/ap/ap_drv_ops.h
@@ -35,6 +35,9 @@ int hostapd_set_drv_ieee8021x(struct hostapd_data *hapd, const char *ifname,
int enabled);
int hostapd_vlan_if_add(struct hostapd_data *hapd, const char *ifname);
int hostapd_vlan_if_remove(struct hostapd_data *hapd, const char *ifname);
+
+/** @param val as per nl80211 driver implementation, 1 means add 0 means remove
+ */
int hostapd_set_wds_sta(struct hostapd_data *hapd, char *ifname_wds,
const u8 *addr, int aid, int val);
int hostapd_sta_add(struct hostapd_data *hapd,
@@ -371,12 +374,12 @@ static inline int hostapd_drv_br_port_set_attr(struct hostapd_data *hapd,
static inline int hostapd_drv_br_set_net_param(struct hostapd_data *hapd,
enum drv_br_net_param param,
- unsigned int val)
+ const char *ifname, unsigned int val)
{
if (hapd->driver == NULL || hapd->drv_priv == NULL ||
hapd->driver->br_set_net_param == NULL)
return -1;
- return hapd->driver->br_set_net_param(hapd->drv_priv, param, val);
+ return hapd->driver->br_set_net_param(hapd->drv_priv, param, ifname, val);
}
static inline int hostapd_drv_vendor_cmd(struct hostapd_data *hapd,
@@ -404,6 +407,23 @@ static inline int hostapd_drv_stop_ap(struct hostapd_data *hapd)
return hapd->driver->stop_ap(hapd->drv_priv, link_id);
}
+static inline int hostapd_drv_if_rename(struct hostapd_data *hapd,
+ enum wpa_driver_if_type type,
+ const char *ifname,
+ const char *new_name)
+{
+ if (!hapd->driver || !hapd->driver->if_rename || !hapd->drv_priv)
+ return -1;
+ return hapd->driver->if_rename(hapd->drv_priv, type, ifname, new_name);
+}
+
+static inline int hostapd_drv_set_first_bss(struct hostapd_data *hapd)
+{
+ if (!hapd->driver || !hapd->driver->set_first_bss || !hapd->drv_priv)
+ return 0;
+ return hapd->driver->set_first_bss(hapd->drv_priv);
+}
+
static inline int hostapd_drv_channel_info(struct hostapd_data *hapd,
struct wpa_channel_info *ci)
{
diff --git a/src/ap/apup.c b/src/ap/apup.c
new file mode 100644
index 000000000..f736ddc8e
--- /dev/null
+++ b/src/ap/apup.c
@@ -0,0 +1,168 @@
+/*
+ * hostapd / APuP Access Point Micro Peering
+ *
+ * Copyright (C) 2023-2024 Gioacchino Mazzurco <gio@polymathes.cc>
+ *
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
+ */
+
+/* Be extremely careful altering include order, move just one in the wrong place
+ * and you will start getting a bunch of error of undefined bool, size_t etc. */
+
+#include "utils/includes.h"
+#include "utils/common.h"
+#include "utils/os.h"
+
+#include "apup.h"
+
+#include "drivers/driver.h"
+#include "wpa_auth.h"
+#include "ap_mlme.h"
+#include "ieee802_11.h"
+#include "ap_drv_ops.h"
+#include "sta_info.h"
+
+#ifdef UBUS_SUPPORT
+# include "ubus.h"
+#endif
+
+#ifdef UCODE_SUPPORT
+# include "ucode.h"
+#endif
+
+void apup_process_beacon(struct hostapd_data *hapd,
+ const struct ieee80211_mgmt *mgmt, size_t len,
+ const struct ieee802_11_elems *elems )
+{
+ if (!os_memcmp(hapd->own_addr, mgmt->bssid, ETH_ALEN))
+ {
+ wpa_printf(MSG_WARNING,
+ "apup_process_beacon(...) own beacon elems.ssid %.*s",
+ (int) elems->ssid_len, elems->ssid);
+ return;
+ }
+
+ if (elems->ssid_len != hapd->conf->ssid.ssid_len ||
+ os_memcmp(elems->ssid, hapd->conf->ssid.ssid, elems->ssid_len))
+ return;
+
+ struct sta_info* sta_ret = ap_get_sta(hapd, mgmt->bssid);
+ if (sta_ret)
+ return;
+
+ sta_ret = ap_sta_add(hapd, mgmt->bssid);
+
+ /* TODO: this has been added just to making compiler happy after breaking
+ * changes introduced in 11a607d121df512e010148bedcb4263a03329dc7 to support
+ * IEEE80211BE Multi Link Operation. Look at that commit with more time and
+ * understand what could be a proper implementation in this context too
+ */
+ const u8 *mld_link_addr = NULL;
+ bool mld_link_sta = false;
+
+ /* First add the station without more information */
+ int aRet = hostapd_sta_add(
+ hapd, mgmt->bssid, sta_ret->aid, 0,
+ NULL, 0, 0, NULL, NULL, NULL, 0, NULL, 0, NULL,
+ sta_ret->flags, 0, 0, 0,
+ 0, // 0 add, 1 set
+ mld_link_addr, mld_link_sta);
+
+ sta_ret->flags |= WLAN_STA_AUTH;
+ wpa_auth_sm_event(sta_ret->wpa_sm, WPA_AUTH);
+
+ /* TODO: Investigate if supporting WPA or other encryption method is
+ * possible */
+ sta_ret->auth_alg = WLAN_AUTH_OPEN;
+ mlme_authenticate_indication(hapd, sta_ret);
+
+ sta_ret->capability = le_to_host16(mgmt->u.beacon.capab_info);
+
+ if (sta_ret->capability & WLAN_CAPABILITY_SHORT_PREAMBLE)
+ sta_ret->flags |= WLAN_STA_SHORT_PREAMBLE;
+ else
+ sta_ret->flags &= ~WLAN_STA_SHORT_PREAMBLE;
+
+ hostapd_copy_supp_rates(hapd, sta_ret, elems);
+
+ /* Whithout this flag copy_sta_[v]ht_capab will disable [V]HT
+ * capabilities even if available */
+ if (elems->ht_capabilities || elems->vht_capabilities)
+ sta_ret->flags |= WLAN_STA_WMM;
+
+ copy_sta_ht_capab(hapd, sta_ret, elems->ht_capabilities);
+#ifdef CONFIG_IEEE80211AC
+ copy_sta_vht_capab(hapd, sta_ret, elems->vht_capabilities);
+ copy_sta_vht_oper(hapd, sta_ret, elems->vht_operation);
+ copy_sta_vendor_vht(hapd, sta_ret, elems->vendor_vht, elems->vendor_vht_len);
+#endif // def CONFIG_IEEE80211AC
+#ifdef CONFIG_IEEE80211AX
+ copy_sta_he_capab(hapd, sta_ret, IEEE80211_MODE_AP,
+ elems->he_capabilities, elems->he_capabilities_len);
+ copy_sta_he_6ghz_capab(hapd, sta_ret, elems->he_6ghz_band_cap);
+#endif // def CONFIG_IEEE80211AX
+#ifdef CONFIG_IEEE80211BE
+ copy_sta_eht_capab(hapd, sta_ret,
+ IEEE80211_MODE_AP, // TODO: Make sure is the right value
+ elems->he_capabilities, elems->he_capabilities_len,
+ elems->eht_capabilities, elems->eht_capabilities_len);
+#endif //def CONFIG_IEEE80211BE
+
+ update_ht_state(hapd, sta_ret);
+
+ if (hostapd_get_aid(hapd, sta_ret) < 0)
+ {
+ wpa_printf(MSG_INFO, "apup_process_beacon(...) No room for more AIDs");
+ return;
+ }
+
+ sta_ret->flags |= WLAN_STA_ASSOC_REQ_OK;
+
+ /* Make sure that the previously registered inactivity timer will not
+ * remove the STA immediately. */
+ sta_ret->timeout_next = STA_NULLFUNC;
+
+ sta_ret->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC;
+
+ /* Then set the paramethers */
+ int sRet = hostapd_sta_add(
+ hapd, mgmt->bssid, sta_ret->aid,
+ sta_ret->capability,
+ sta_ret->supported_rates, sta_ret->supported_rates_len,
+ 0, // u16 listen_interval TODO ?
+ sta_ret->ht_capabilities,
+ sta_ret->vht_capabilities,
+ sta_ret->he_capab, sta_ret->he_capab_len,
+ sta_ret->eht_capab, sta_ret->eht_capab_len,
+ sta_ret->he_6ghz_capab,
+ sta_ret->flags,
+ 0, // u8 qosinfo
+ sta_ret->vht_opmode,
+ 0, // int supp_p2p_ps
+ 1, // 0 add, 1 set
+ mld_link_addr, mld_link_sta);
+
+ ap_sta_set_authorized(hapd, sta_ret, 1);
+ hostapd_set_sta_flags(hapd, sta_ret);
+
+ char mIfname[IFNAMSIZ + 1];
+ os_memset(mIfname, 0, IFNAMSIZ + 1);
+
+ // last param 1 means add 0 means remove
+ int mRet = hostapd_set_wds_sta(
+ hapd, mIfname, mgmt->bssid, sta_ret->aid, 1);
+
+ wpa_printf(MSG_INFO,
+ "apup_process_beacon(...) Added APuP peer at %s with flags: %d,"
+ " capabilities %d",
+ mIfname, sta_ret->flags, sta_ret->capability);
+
+#ifdef UBUS_SUPPORT
+ hostapd_ubus_notify_apup_newpeer(hapd, mgmt->bssid, mIfname);
+#endif
+
+#ifdef UCODE_SUPPORT
+ hostapd_ucode_apup_newpeer(hapd, mIfname);
+#endif
+}
diff --git a/src/ap/apup.h b/src/ap/apup.h
new file mode 100644
index 000000000..a14a283bb
--- /dev/null
+++ b/src/ap/apup.h
@@ -0,0 +1,24 @@
+/*
+ * hostapd / APuP Access Point Micro Peering
+ *
+ * Copyright (C) 2023-2024 Gioacchino Mazzurco <gio@polymathes.cc>
+ *
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
+ */
+
+/* Be extremely careful altering include order, move just one in the wrong place
+ * and you will start getting a bunch of error of undefined bool, size_t etc. */
+
+#include "utils/includes.h"
+#include "utils/common.h"
+
+#include "hostapd.h"
+#include "common/ieee802_11_defs.h"
+
+/** When beacons from other Access Point are received, if the SSID is matching
+ * add them as APuP peers (aka WDS STA to our own AP) the same happens on the
+ * peer when receiving our beacons */
+void apup_process_beacon(struct hostapd_data *hapd,
+ const struct ieee80211_mgmt *mgmt, size_t len,
+ const struct ieee802_11_elems *elems );
diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index ddb99ca22..58b561661 100644
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -1439,6 +1439,12 @@ void handle_probe_req(struct hostapd_data *hapd,
int mld_id;
u16 links;
#endif /* CONFIG_IEEE80211BE */
+ struct hostapd_ubus_request req = {
+ .type = HOSTAPD_UBUS_PROBE_REQ,
+ .mgmt_frame = mgmt,
+ .ssi_signal = ssi_signal,
+ .elems = &elems,
+ };
if (hapd->iconf->rssi_ignore_probe_request && ssi_signal &&
ssi_signal < hapd->iconf->rssi_ignore_probe_request)
@@ -1492,7 +1498,7 @@ void handle_probe_req(struct hostapd_data *hapd,
* is less likely to see them (Probe Request frame sent on a
* neighboring, but partially overlapping, channel).
*/
- if (elems.ds_params &&
+ if (elems.ds_params && 0 &&
hapd->iface->current_mode &&
(hapd->iface->current_mode->mode == HOSTAPD_MODE_IEEE80211G ||
hapd->iface->current_mode->mode == HOSTAPD_MODE_IEEE80211B) &&
@@ -1625,6 +1631,12 @@ void handle_probe_req(struct hostapd_data *hapd,
}
#endif /* CONFIG_P2P */
+ if (hostapd_ubus_handle_event(hapd, &req)) {
+ wpa_printf(MSG_DEBUG, "Probe request for " MACSTR " rejected by ubus handler.\n",
+ MAC2STR(mgmt->sa));
+ return;
+ }
+
/* TODO: verify that supp_rates contains at least one matching rate
* with AP configuration */
@@ -1643,7 +1655,7 @@ void handle_probe_req(struct hostapd_data *hapd,
if (hapd->conf->no_probe_resp_if_max_sta &&
is_multicast_ether_addr(mgmt->da) &&
is_multicast_ether_addr(mgmt->bssid) &&
- hapd->num_sta >= hapd->conf->max_num_sta &&
+ hostapd_check_max_sta(hapd) &&
!ap_get_sta(hapd, mgmt->sa)) {
wpa_printf(MSG_MSGDUMP, "%s: Ignore Probe Request from " MACSTR
" since no room for additional STA",
diff --git a/src/ap/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c
index d4d73de19..a1ddbda9f 100644
--- a/src/ap/ctrl_iface_ap.c
+++ b/src/ap/ctrl_iface_ap.c
@@ -26,6 +26,26 @@
#include "taxonomy.h"
#include "wnm_ap.h"
+static const char * hw_mode_str(enum hostapd_hw_mode mode)
+{
+ switch (mode) {
+ case HOSTAPD_MODE_IEEE80211B:
+ return "b";
+ case HOSTAPD_MODE_IEEE80211G:
+ return "g";
+ case HOSTAPD_MODE_IEEE80211A:
+ return "a";
+ case HOSTAPD_MODE_IEEE80211AD:
+ return "ad";
+ case HOSTAPD_MODE_IEEE80211ANY:
+ return "any";
+ case NUM_HOSTAPD_MODES:
+ return "invalid";
+ }
+ return "unknown";
+}
+
+#ifdef CONFIG_CTRL_IFACE_MIB
static size_t hostapd_write_ht_mcs_bitmask(char *buf, size_t buflen,
size_t curr_len, const u8 *mcs_set)
@@ -212,26 +232,6 @@ static const char * timeout_next_str(int val)
}
-static const char * hw_mode_str(enum hostapd_hw_mode mode)
-{
- switch (mode) {
- case HOSTAPD_MODE_IEEE80211B:
- return "b";
- case HOSTAPD_MODE_IEEE80211G:
- return "g";
- case HOSTAPD_MODE_IEEE80211A:
- return "a";
- case HOSTAPD_MODE_IEEE80211AD:
- return "ad";
- case HOSTAPD_MODE_IEEE80211ANY:
- return "any";
- case NUM_HOSTAPD_MODES:
- return "invalid";
- }
- return "unknown";
-}
-
-
static int hostapd_ctrl_iface_sta_mib(struct hostapd_data *hapd,
struct sta_info *sta,
char *buf, size_t buflen)
@@ -562,6 +562,7 @@ int hostapd_ctrl_iface_sta_next(struct hostapd_data *hapd, const char *txtaddr,
return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen);
}
+#endif
#ifdef CONFIG_P2P_MANAGER
static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
@@ -1010,12 +1011,12 @@ int hostapd_ctrl_iface_status(struct hostapd_data *hapd, char *buf,
return len;
len += ret;
}
-
+#ifdef CONFIG_CTRL_IFACE_MIB
if (iface->conf->ieee80211n && !hapd->conf->disable_11n && mode) {
len = hostapd_write_ht_mcs_bitmask(buf, buflen, len,
mode->mcs_set);
}
-
+#endif /* CONFIG_CTRL_IFACE_MIB */
if (iface->current_rates && iface->num_rates) {
ret = os_snprintf(buf + len, buflen - len, "supported_rates=");
if (os_snprintf_error(buflen - len, ret))
diff --git a/src/ap/dfs.c b/src/ap/dfs.c
index af9dc16f5..fe044297b 100644
--- a/src/ap/dfs.c
+++ b/src/ap/dfs.c
@@ -18,6 +18,7 @@
#include "ap_drv_ops.h"
#include "drivers/driver.h"
#include "dfs.h"
+#include "crypto/crypto.h"
enum dfs_channel_type {
@@ -527,9 +528,14 @@ dfs_get_valid_channel(struct hostapd_iface *iface,
int num_available_chandefs;
int chan_idx, chan_idx2;
int sec_chan_idx_80p80 = -1;
+ bool is_mesh = false;
int i;
u32 _rand;
+#ifdef CONFIG_MESH
+ is_mesh = iface->mconf;
+#endif
+
wpa_printf(MSG_DEBUG, "DFS: Selecting random channel");
*secondary_channel = 0;
*oper_centr_freq_seg0_idx = 0;
@@ -549,8 +555,20 @@ dfs_get_valid_channel(struct hostapd_iface *iface,
if (num_available_chandefs == 0)
return NULL;
- if (os_get_random((u8 *) &_rand, sizeof(_rand)) < 0)
+ /* try to use deterministic channel in mesh, so that both sides
+ * have a chance to switch to the same channel */
+ if (is_mesh) {
+#ifdef CONFIG_MESH
+ u64 hash[4];
+ const u8 *meshid[1] = { &iface->mconf->meshid[0] };
+ const size_t meshid_len = iface->mconf->meshid_len;
+
+ sha256_vector(1, meshid, &meshid_len, (u8 *)&hash[0]);
+ _rand = hash[0] + hash[1] + hash[2] + hash[3];
+#endif
+ } else if (os_get_random((u8 *) &_rand, sizeof(_rand)) < 0)
return NULL;
+
chan_idx = _rand % num_available_chandefs;
wpa_printf(MSG_DEBUG, "DFS: Picked random entry from the list: %d/%d",
chan_idx, num_available_chandefs);
@@ -1218,6 +1236,8 @@ int hostapd_dfs_pre_cac_expired(struct hostapd_iface *iface, int freq,
"freq=%d ht_enabled=%d chan_offset=%d chan_width=%d cf1=%d cf2=%d",
freq, ht_enabled, chan_offset, chan_width, cf1, cf2);
+ hostapd_ubus_notify_radar_detected(iface, freq, chan_width, cf1, cf2);
+
/* Proceed only if DFS is not offloaded to the driver */
if (iface->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD)
return 0;
diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index c74e551c5..6e76f697a 100644
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -270,6 +270,10 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
struct hostapd_iface *iface = hapd->iface;
#endif /* CONFIG_OWE */
bool updated = false;
+ struct hostapd_ubus_request req = {
+ .type = HOSTAPD_UBUS_ASSOC_REQ,
+ .addr = addr,
+ };
if (addr == NULL) {
/*
@@ -414,6 +418,12 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
goto fail;
}
+ if (hostapd_ubus_handle_event(hapd, &req)) {
+ wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
+ MAC2STR(req.addr));
+ goto fail;
+ }
+
#ifdef CONFIG_P2P
if (elems.p2p) {
wpabuf_free(sta->p2p_ie);
@@ -2416,8 +2426,8 @@ static void hostapd_event_color_change(struct hostapd_data *hapd, bool success)
#endif /* CONFIG_IEEE80211AX */
-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
- union wpa_event_data *data)
+void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data)
{
struct hostapd_data *hapd = ctx;
struct sta_info *sta;
@@ -2776,7 +2786,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
}
-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
+void hostapd_wpa_event_global(void *ctx, enum wpa_event_type event,
union wpa_event_data *data)
{
struct hapd_interfaces *interfaces = ctx;
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 5a8cdc90e..8159194e1 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -247,6 +247,29 @@ static int hostapd_iface_conf_changed(struct hostapd_config *newconf,
return 0;
}
+static inline int hostapd_iface_num_sta(struct hostapd_iface *iface)
+{
+ int num_sta = 0;
+ int i;
+
+ for (i = 0; i < iface->num_bss; i++)
+ num_sta += iface->bss[i]->num_sta;
+
+ return num_sta;
+}
+
+
+int hostapd_check_max_sta(struct hostapd_data *hapd)
+{
+ if (hapd->num_sta >= hapd->conf->max_num_sta)
+ return 1;
+
+ if (hapd->iconf->max_num_sta &&
+ hostapd_iface_num_sta(hapd->iface) >= hapd->iconf->max_num_sta)
+ return 1;
+
+ return 0;
+}
int hostapd_reload_config(struct hostapd_iface *iface)
{
@@ -255,6 +278,8 @@ int hostapd_reload_config(struct hostapd_iface *iface)
struct hostapd_config *newconf, *oldconf;
size_t j;
+ hostapd_ucode_reload_bss(hapd);
+
if (iface->config_fname == NULL) {
/* Only in-memory config in use - assume it has been updated */
hostapd_clear_old(iface);
@@ -475,6 +500,8 @@ void hostapd_free_hapd_data(struct hostapd_data *hapd)
hapd->beacon_set_done = 0;
wpa_printf(MSG_DEBUG, "%s(%s)", __func__, hapd->conf->iface);
+ hostapd_ucode_free_bss(hapd);
+ hostapd_ubus_free_bss(hapd);
accounting_deinit(hapd);
hostapd_deinit_wpa(hapd);
vlan_deinit(hapd);
@@ -485,7 +512,7 @@ void hostapd_free_hapd_data(struct hostapd_data *hapd)
struct hapd_interfaces *ifaces = hapd->iface->interfaces;
size_t i;
- for (i = 0; i < ifaces->count; i++) {
+ for (i = 0; ifaces && i < ifaces->count; i++) {
struct hostapd_iface *iface = ifaces->iface[i];
size_t j;
@@ -685,6 +712,7 @@ static void sta_track_deinit(struct hostapd_iface *iface)
void hostapd_cleanup_iface_partial(struct hostapd_iface *iface)
{
wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface);
+ hostapd_ucode_free_iface(iface);
eloop_cancel_timeout(channel_list_update_timeout, iface, NULL);
#ifdef NEED_AP_MLME
hostapd_stop_setup_timers(iface);
@@ -1304,6 +1332,9 @@ static int hostapd_start_beacon(struct hostapd_data *hapd,
if (hapd->driver && hapd->driver->set_operstate)
hapd->driver->set_operstate(hapd->drv_priv, 1);
+ hostapd_ubus_add_bss(hapd);
+ hostapd_ucode_add_bss(hapd);
+
return 0;
}
@@ -1336,6 +1367,7 @@ static int hostapd_bss_radius_init(struct hostapd_data *hapd)
os_memset(&das_conf, 0, sizeof(das_conf));
das_conf.port = conf->radius_das_port;
+ das_conf.nas_identifier = conf->nas_identifier;
das_conf.shared_secret = conf->radius_das_shared_secret;
das_conf.shared_secret_len =
conf->radius_das_shared_secret_len;
@@ -1378,8 +1410,7 @@ static int hostapd_bss_radius_init(struct hostapd_data *hapd)
* initialized. Most of the modules that are initialized here will be
* deinitialized in hostapd_cleanup().
*/
-static int hostapd_setup_bss(struct hostapd_data *hapd, int first,
- bool start_beacon)
+int hostapd_setup_bss(struct hostapd_data *hapd, int first, bool start_beacon)
{
struct hostapd_bss_config *conf = hapd->conf;
u8 ssid[SSID_MAX_LEN + 1];
@@ -2510,6 +2541,7 @@ static int hostapd_setup_interface_complete_sync(struct hostapd_iface *iface,
if (err)
goto fail;
+ hostapd_ubus_add_iface(iface);
wpa_printf(MSG_DEBUG, "Completing interface initialization");
if (iface->freq) {
#ifdef NEED_AP_MLME
@@ -2739,6 +2771,7 @@ dfs_offload:
fail:
wpa_printf(MSG_ERROR, "Interface initialization failed");
+ hostapd_ubus_free_iface(iface);
if (iface->is_no_ir) {
hostapd_set_state(iface, HAPD_IFACE_NO_IR);
@@ -2938,7 +2971,7 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
}
-static void hostapd_bss_deinit(struct hostapd_data *hapd)
+void hostapd_bss_deinit(struct hostapd_data *hapd)
{
if (!hapd)
return;
@@ -3471,6 +3504,7 @@ void hostapd_interface_deinit_free(struct hostapd_iface *iface)
(unsigned int) iface->conf->num_bss);
driver = iface->bss[0]->driver;
drv_priv = iface->bss[0]->drv_priv;
+ hostapd_ubus_free_iface(iface);
hostapd_interface_deinit(iface);
wpa_printf(MSG_DEBUG, "%s: driver=%p drv_priv=%p -> hapd_deinit",
__func__, driver, drv_priv);
@@ -4002,7 +4036,8 @@ int hostapd_remove_iface(struct hapd_interfaces *interfaces, char *buf)
hapd_iface = interfaces->iface[i];
if (hapd_iface == NULL)
return -1;
- if (!os_strcmp(hapd_iface->conf->bss[0]->iface, buf)) {
+ if (!os_strcmp(hapd_iface->phy, buf) ||
+ !os_strcmp(hapd_iface->conf->bss[0]->iface, buf)) {
wpa_printf(MSG_INFO, "Remove interface '%s'", buf);
hapd_iface->driver_ap_teardown =
!!(hapd_iface->drv_flags &
@@ -4048,6 +4083,8 @@ int hostapd_remove_iface(struct hapd_interfaces *interfaces, char *buf)
void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
int reassoc)
{
+ int mld_assoc_link_id = -1;
+
if (hapd->tkip_countermeasures) {
hostapd_drv_sta_deauth(hapd, sta->addr,
WLAN_REASON_MICHAEL_MIC_FAILURE);
@@ -4055,10 +4092,16 @@ void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
}
#ifdef CONFIG_IEEE80211BE
- if (ap_sta_is_mld(hapd, sta) &&
- sta->mld_assoc_link_id != hapd->mld_link_id)
- return;
+ if (ap_sta_is_mld(hapd, sta)) {
+ if (sta->mld_assoc_link_id == hapd->mld_link_id) {
+ mld_assoc_link_id = sta->mld_assoc_link_id;
+ } else {
+ return;
+ }
+ }
#endif /* CONFIG_IEEE80211BE */
+ if (mld_assoc_link_id != -2)
+ hostapd_prune_associations(hapd, sta->addr, mld_assoc_link_id);
ap_sta_clear_disconnect_timeouts(hapd, sta);
sta->post_csa_sa_query = 0;
diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
index 996977fdf..994e4681e 100644
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
@@ -18,6 +18,8 @@
#include "utils/list.h"
#include "ap_config.h"
#include "drivers/driver.h"
+#include "ubus.h"
+#include "ucode.h"
#define OCE_STA_CFON_ENABLED(hapd) \
((hapd->conf->oce & OCE_STA_CFON) && \
@@ -51,6 +53,10 @@ struct hapd_interfaces {
struct hostapd_config * (*config_read_cb)(const char *config_fname);
int (*ctrl_iface_init)(struct hostapd_data *hapd);
void (*ctrl_iface_deinit)(struct hostapd_data *hapd);
+ int (*ctrl_iface_recv)(struct hostapd_data *hapd,
+ char *buf, char *reply, int reply_size,
+ struct sockaddr_storage *from,
+ socklen_t fromlen);
int (*for_each_interface)(struct hapd_interfaces *interfaces,
int (*cb)(struct hostapd_iface *iface,
void *ctx), void *ctx);
@@ -169,6 +175,21 @@ struct hostapd_sae_commit_queue {
u8 msg[];
};
+/**
+ * struct hostapd_openwrt_stats - OpenWrt custom STA/AP statistics
+ */
+struct hostapd_openwrt_stats {
+ struct {
+ u64 neighbor_report_tx;
+ } rrm;
+
+ struct {
+ u64 bss_transition_query_rx;
+ u64 bss_transition_request_tx;
+ u64 bss_transition_response_rx;
+ } wnm;
+};
+
/**
* struct hostapd_data - hostapd per-BSS data structure
*/
@@ -176,6 +197,8 @@ struct hostapd_data {
struct hostapd_iface *iface;
struct hostapd_config *iconf;
struct hostapd_bss_config *conf;
+ struct hostapd_ubus_bss ubus;
+ struct hostapd_ucode_bss ucode;
int interface_added; /* virtual interface added for this BSS */
unsigned int started:1;
unsigned int disabled:1;
@@ -183,6 +206,9 @@ struct hostapd_data {
u8 own_addr[ETH_ALEN];
+ /* OpenWrt specific statistics */
+ struct hostapd_openwrt_stats openwrt_stats;
+
int num_sta; /* number of entries in sta_list */
struct sta_info *sta_list; /* STA info list head */
#define STA_HASH_SIZE 256
@@ -535,6 +561,7 @@ struct hostapd_mld {
*/
struct hostapd_iface {
struct hapd_interfaces *interfaces;
+ struct hostapd_ucode_iface ucode;
void *owner;
char *config_fname;
struct hostapd_config *conf;
@@ -786,6 +813,7 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
struct hostapd_bss_config *bss);
int hostapd_setup_interface(struct hostapd_iface *iface);
int hostapd_setup_interface_complete(struct hostapd_iface *iface, int err);
+void hostapd_set_own_neighbor_report(struct hostapd_data *hapd);
void hostapd_interface_deinit(struct hostapd_iface *iface);
void hostapd_interface_free(struct hostapd_iface *iface);
struct hostapd_iface * hostapd_alloc_iface(void);
@@ -794,6 +822,8 @@ struct hostapd_iface * hostapd_init(struct hapd_interfaces *interfaces,
struct hostapd_iface *
hostapd_interface_init_bss(struct hapd_interfaces *interfaces, const char *phy,
const char *config_fname, int debug);
+int hostapd_setup_bss(struct hostapd_data *hapd, int first, bool start_beacon);
+void hostapd_bss_deinit(struct hostapd_data *hapd);
void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
int reassoc);
void hostapd_interface_deinit_free(struct hostapd_iface *iface);
@@ -821,6 +851,7 @@ void hostapd_cleanup_cs_params(struct hostapd_data *hapd);
void hostapd_periodic_iface(struct hostapd_iface *iface);
int hostapd_owe_trans_get_info(struct hostapd_data *hapd);
void hostapd_ocv_check_csa_sa_query(void *eloop_ctx, void *timeout_ctx);
+int hostapd_check_max_sta(struct hostapd_data *hapd);
void hostapd_switch_color(struct hostapd_data *hapd, u64 bitmap);
void hostapd_cleanup_cca_params(struct hostapd_data *hapd);
@@ -908,6 +939,16 @@ static inline bool hostapd_mld_is_first_bss(struct hostapd_data *hapd)
#endif /* CONFIG_IEEE80211BE */
+static inline bool ap_sta_is_mld(struct hostapd_data *hapd,
+ struct sta_info *sta)
+{
+#ifdef CONFIG_IEEE80211BE
+ return hapd->conf->mld_ap && sta && sta->mld_info.mld_sta;
+#else /* CONFIG_IEEE80211BE */
+ return false;
+#endif /* CONFIG_IEEE80211BE */
+}
+
u16 hostapd_get_punct_bitmap(struct hostapd_data *hapd);
#endif /* HOSTAPD_H */
diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
index 8aa0b3ab5..400c50988 100644
--- a/src/ap/hw_features.c
+++ b/src/ap/hw_features.c
@@ -553,7 +553,8 @@ static int ieee80211n_check_40mhz(struct hostapd_iface *iface)
int ret;
/* Check that HT40 is used and PRI / SEC switch is allowed */
- if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch)
+ if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch ||
+ iface->conf->noscan)
return 0;
hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index d8d82d737..39b1bb4c7 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -59,6 +59,9 @@
#include "nan_usd_ap.h"
#include "pasn/pasn_common.h"
+#ifdef CONFIG_APUP
+# include "apup.h"
+#endif // def CONFIG_APUP
#ifdef CONFIG_FILS
static struct wpabuf *
@@ -2876,7 +2879,7 @@ static void handle_auth(struct hostapd_data *hapd,
u16 auth_alg, auth_transaction, status_code;
u16 resp = WLAN_STATUS_SUCCESS;
struct sta_info *sta = NULL;
- int res, reply_res;
+ int res, reply_res, ubus_resp;
u16 fc;
const u8 *challenge = NULL;
u8 resp_ies[2 + WLAN_AUTH_CHALLENGE_LEN];
@@ -2887,6 +2890,11 @@ static void handle_auth(struct hostapd_data *hapd,
#ifdef CONFIG_IEEE80211BE
bool mld_sta = false;
#endif /* CONFIG_IEEE80211BE */
+ struct hostapd_ubus_request req = {
+ .type = HOSTAPD_UBUS_AUTH_REQ,
+ .mgmt_frame = mgmt,
+ .ssi_signal = rssi,
+ };
if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.auth)) {
wpa_printf(MSG_INFO, "handle_auth - too short payload (len=%lu)",
@@ -3083,6 +3091,13 @@ static void handle_auth(struct hostapd_data *hapd,
resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
goto fail;
}
+ ubus_resp = hostapd_ubus_handle_event(hapd, &req);
+ if (ubus_resp) {
+ wpa_printf(MSG_DEBUG, "Station " MACSTR " rejected by ubus handler.\n",
+ MAC2STR(mgmt->sa));
+ resp = ubus_resp > 0 ? (u16) ubus_resp : WLAN_STATUS_UNSPECIFIED_FAILURE;
+ goto fail;
+ }
if (res == HOSTAPD_ACL_PENDING)
return;
@@ -3555,8 +3570,8 @@ static u16 check_multi_ap(struct hostapd_data *hapd, struct sta_info *sta,
}
-static u16 copy_supp_rates(struct hostapd_data *hapd, struct sta_info *sta,
- struct ieee802_11_elems *elems)
+u16 hostapd_copy_supp_rates(struct hostapd_data *hapd, struct sta_info *sta,
+ const struct ieee802_11_elems *elems)
{
/* Supported rates not used in IEEE 802.11ad/DMG */
if (hapd->iface->current_mode &&
@@ -3943,7 +3958,7 @@ static int __check_assoc_ies(struct hostapd_data *hapd, struct sta_info *sta,
elems->ext_capab_len);
if (resp != WLAN_STATUS_SUCCESS)
return resp;
- resp = copy_supp_rates(hapd, sta, elems);
+ resp = hostapd_copy_supp_rates(hapd, sta, elems);
if (resp != WLAN_STATUS_SUCCESS)
return resp;
@@ -4763,6 +4778,13 @@ static int add_associated_sta(struct hostapd_data *hapd,
* drivers to accept the STA parameter configuration. Since this is
* after a new FT-over-DS exchange, a new TK has been derived, so key
* reinstallation is not a concern for this case.
+ *
+ * If the STA was associated and authorized earlier, but came for a new
+ * connection (!added_unassoc + !reassoc), remove the existing STA entry
+ * so that it can be re-added. This case is rarely seen when the AP could
+ * not receive the deauth/disassoc frame from the STA. And the STA comes
+ * back with new connection within a short period or before the inactive
+ * STA entry is removed from the list.
*/
wpa_printf(MSG_DEBUG, "Add associated STA " MACSTR
" (added_unassoc=%d auth_alg=%u ft_over_ds=%u reassoc=%d authorized=%d ft_tk=%d fils_tk=%d)",
@@ -4776,7 +4798,8 @@ static int add_associated_sta(struct hostapd_data *hapd,
(!(sta->flags & WLAN_STA_AUTHORIZED) ||
(reassoc && sta->ft_over_ds && sta->auth_alg == WLAN_AUTH_FT) ||
(!wpa_auth_sta_ft_tk_already_set(sta->wpa_sm) &&
- !wpa_auth_sta_fils_tk_already_set(sta->wpa_sm)))) {
+ !wpa_auth_sta_fils_tk_already_set(sta->wpa_sm)) ||
+ (!reassoc && (sta->flags & WLAN_STA_AUTHORIZED)))) {
hostapd_drv_sta_remove(hapd, sta->addr);
wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED);
set = 0;
@@ -5337,7 +5360,7 @@ static void handle_assoc(struct hostapd_data *hapd,
int resp = WLAN_STATUS_SUCCESS;
u16 reply_res = WLAN_STATUS_UNSPECIFIED_FAILURE;
const u8 *pos;
- int left, i;
+ int left, i, ubus_resp;
struct sta_info *sta;
u8 *tmp = NULL;
#ifdef CONFIG_FILS
@@ -5579,6 +5602,11 @@ static void handle_assoc(struct hostapd_data *hapd,
left = res;
}
#endif /* CONFIG_FILS */
+ struct hostapd_ubus_request req = {
+ .type = HOSTAPD_UBUS_ASSOC_REQ,
+ .mgmt_frame = mgmt,
+ .ssi_signal = rssi,
+ };
/* followed by SSID and Supported rates; and HT capabilities if 802.11n
* is used */
@@ -5681,6 +5709,13 @@ static void handle_assoc(struct hostapd_data *hapd,
if (set_beacon)
ieee802_11_update_beacons(hapd->iface);
+ ubus_resp = hostapd_ubus_handle_event(hapd, &req);
+ if (ubus_resp) {
+ wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
+ MAC2STR(mgmt->sa));
+ resp = ubus_resp > 0 ? (u16) ubus_resp : WLAN_STATUS_UNSPECIFIED_FAILURE;
+ goto fail;
+ }
fail:
/*
@@ -5910,6 +5945,7 @@ static void handle_disassoc(struct hostapd_data *hapd,
(unsigned long) len);
return;
}
+ hostapd_ubus_notify(hapd, "disassoc", mgmt->sa);
sta = ap_get_sta(hapd, mgmt->sa);
if (!sta) {
@@ -5941,6 +5977,8 @@ static void handle_deauth(struct hostapd_data *hapd,
/* Clear the PTKSA cache entries for PASN */
ptksa_cache_flush(hapd->ptksa, mgmt->sa, WPA_CIPHER_NONE);
+ hostapd_ubus_notify(hapd, "deauth", mgmt->sa);
+
sta = ap_get_sta(hapd, mgmt->sa);
if (!sta) {
wpa_msg(hapd->msg_ctx, MSG_DEBUG, "Station " MACSTR
@@ -5974,6 +6012,11 @@ static void handle_beacon(struct hostapd_data *hapd,
0);
ap_list_process_beacon(hapd->iface, mgmt, &elems, fi);
+
+#ifdef CONFIG_APUP
+ if (hapd->conf->apup)
+ apup_process_beacon(hapd, mgmt, len, &elems);
+#endif // def CONFIG_APUP
}
diff --git a/src/ap/ieee802_11.h b/src/ap/ieee802_11.h
index dd4995f3f..0e13d2940 100644
--- a/src/ap/ieee802_11.h
+++ b/src/ap/ieee802_11.h
@@ -108,6 +108,8 @@ int hostapd_process_ml_assoc_req_addr(struct hostapd_data *hapd,
const u8 *basic_mle, size_t basic_mle_len,
u8 *mld_addr);
int hostapd_get_aid(struct hostapd_data *hapd, struct sta_info *sta);
+u16 hostapd_copy_supp_rates(struct hostapd_data *hapd, struct sta_info *sta,
+ const struct ieee802_11_elems *elems);
u16 copy_sta_ht_capab(struct hostapd_data *hapd, struct sta_info *sta,
const u8 *ht_capab);
u16 copy_sta_vendor_vht(struct hostapd_data *hapd, struct sta_info *sta,
diff --git a/src/ap/ieee802_11_ht.c b/src/ap/ieee802_11_ht.c
index f90f1254e..7f0a00f95 100644
--- a/src/ap/ieee802_11_ht.c
+++ b/src/ap/ieee802_11_ht.c
@@ -82,7 +82,9 @@ u8 * hostapd_eid_ht_capabilities(struct hostapd_data *hapd, u8 *eid)
u8 * hostapd_eid_ht_operation(struct hostapd_data *hapd, u8 *eid)
{
struct ieee80211_ht_operation *oper;
+ le32 vht_capabilities_info;
u8 *pos = eid;
+ u8 chwidth;
if (!hapd->iconf->ieee80211n || hapd->conf->disable_11n ||
is_6ghz_op_class(hapd->iconf->op_class))
@@ -103,6 +105,13 @@ u8 * hostapd_eid_ht_operation(struct hostapd_data *hapd, u8 *eid)
oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW |
HT_INFO_HT_PARAM_STA_CHNL_WIDTH;
+ vht_capabilities_info = host_to_le32(hapd->iface->current_mode->vht_capab);
+ chwidth = hostapd_get_oper_chwidth(hapd->iconf);
+ if (vht_capabilities_info & VHT_CAP_EXTENDED_NSS_BW_SUPPORT
+ && ((chwidth == CHANWIDTH_160MHZ) || (chwidth == CHANWIDTH_80P80MHZ))) {
+ oper->operation_mode = host_to_le16(hapd->iconf->vht_oper_centr_freq_seg0_idx << 5);
+ }
+
pos += sizeof(*oper);
return pos;
@@ -230,6 +239,9 @@ void hostapd_2040_coex_action(struct hostapd_data *hapd,
return;
}
+ if (iface->conf->noscan || iface->conf->no_ht_coex)
+ return;
+
if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) {
wpa_printf(MSG_DEBUG,
"Ignore too short 20/40 BSS Coexistence Management frame");
@@ -390,6 +402,9 @@ void ht40_intolerant_add(struct hostapd_iface *iface, struct sta_info *sta)
if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
return;
+ if (iface->conf->noscan || iface->conf->no_ht_coex)
+ return;
+
wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR
" in Association Request", MAC2STR(sta->addr));
diff --git a/src/ap/ieee802_11_vht.c b/src/ap/ieee802_11_vht.c
index 4dc325ce8..68880ab64 100644
--- a/src/ap/ieee802_11_vht.c
+++ b/src/ap/ieee802_11_vht.c
@@ -26,6 +26,7 @@ u8 * hostapd_eid_vht_capabilities(struct hostapd_data *hapd, u8 *eid, u32 nsts)
struct ieee80211_vht_capabilities *cap;
struct hostapd_hw_modes *mode = hapd->iface->current_mode;
u8 *pos = eid;
+ u8 chwidth;
if (!mode || is_6ghz_op_class(hapd->iconf->op_class))
return eid;
@@ -63,6 +64,17 @@ u8 * hostapd_eid_vht_capabilities(struct hostapd_data *hapd, u8 *eid, u32 nsts)
host_to_le32(nsts << VHT_CAP_BEAMFORMEE_STS_OFFSET);
}
+ chwidth = hostapd_get_oper_chwidth(hapd->iconf);
+ if (((host_to_le32(mode->vht_capab)) & VHT_CAP_EXTENDED_NSS_BW_SUPPORT)
+ && ((chwidth == CHANWIDTH_160MHZ) || (chwidth == CHANWIDTH_80P80MHZ))) {
+ cap->vht_capabilities_info |= VHT_CAP_EXTENDED_NSS_BW_SUPPORT;
+ cap->vht_capabilities_info &= ~(host_to_le32(VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ));
+ cap->vht_capabilities_info &= ~(host_to_le32(VHT_CAP_SUPP_CHAN_WIDTH_160MHZ));
+ cap->vht_capabilities_info &= ~(host_to_le32(VHT_CAP_SUPP_CHAN_WIDTH_MASK));
+ } else {
+ cap->vht_capabilities_info &= ~VHT_CAP_EXTENDED_NSS_BW_SUPPORT_MASK;
+ }
+
/* Supported MCS set comes from hw */
os_memcpy(&cap->vht_supported_mcs_set, mode->vht_mcs_set, 8);
@@ -75,6 +87,7 @@ u8 * hostapd_eid_vht_capabilities(struct hostapd_data *hapd, u8 *eid, u32 nsts)
u8 * hostapd_eid_vht_operation(struct hostapd_data *hapd, u8 *eid)
{
struct ieee80211_vht_operation *oper;
+ le32 vht_capabilities_info;
u8 *pos = eid;
enum oper_chan_width oper_chwidth =
hostapd_get_oper_chwidth(hapd->iconf);
@@ -110,6 +123,7 @@ u8 * hostapd_eid_vht_operation(struct hostapd_data *hapd, u8 *eid)
oper->vht_op_info_chan_center_freq_seg1_idx = seg1;
oper->vht_op_info_chwidth = oper_chwidth;
+ vht_capabilities_info = host_to_le32(hapd->iface->current_mode->vht_capab);
if (oper_chwidth == CONF_OPER_CHWIDTH_160MHZ) {
/*
* Convert 160 MHz channel width to new style as interop
@@ -123,6 +137,9 @@ u8 * hostapd_eid_vht_operation(struct hostapd_data *hapd, u8 *eid)
oper->vht_op_info_chan_center_freq_seg0_idx -= 8;
else
oper->vht_op_info_chan_center_freq_seg0_idx += 8;
+
+ if (vht_capabilities_info & VHT_CAP_EXTENDED_NSS_BW_SUPPORT)
+ oper->vht_op_info_chan_center_freq_seg1_idx = 0;
} else if (oper_chwidth == CONF_OPER_CHWIDTH_80P80MHZ) {
/*
* Convert 80+80 MHz channel width to new style as interop
diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c
index f4103ac9a..7b5b45a2b 100644
--- a/src/ap/ieee802_1x.c
+++ b/src/ap/ieee802_1x.c
@@ -600,6 +600,10 @@ int add_common_radius_attr(struct hostapd_data *hapd,
struct hostapd_radius_attr *attr;
int len;
+ if (hapd->conf->dynamic_own_ip_addr)
+ radius_client_get_local_addr(hapd->radius,
+ &hapd->conf->own_ip_addr);
+
if (!hostapd_config_get_radius_attr(req_attr,
RADIUS_ATTR_NAS_IP_ADDRESS) &&
hapd->conf->own_ip_addr.af == AF_INET &&
@@ -2848,6 +2852,7 @@ static const char * bool_txt(bool val)
return val ? "TRUE" : "FALSE";
}
+#ifdef CONFIG_CTRL_IFACE_MIB
int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen)
{
@@ -3034,6 +3039,7 @@ int ieee802_1x_get_mib_sta(struct hostapd_data *hapd, struct sta_info *sta,
return len;
}
+#endif
#ifdef CONFIG_HS20
static void ieee802_1x_wnm_notif_send(void *eloop_ctx, void *timeout_ctx)
diff --git a/src/ap/rrm.c b/src/ap/rrm.c
index fbcddf3f9..b024499ac 100644
--- a/src/ap/rrm.c
+++ b/src/ap/rrm.c
@@ -89,6 +89,9 @@ static void hostapd_handle_beacon_report(struct hostapd_data *hapd,
return;
wpa_msg(hapd->msg_ctx, MSG_INFO, BEACON_RESP_RX MACSTR " %u %02x %s",
MAC2STR(addr), token, rep_mode, report);
+ if (len < sizeof(struct rrm_measurement_beacon_report))
+ return;
+ hostapd_ubus_notify_beacon_report(hapd, addr, token, rep_mode, (struct rrm_measurement_beacon_report*) pos, len);
}
@@ -269,6 +272,8 @@ static void hostapd_send_nei_report_resp(struct hostapd_data *hapd,
}
}
+ hapd->openwrt_stats.rrm.neighbor_report_tx++;
+
hostapd_drv_send_action(hapd, hapd->iface->freq, 0, addr,
wpabuf_head(buf), wpabuf_len(buf));
wpabuf_free(buf);
@@ -397,15 +402,20 @@ void hostapd_handle_radio_measurement(struct hostapd_data *hapd,
mgmt->u.action.u.rrm.action, MAC2STR(mgmt->sa));
switch (mgmt->u.action.u.rrm.action) {
+ case WLAN_RRM_LINK_MEASUREMENT_REPORT:
+ hostapd_ubus_handle_link_measurement(hapd, buf, len);
+ break;
case WLAN_RRM_RADIO_MEASUREMENT_REPORT:
hostapd_handle_radio_msmt_report(hapd, buf, len);
break;
case WLAN_RRM_NEIGHBOR_REPORT_REQUEST:
hostapd_handle_nei_report_req(hapd, buf, len);
break;
+ /*
case WLAN_RRM_LINK_MEASUREMENT_REPORT:
hostapd_handle_link_mesr_report(hapd, buf, len);
break;
+ */
default:
wpa_printf(MSG_DEBUG, "RRM action %u is not supported",
mgmt->u.action.u.rrm.action);
diff --git a/src/ap/sta_info.c b/src/ap/sta_info.c
index 13613dbab..51978f45f 100644
--- a/src/ap/sta_info.c
+++ b/src/ap/sta_info.c
@@ -542,6 +542,7 @@ void ap_handle_timer(void *eloop_ctx, void *timeout_ctx)
hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_INFO, "deauthenticated due to "
"local deauth request");
+ hostapd_ubus_notify(hapd, "local-deauth", sta->addr);
ap_free_sta(hapd, sta);
return;
}
@@ -699,6 +700,7 @@ skip_poll:
mlme_deauthenticate_indication(
hapd, sta,
WLAN_REASON_PREV_AUTH_NOT_VALID);
+ hostapd_ubus_notify(hapd, "inactive-deauth", sta->addr);
ap_free_sta(hapd, sta);
break;
}
@@ -1485,9 +1487,6 @@ bool ap_sta_set_authorized_flag(struct hostapd_data *hapd, struct sta_info *sta,
mld_assoc_link_id = -2;
}
#endif /* CONFIG_IEEE80211BE */
- if (mld_assoc_link_id != -2)
- hostapd_prune_associations(hapd, sta->addr,
- mld_assoc_link_id);
sta->flags |= WLAN_STA_AUTHORIZED;
} else {
sta->flags &= ~WLAN_STA_AUTHORIZED;
@@ -1524,15 +1523,28 @@ void ap_sta_set_authorized_event(struct hostapd_data *hapd,
os_snprintf(buf, sizeof(buf), MACSTR, MAC2STR(sta->addr));
if (authorized) {
+ static const char * const auth_algs[] = {
+ [WLAN_AUTH_OPEN] = "open",
+ [WLAN_AUTH_SHARED_KEY] = "shared",
+ [WLAN_AUTH_FT] = "ft",
+ [WLAN_AUTH_SAE] = "sae",
+ [WLAN_AUTH_FILS_SK] = "fils-sk",
+ [WLAN_AUTH_FILS_SK_PFS] = "fils-sk-pfs",
+ [WLAN_AUTH_FILS_PK] = "fils-pk",
+ [WLAN_AUTH_PASN] = "pasn",
+ };
+ const char *auth_alg = NULL;
const u8 *dpp_pkhash;
const char *keyid;
char dpp_pkhash_buf[100];
char keyid_buf[100];
char ip_addr[100];
+ char alg_buf[100];
dpp_pkhash_buf[0] = '\0';
keyid_buf[0] = '\0';
ip_addr[0] = '\0';
+ alg_buf[0] = '\0';
#ifdef CONFIG_P2P
if (wpa_auth_get_ip_addr(sta->wpa_sm, ip_addr_buf) == 0) {
os_snprintf(ip_addr, sizeof(ip_addr),
@@ -1543,6 +1555,13 @@ void ap_sta_set_authorized_event(struct hostapd_data *hapd,
}
#endif /* CONFIG_P2P */
+ if (sta->auth_alg < ARRAY_SIZE(auth_algs))
+ auth_alg = auth_algs[sta->auth_alg];
+
+ if (auth_alg)
+ os_snprintf(alg_buf, sizeof(alg_buf),
+ " auth_alg=%s", auth_alg);
+
keyid = ap_sta_wpa_get_keyid(hapd, sta);
if (keyid) {
os_snprintf(keyid_buf, sizeof(keyid_buf),
@@ -1561,17 +1580,19 @@ void ap_sta_set_authorized_event(struct hostapd_data *hapd,
dpp_pkhash, SHA256_MAC_LEN);
}
- wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_CONNECTED "%s%s%s%s",
- buf, ip_addr, keyid_buf, dpp_pkhash_buf);
+ hostapd_ubus_notify_authorized(hapd, sta, auth_alg);
+ wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_CONNECTED "%s%s%s%s%s",
+ buf, ip_addr, keyid_buf, dpp_pkhash_buf, alg_buf);
if (hapd->msg_ctx_parent &&
hapd->msg_ctx_parent != hapd->msg_ctx)
wpa_msg_no_global(hapd->msg_ctx_parent, MSG_INFO,
- AP_STA_CONNECTED "%s%s%s%s",
+ AP_STA_CONNECTED "%s%s%s%s%s",
buf, ip_addr, keyid_buf,
- dpp_pkhash_buf);
+ dpp_pkhash_buf, alg_buf);
} else {
wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_DISCONNECTED "%s", buf);
+ hostapd_ubus_notify(hapd, "disassoc", sta->addr);
if (hapd->msg_ctx_parent &&
hapd->msg_ctx_parent != hapd->msg_ctx)
diff --git a/src/ap/sta_info.h b/src/ap/sta_info.h
index 84629358c..d03d18b48 100644
--- a/src/ap/sta_info.h
+++ b/src/ap/sta_info.h
@@ -17,7 +17,6 @@
#include "common/sae.h"
#include "crypto/sha384.h"
#include "pasn/pasn_common.h"
-#include "hostapd.h"
/* STA flags */
#define WLAN_STA_AUTH BIT(0)
@@ -49,10 +48,6 @@
#define WLAN_STA_PENDING_DEAUTH_CB BIT(30)
#define WLAN_STA_NONERP BIT(31)
-/* Maximum number of supported rates (from both Supported Rates and Extended
- * Supported Rates IEs). */
-#define WLAN_SUPP_RATES_MAX 32
-
struct hostapd_data;
struct mbo_non_pref_chan_info {
@@ -321,6 +316,7 @@ struct sta_info {
#endif /* CONFIG_TESTING_OPTIONS */
#ifdef CONFIG_AIRTIME_POLICY
unsigned int airtime_weight;
+ unsigned int dyn_airtime_weight;
struct os_reltime backlogged_until;
#endif /* CONFIG_AIRTIME_POLICY */
@@ -421,16 +417,6 @@ int ap_sta_re_add(struct hostapd_data *hapd, struct sta_info *sta);
void ap_free_sta_pasn(struct hostapd_data *hapd, struct sta_info *sta);
-static inline bool ap_sta_is_mld(struct hostapd_data *hapd,
- struct sta_info *sta)
-{
-#ifdef CONFIG_IEEE80211BE
- return hapd->conf->mld_ap && sta && sta->mld_info.mld_sta;
-#else /* CONFIG_IEEE80211BE */
- return false;
-#endif /* CONFIG_IEEE80211BE */
-}
-
static inline void ap_sta_set_mld(struct sta_info *sta, bool mld)
{
#ifdef CONFIG_IEEE80211BE
diff --git a/src/ap/ubus.c b/src/ap/ubus.c
index 8689494bc..f21516fc3 100644
--- a/src/ap/ubus.c
+++ b/src/ap/ubus.c
@@ -2004,3 +2004,18 @@ int hostapd_ubus_notify_bss_transition_query(
return ureq.resp;
#endif
}
+
+#ifdef CONFIG_APUP
+void hostapd_ubus_notify_apup_newpeer(
+ struct hostapd_data *hapd, const u8 *addr, const char *ifname)
+{
+ if (!hapd->ubus.obj.has_subscribers)
+ return;
+
+ blob_buf_init(&b, 0);
+ blobmsg_add_macaddr(&b, "address", addr);
+ blobmsg_add_string(&b, "ifname", ifname);
+
+ ubus_notify(ctx, &hapd->ubus.obj, "apup-newpeer", b.head, -1);
+}
+#endif // def CONFIG_APUP
diff --git a/src/ap/ubus.h b/src/ap/ubus.h
index 22767d67e..1c65e4dcb 100644
--- a/src/ap/ubus.h
+++ b/src/ap/ubus.h
@@ -71,6 +71,11 @@ int hostapd_ubus_notify_bss_transition_query(
void hostapd_ubus_notify_authorized(struct hostapd_data *hapd, struct sta_info *sta,
const char *auth_alg);
+#ifdef CONFIG_APUP
+void hostapd_ubus_notify_apup_newpeer(
+ struct hostapd_data *hapd, const u8 *addr, const char *ifname);
+#endif // def CONFIG_APUP
+
#else
struct hostapd_ubus_bss {};
diff --git a/src/ap/ucode.c b/src/ap/ucode.c
index 68fb45088..3468615fd 100644
--- a/src/ap/ucode.c
+++ b/src/ap/ucode.c
@@ -815,3 +815,20 @@ void hostapd_ucode_free_bss(struct hostapd_data *hapd)
ucv_put(wpa_ucode_call(2));
ucv_gc(vm);
}
+
+#ifdef CONFIG_APUP
+void hostapd_ucode_apup_newpeer(struct hostapd_data *hapd, const char *ifname)
+{
+ uc_value_t *val;
+
+ if (wpa_ucode_call_prepare("apup_newpeer"))
+ return;
+
+ val = hostapd_ucode_bss_get_uval(hapd);
+ uc_value_push(ucv_get(ucv_string_new(hapd->conf->iface))); // BSS ifname
+ uc_value_push(ucv_get(val));
+ uc_value_push(ucv_get(ucv_string_new(ifname))); // APuP peer ifname
+ ucv_put(wpa_ucode_call(2));
+ ucv_gc(vm);
+}
+#endif // def CONFIG_APUP
diff --git a/src/ap/ucode.h b/src/ap/ucode.h
index d00b78716..c9bdde651 100644
--- a/src/ap/ucode.h
+++ b/src/ap/ucode.h
@@ -27,6 +27,10 @@ void hostapd_ucode_add_bss(struct hostapd_data *hapd);
void hostapd_ucode_free_bss(struct hostapd_data *hapd);
void hostapd_ucode_reload_bss(struct hostapd_data *hapd);
+#ifdef CONFIG_APUP
+void hostapd_ucode_apup_newpeer(struct hostapd_data *hapd, const char *ifname);
+#endif // def CONFIG_APUP
+
#else
static inline int hostapd_ucode_init(struct hapd_interfaces *ifaces)
diff --git a/src/ap/vlan_full.c b/src/ap/vlan_full.c
index 19aa3c649..053d6338e 100644
--- a/src/ap/vlan_full.c
+++ b/src/ap/vlan_full.c
@@ -475,6 +475,9 @@ void vlan_newlink(const char *ifname, struct hostapd_data *hapd)
if (!vlan)
return;
+ if (hapd->conf->ssid.vlan_no_bridge)
+ goto out;
+
vlan->configured = 1;
notempty = vlan->vlan_desc.notempty;
@@ -506,6 +509,7 @@ void vlan_newlink(const char *ifname, struct hostapd_data *hapd)
ifname, br_name, tagged[i], hapd);
}
+out:
ifconfig_up(ifname);
}
diff --git a/src/ap/vlan_init.c b/src/ap/vlan_init.c
index 53eacfb45..b69f3de41 100644
--- a/src/ap/vlan_init.c
+++ b/src/ap/vlan_init.c
@@ -22,6 +22,7 @@
static int vlan_if_add(struct hostapd_data *hapd, struct hostapd_vlan *vlan,
int existsok)
{
+ bool vlan_exists = iface_exists(vlan->ifname);
int ret;
#ifdef CONFIG_WEP
int i;
@@ -36,7 +37,7 @@ static int vlan_if_add(struct hostapd_data *hapd, struct hostapd_vlan *vlan,
}
#endif /* CONFIG_WEP */
- if (!iface_exists(vlan->ifname))
+ if (!vlan_exists)
ret = hostapd_vlan_if_add(hapd, vlan->ifname);
else if (!existsok)
return -1;
@@ -51,6 +52,9 @@ static int vlan_if_add(struct hostapd_data *hapd, struct hostapd_vlan *vlan,
if (hapd->wpa_auth)
ret = wpa_auth_ensure_group(hapd->wpa_auth, vlan->vlan_id);
+ if (!ret && !vlan_exists)
+ hostapd_ubus_add_vlan(hapd, vlan);
+
if (ret == 0)
return ret;
@@ -77,6 +81,8 @@ int vlan_if_remove(struct hostapd_data *hapd, struct hostapd_vlan *vlan)
"WPA deinitialization for VLAN %d failed (%d)",
vlan->vlan_id, ret);
+ hostapd_ubus_remove_vlan(hapd, vlan);
+
return hostapd_vlan_if_remove(hapd, vlan->ifname);
}
diff --git a/src/ap/wnm_ap.c b/src/ap/wnm_ap.c
index af8cccaef..d259200c9 100644
--- a/src/ap/wnm_ap.c
+++ b/src/ap/wnm_ap.c
@@ -410,6 +410,7 @@ static int ieee802_11_send_bss_trans_mgmt_request(struct hostapd_data *hapd,
mgmt->u.action.u.bss_tm_req.validity_interval = 1;
pos = mgmt->u.action.u.bss_tm_req.variable;
+ hapd->openwrt_stats.wnm.bss_transition_request_tx++;
wpa_printf(MSG_DEBUG, "WNM: Send BSS Transition Management Request to "
MACSTR " dialog_token=%u req_mode=0x%x disassoc_timer=%u "
"validity_interval=%u",
@@ -478,7 +479,8 @@ static void ieee802_11_rx_bss_trans_mgmt_query(struct hostapd_data *hapd,
MAC2STR(addr), reason, hex ? " neighbor=" : "", hex);
os_free(hex);
- ieee802_11_send_bss_trans_mgmt_request(hapd, addr, dialog_token);
+ if (!hostapd_ubus_notify_bss_transition_query(hapd, addr, dialog_token, reason, pos, end - pos))
+ ieee802_11_send_bss_trans_mgmt_request(hapd, addr, dialog_token);
}
@@ -500,7 +502,7 @@ static void ieee802_11_rx_bss_trans_mgmt_resp(struct hostapd_data *hapd,
size_t len)
{
u8 dialog_token, status_code, bss_termination_delay;
- const u8 *pos, *end;
+ const u8 *pos, *end, *target_bssid = NULL;
int enabled = hapd->conf->bss_transition;
struct sta_info *sta;
@@ -547,6 +549,7 @@ static void ieee802_11_rx_bss_trans_mgmt_resp(struct hostapd_data *hapd,
wpa_printf(MSG_DEBUG, "WNM: not enough room for Target BSSID field");
return;
}
+ target_bssid = pos;
sta->agreed_to_steer = 1;
eloop_cancel_timeout(ap_sta_reset_steer_flag_timer, hapd, sta);
eloop_register_timeout(2, 0, ap_sta_reset_steer_flag_timer,
@@ -566,6 +569,10 @@ static void ieee802_11_rx_bss_trans_mgmt_resp(struct hostapd_data *hapd,
MAC2STR(addr), status_code, bss_termination_delay);
}
+ hostapd_ubus_notify_bss_transition_response(hapd, sta->addr, dialog_token,
+ status_code, bss_termination_delay,
+ target_bssid, pos, end - pos);
+
wpa_hexdump(MSG_DEBUG, "WNM: BSS Transition Candidate List Entries",
pos, end - pos);
}
@@ -814,10 +821,12 @@ int ieee802_11_rx_wnm_action_ap(struct hostapd_data *hapd,
plen);
return 0;
case WNM_BSS_TRANS_MGMT_QUERY:
+ hapd->openwrt_stats.wnm.bss_transition_query_rx++;
ieee802_11_rx_bss_trans_mgmt_query(hapd, mgmt->sa, payload,
plen);
return 0;
case WNM_BSS_TRANS_MGMT_RESP:
+ hapd->openwrt_stats.wnm.bss_transition_response_rx++;
ieee802_11_rx_bss_trans_mgmt_resp(hapd, mgmt->sa, payload,
plen);
return 0;
@@ -865,6 +874,7 @@ int wnm_send_disassoc_imminent(struct hostapd_data *hapd,
pos = mgmt->u.action.u.bss_tm_req.variable;
+ hapd->openwrt_stats.wnm.bss_transition_request_tx++;
wpa_printf(MSG_DEBUG, "WNM: Send BSS Transition Management Request frame to indicate imminent disassociation (disassoc_timer=%d) to "
MACSTR, disassoc_timer, MAC2STR(sta->addr));
if (hostapd_drv_send_mlme(hapd, buf, pos - buf, 0, NULL, 0, 0) < 0) {
@@ -947,6 +957,7 @@ int wnm_send_ess_disassoc_imminent(struct hostapd_data *hapd,
return -1;
}
+ hapd->openwrt_stats.wnm.bss_transition_request_tx++;
if (disassoc_timer) {
/* send disassociation frame after time-out */
set_disassoc_timer(hapd, sta, disassoc_timer);
@@ -1028,6 +1039,7 @@ int wnm_send_bss_tm_req(struct hostapd_data *hapd, struct sta_info *sta,
}
os_free(buf);
+ hapd->openwrt_stats.wnm.bss_transition_request_tx++;
if (disassoc_timer) {
#ifdef CONFIG_IEEE80211BE
if (ap_sta_is_mld(hapd, sta)) {
diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
index 93f157d62..3a1d288dd 100644
--- a/src/ap/wpa_auth.c
+++ b/src/ap/wpa_auth.c
@@ -6095,6 +6095,7 @@ static const char * wpa_bool_txt(int val)
return val ? "TRUE" : "FALSE";
}
+#ifdef CONFIG_CTRL_IFACE_MIB
#define RSN_SUITE "%02x-%02x-%02x-%d"
#define RSN_SUITE_ARG(s) \
@@ -6247,7 +6248,7 @@ int wpa_get_mib_sta(struct wpa_state_machine *sm, char *buf, size_t buflen)
return len;
}
-
+#endif
void wpa_auth_countermeasures_start(struct wpa_authenticator *wpa_auth)
{
diff --git a/src/ap/wpa_auth_glue.c b/src/ap/wpa_auth_glue.c
index 13685b7c2..eaded9434 100644
--- a/src/ap/wpa_auth_glue.c
+++ b/src/ap/wpa_auth_glue.c
@@ -328,6 +328,7 @@ static void hostapd_wpa_auth_psk_failure_report(void *ctx, const u8 *addr)
struct hostapd_data *hapd = ctx;
wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_POSSIBLE_PSK_MISMATCH MACSTR,
MAC2STR(addr));
+ hostapd_ubus_notify(hapd, "key-mismatch", addr);
}
@@ -1811,8 +1812,12 @@ int hostapd_setup_wpa(struct hostapd_data *hapd)
wpa_key_mgmt_ft(hapd->conf->wpa_key_mgmt)) {
const char *ft_iface;
- ft_iface = hapd->conf->bridge[0] ? hapd->conf->bridge :
- hapd->conf->iface;
+ if (hapd->conf->ft_iface[0])
+ ft_iface = hapd->conf->ft_iface;
+ else if (hapd->conf->bridge[0])
+ ft_iface = hapd->conf->bridge;
+ else
+ ft_iface = hapd->conf->iface;
hapd->l2 = l2_packet_init(ft_iface, NULL, ETH_P_RRB,
hostapd_rrb_receive, hapd, 1);
if (!hapd->l2) {
diff --git a/src/ap/wps_hostapd.c b/src/ap/wps_hostapd.c
index 82d4d5fdd..dfc5c3ecb 100644
--- a/src/ap/wps_hostapd.c
+++ b/src/ap/wps_hostapd.c
@@ -394,9 +394,8 @@ static int hapd_wps_reconfig_in_memory(struct hostapd_data *hapd,
bss->wpa_pairwise |= WPA_CIPHER_GCMP;
else
bss->wpa_pairwise |= WPA_CIPHER_CCMP;
- }
#ifndef CONFIG_NO_TKIP
- if (cred->encr_type & WPS_ENCR_TKIP)
+ } else if (cred->encr_type & WPS_ENCR_TKIP)
bss->wpa_pairwise |= WPA_CIPHER_TKIP;
#endif /* CONFIG_NO_TKIP */
bss->rsn_pairwise = bss->wpa_pairwise;
@@ -1181,8 +1180,7 @@ int hostapd_init_wps(struct hostapd_data *hapd,
WPA_CIPHER_GCMP_256)) {
wps->encr_types |= WPS_ENCR_AES;
wps->encr_types_rsn |= WPS_ENCR_AES;
- }
- if (conf->rsn_pairwise & WPA_CIPHER_TKIP) {
+ } else if (conf->rsn_pairwise & WPA_CIPHER_TKIP) {
#ifdef CONFIG_NO_TKIP
wpa_printf(MSG_INFO, "WPS: TKIP not supported");
goto fail;
diff --git a/src/ap/x_snoop.c b/src/ap/x_snoop.c
index 029f4de23..4c20f137f 100644
--- a/src/ap/x_snoop.c
+++ b/src/ap/x_snoop.c
@@ -33,28 +33,31 @@ int x_snoop_init(struct hostapd_data *hapd)
hapd->x_snoop_initialized = true;
- if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE,
+ if (!conf->snoop_iface[0] &&
+ hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE,
1)) {
wpa_printf(MSG_DEBUG,
"x_snoop: Failed to enable hairpin_mode on the bridge port");
return -1;
}
- if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) {
+ if (!conf->snoop_iface[0] &&
+ hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) {
wpa_printf(MSG_DEBUG,
"x_snoop: Failed to enable proxyarp on the bridge port");
return -1;
}
if (hostapd_drv_br_set_net_param(hapd, DRV_BR_NET_PARAM_GARP_ACCEPT,
- 1)) {
+ conf->snoop_iface[0] ? conf->snoop_iface : NULL, 1)) {
wpa_printf(MSG_DEBUG,
"x_snoop: Failed to enable accepting gratuitous ARP on the bridge");
return -1;
}
#ifdef CONFIG_IPV6
- if (hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) {
+ if (!conf->snoop_iface[0] &&
+ hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, NULL, 1)) {
wpa_printf(MSG_DEBUG,
"x_snoop: Failed to enable multicast snooping on the bridge");
return -1;
@@ -73,8 +76,12 @@ x_snoop_get_l2_packet(struct hostapd_data *hapd,
{
struct hostapd_bss_config *conf = hapd->conf;
struct l2_packet_data *l2;
+ const char *ifname = conf->bridge;
+
+ if (conf->snoop_iface[0])
+ ifname = conf->snoop_iface;
- l2 = l2_packet_init(conf->bridge, NULL, ETH_P_ALL, handler, hapd, 1);
+ l2 = l2_packet_init(ifname, NULL, ETH_P_ALL, handler, hapd, 1);
if (l2 == NULL) {
wpa_printf(MSG_DEBUG,
"x_snoop: Failed to initialize L2 packet processing %s",
@@ -127,9 +134,12 @@ void x_snoop_mcast_to_ucast_convert_send(struct hostapd_data *hapd,
void x_snoop_deinit(struct hostapd_data *hapd)
{
+ struct hostapd_bss_config *conf = hapd->conf;
+
if (!hapd->x_snoop_initialized)
return;
- hostapd_drv_br_set_net_param(hapd, DRV_BR_NET_PARAM_GARP_ACCEPT, 0);
+ hostapd_drv_br_set_net_param(hapd, DRV_BR_NET_PARAM_GARP_ACCEPT,
+ conf->snoop_iface[0] ? conf->snoop_iface : NULL, 0);
hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 0);
hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE, 0);
hapd->x_snoop_initialized = false;
diff --git a/src/common/defs.h b/src/common/defs.h
index 8cca094e8..151b69170 100644
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -63,6 +63,10 @@
WPA_KEY_MGMT_FT_FILS_SHA256 | \
WPA_KEY_MGMT_FT_FILS_SHA384)
+/* Maximum number of supported rates (from both Supported Rates and Extended
+ * Supported Rates IEs). */
+#define WLAN_SUPP_RATES_MAX 32
+
static inline int wpa_key_mgmt_wpa_ieee8021x(int akm)
{
return !!(akm & (WPA_KEY_MGMT_IEEE8021X |
diff --git a/src/common/dpp_crypto.c b/src/common/dpp_crypto.c
index f17f95a2c..39d39f429 100644
--- a/src/common/dpp_crypto.c
+++ b/src/common/dpp_crypto.c
@@ -269,6 +269,12 @@ int dpp_get_pubkey_hash(struct crypto_ec_key *key, u8 *hash)
struct crypto_ec_key * dpp_gen_keypair(const struct dpp_curve_params *curve)
{
+ if (curve == NULL) {
+ wpa_printf(MSG_DEBUG,
+ "DPP: %s curve must be initialized", __func__);
+ return NULL;
+ }
+
struct crypto_ec_key *key;
wpa_printf(MSG_DEBUG, "DPP: Generating a keypair");
@@ -1582,7 +1588,9 @@ dpp_pkex_derive_Qr(const struct dpp_curve_params *curve, const u8 *mac_resp,
Pr = crypto_ec_key_get_public_key(Pr_key);
Qr = crypto_ec_point_init(ec);
hash_bn = crypto_bignum_init_set(hash, curve->hash_len);
- if (!Pr || !Qr || !hash_bn || crypto_ec_point_mul(ec, Pr, hash_bn, Qr))
+ if (!Pr || !Qr || !hash_bn ||
+ crypto_bignum_mod(hash_bn, crypto_ec_get_prime(ec), hash_bn) ||
+ crypto_ec_point_mul(ec, Pr, hash_bn, Qr))
goto fail;
if (crypto_ec_point_is_at_infinity(ec, Qr)) {
diff --git a/src/common/hw_features_common.c b/src/common/hw_features_common.c
index 2c47bf812..8bd6e994d 100644
--- a/src/common/hw_features_common.c
+++ b/src/common/hw_features_common.c
@@ -898,6 +898,7 @@ int ieee80211ac_cap_check(u32 hw, u32 conf)
VHT_CAP_CHECK(VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB);
VHT_CAP_CHECK(VHT_CAP_RX_ANTENNA_PATTERN);
VHT_CAP_CHECK(VHT_CAP_TX_ANTENNA_PATTERN);
+ VHT_CAP_CHECK(VHT_CAP_EXTENDED_NSS_BW_SUPPORT);
#undef VHT_CAP_CHECK
#undef VHT_CAP_CHECK_MAX
diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
index db9e90355..269b1cf97 100644
--- a/src/common/ieee802_11_defs.h
+++ b/src/common/ieee802_11_defs.h
@@ -1398,6 +1398,8 @@ struct ieee80211_ampe_ie {
#define VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB ((u32) BIT(26) | BIT(27))
#define VHT_CAP_RX_ANTENNA_PATTERN ((u32) BIT(28))
#define VHT_CAP_TX_ANTENNA_PATTERN ((u32) BIT(29))
+#define VHT_CAP_EXTENDED_NSS_BW_SUPPORT ((u32) BIT(30))
+#define VHT_CAP_EXTENDED_NSS_BW_SUPPORT_MASK ((u32) BIT(30) | BIT(31))
#define VHT_OPMODE_CHANNEL_WIDTH_MASK ((u8) BIT(0) | BIT(1))
#define VHT_OPMODE_CHANNEL_RxNSS_MASK ((u8) BIT(4) | BIT(5) | \
diff --git a/src/common/sae.c b/src/common/sae.c
index a65da6134..36f09e31b 100644
--- a/src/common/sae.c
+++ b/src/common/sae.c
@@ -1278,6 +1278,13 @@ void sae_deinit_pt(struct sae_pt *pt)
static int sae_derive_commit_element_ecc(struct sae_data *sae,
struct crypto_bignum *mask)
{
+ if (sae->tmp->pwe_ecc == NULL) {
+ wpa_printf(MSG_DEBUG,
+ "SAE: %s sae->tmp->pwe_ecc must be initialized",
+ __func__);
+ return -1;
+ }
+
/* COMMIT-ELEMENT = inverse(scalar-op(mask, PWE)) */
if (!sae->tmp->own_commit_element_ecc) {
sae->tmp->own_commit_element_ecc =
diff --git a/src/common/wpa_ctrl.c b/src/common/wpa_ctrl.c
index d0c174c05..ba659fe0f 100644
--- a/src/common/wpa_ctrl.c
+++ b/src/common/wpa_ctrl.c
@@ -142,7 +142,7 @@ try_again:
return NULL;
}
tries++;
-#ifdef ANDROID
+
/* Set client socket file permissions so that bind() creates the client
* socket with these permissions and there is no need to try to change
* them with chmod() after bind() which would have potential issues with
@@ -154,7 +154,7 @@ try_again:
* operations to allow the response to go through. Those are using the
* no-deference-symlinks version to avoid races. */
fchmod(ctrl->s, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
-#endif /* ANDROID */
+
if (bind(ctrl->s, (struct sockaddr *) &ctrl->local,
sizeof(ctrl->local)) < 0) {
if (errno == EADDRINUSE && tries < 2) {
@@ -172,7 +172,11 @@ try_again:
return NULL;
}
-#ifdef ANDROID
+#ifndef ANDROID
+ /* Set group even if we do not have privileges to change owner */
+ lchown(ctrl->local.sun_path, -1, 101);
+ lchown(ctrl->local.sun_path, 101, 101);
+#else
/* Set group even if we do not have privileges to change owner */
lchown(ctrl->local.sun_path, -1, AID_WIFI);
lchown(ctrl->local.sun_path, AID_SYSTEM, AID_WIFI);
diff --git a/src/crypto/Makefile b/src/crypto/Makefile
index ce0997091..96bac9476 100644
--- a/src/crypto/Makefile
+++ b/src/crypto/Makefile
@@ -1,10 +1,121 @@
-CFLAGS += -DCONFIG_CRYPTO_INTERNAL
-CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
-CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
#CFLAGS += -DALL_DH_GROUPS
CFLAGS += -DCONFIG_SHA256
CFLAGS += -DCONFIG_SHA384
+CFLAGS += -DCONFIG_HMAC_SHA256_KDF
CFLAGS += -DCONFIG_HMAC_SHA384_KDF
+
+# crypto_module_tests.c
+CFLAGS += -DCONFIG_MODULE_TESTS
+CFLAGS += -DCONFIG_DPP
+#CFLAGS += -DCONFIG_DPP2
+#CFLAGS += -DCONFIG_DPP3
+CFLAGS += -DCONFIG_ECC
+CFLAGS += -DCONFIG_MESH
+CFLAGS += -DEAP_PSK
+CFLAGS += -DEAP_FAST
+
+ifeq ($(CONFIG_TLS),mbedtls)
+
+# (enable features for 'cd tests; make run-tests CONFIG_TLS=mbedtls')
+CFLAGS += -DCRYPTO_RSA_OAEP_SHA256
+CFLAGS += -DCONFIG_DES
+CFLAGS += -DEAP_IKEV2
+CFLAGS += -DEAP_MSCHAPv2
+CFLAGS += -DEAP_SIM
+
+LIB_OBJS = tls_mbedtls.o crypto_mbedtls.o
+LIB_OBJS+= \
+ aes-eax.o \
+ aes-siv.o \
+ dh_groups.o \
+ milenage.o \
+ ms_funcs.o
+
+else
+ifeq ($(CONFIG_TLS),openssl)
+
+# (enable features for 'cd tests; make run-tests CONFIG_TLS=openssl')
+ifndef CONFIG_TLS_DEFAULT_CIPHERS
+CONFIG_TLS_DEFAULT_CIPHERS = "DEFAULT:!EXP:!LOW"
+endif
+CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\"
+CFLAGS += -DCRYPTO_RSA_OAEP_SHA256
+CFLAGS += -DEAP_TLS_OPENSSL
+
+LIB_OBJS = tls_openssl.o fips_prf_openssl.o crypto_openssl.o
+LIB_OBJS+= \
+ aes-ctr.o \
+ aes-eax.o \
+ aes-encblock.o \
+ aes-siv.o \
+ dh_groups.o \
+ milenage.o \
+ ms_funcs.o \
+ sha1-prf.o \
+ sha1-tlsprf.o \
+ sha1-tprf.o \
+ sha256-kdf.o \
+ sha256-prf.o \
+ sha256-tlsprf.o
+
+else
+ifeq ($(CONFIG_TLS),wolfssl)
+
+# (wolfssl libraries must be built with ./configure --enable-wpas)
+# (enable features for 'cd tests; make run-tests CONFIG_TLS=wolfssl')
+CFLAGS += -DWOLFSSL_DER_LOAD
+CFLAGS += -DCONFIG_DES
+
+LIB_OBJS = tls_wolfssl.o fips_prf_wolfssl.o crypto_wolfssl.o
+LIB_OBJS+= \
+ aes-ctr.o \
+ aes-eax.o \
+ aes-encblock.o \
+ aes-siv.o \
+ dh_groups.o \
+ milenage.o \
+ ms_funcs.o \
+ sha1-prf.o \
+ sha1-tlsprf.o \
+ sha1-tprf.o \
+ sha256-kdf.o \
+ sha256-prf.o \
+ sha256-tlsprf.o
+
+else
+ifeq ($(CONFIG_TLS),gnutls)
+
+# (enable features for 'cd tests; make run-tests CONFIG_TLS=gnutls')
+LIB_OBJS = tls_gnutls.o crypto_gnutls.o
+LIB_OBJS+= \
+ aes-cbc.o \
+ aes-ctr.o \
+ aes-eax.o \
+ aes-encblock.o \
+ aes-omac1.o \
+ aes-siv.o \
+ aes-unwrap.o \
+ aes-wrap.o \
+ dh_group5.o \
+ dh_groups.o \
+ milenage.o \
+ ms_funcs.o \
+ rc4.o \
+ sha1-pbkdf2.o \
+ sha1-prf.o \
+ fips_prf_internal.o \
+ sha1-internal.o \
+ sha1-tlsprf.o \
+ sha1-tprf.o \
+ sha256-kdf.o \
+ sha256-prf.o \
+ sha256-tlsprf.o
+
+else
+
+CFLAGS += -DCONFIG_CRYPTO_INTERNAL
+CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
+CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
CFLAGS += -DCONFIG_INTERNAL_SHA384
LIB_OBJS= \
@@ -13,7 +124,6 @@ LIB_OBJS= \
aes-ctr.o \
aes-eax.o \
aes-encblock.o \
- aes-gcm.o \
aes-internal.o \
aes-internal-dec.o \
aes-internal-enc.o \
@@ -37,6 +147,7 @@ LIB_OBJS= \
sha1-tlsprf.o \
sha1-tprf.o \
sha256.o \
+ sha256-kdf.o \
sha256-prf.o \
sha256-tlsprf.o \
sha256-internal.o \
@@ -53,6 +164,16 @@ LIB_OBJS += crypto_internal-modexp.o
LIB_OBJS += crypto_internal-rsa.o
LIB_OBJS += tls_internal.o
LIB_OBJS += fips_prf_internal.o
+
+endif
+endif
+endif
+endif
+
+
+# (used by wlantest/{bip,gcmp,rx_mgmt}.c and tests/test-aes.c)
+LIB_OBJS += aes-gcm.o
+
ifndef TEST_FUZZ
LIB_OBJS += random.o
endif
diff --git a/src/crypto/crypto_mbedtls.c b/src/crypto/crypto_mbedtls.c
new file mode 100644
index 000000000..7a91c965f
--- /dev/null
+++ b/src/crypto/crypto_mbedtls.c
@@ -0,0 +1,4228 @@
+/*
+ * crypto wrapper functions for mbed TLS
+ *
+ * SPDX-FileCopyrightText: 2022 Glenn Strauss <gstrauss@gluelogic.com>
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "utils/includes.h"
+#include "utils/common.h"
+
+#include <mbedtls/version.h>
+#include <mbedtls/entropy.h>
+#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/platform_util.h> /* mbedtls_platform_zeroize() */
+#include <mbedtls/asn1.h>
+#include <mbedtls/asn1write.h>
+#include <mbedtls/aes.h>
+#include <mbedtls/md.h>
+#include <mbedtls/md5.h>
+#include <mbedtls/sha1.h>
+#include <mbedtls/sha256.h>
+#include <mbedtls/sha512.h>
+
+#ifndef MBEDTLS_PRIVATE
+#define MBEDTLS_PRIVATE(x) x
+#endif
+
+/* hostapd/wpa_supplicant provides forced_memzero(),
+ * but prefer mbedtls_platform_zeroize() */
+#define forced_memzero(ptr,sz) mbedtls_platform_zeroize(ptr,sz)
+
+#ifndef __has_attribute
+#define __has_attribute(x) 0
+#endif
+
+#ifndef __GNUC_PREREQ
+#define __GNUC_PREREQ(maj,min) 0
+#endif
+
+#ifndef __attribute_cold__
+#if __has_attribute(cold) \
+ || __GNUC_PREREQ(4,3)
+#define __attribute_cold__ __attribute__((__cold__))
+#else
+#define __attribute_cold__
+#endif
+#endif
+
+#ifndef __attribute_noinline__
+#if __has_attribute(noinline) \
+ || __GNUC_PREREQ(3,1)
+#define __attribute_noinline__ __attribute__((__noinline__))
+#else
+#define __attribute_noinline__
+#endif
+#endif
+
+#include "crypto.h"
+#include "aes_wrap.h"
+#include "aes.h"
+#include "md5.h"
+#include "sha1.h"
+#include "sha256.h"
+#include "sha384.h"
+#include "sha512.h"
+
+
+/*
+ * selective code inclusion based on preprocessor defines
+ *
+ * future: additional code could be wrapped with preprocessor checks if
+ * wpa_supplicant/Makefile and hostap/Makefile were more consistent with
+ * setting preprocessor defines for named groups of functionality
+ */
+
+#if defined(CONFIG_FIPS)
+#undef MBEDTLS_MD4_C /* omit md4_vector() */
+#undef MBEDTLS_MD5_C /* omit md5_vector() hmac_md5_vector() hmac_md5() */
+#undef MBEDTLS_DES_C /* omit des_encrypt() */
+#undef MBEDTLS_NIST_KW_C /* omit aes_wrap() aes_unwrap() */
+#define CRYPTO_MBEDTLS_CONFIG_FIPS
+#endif
+
+#if !defined(CONFIG_FIPS)
+#if defined(EAP_PWD) \
+ || defined(EAP_LEAP) || defined(EAP_LEAP_DYNAMIC) \
+ || defined(EAP_TTLS) || defined(EAP_TTLS_DYNAMIC) \
+ || defined(EAP_MSCHAPv2) || defined(EAP_MSCHAPv2_DYNAMIC) \
+ || defined(EAP_SERVER_MSCHAPV2)
+#ifndef MBEDTLS_MD4_C /* (MD4 not in mbedtls 3.x) */
+#include "md4-internal.c"/* pull in hostap local implementation */
+#endif /* md4_vector() */
+#else
+#undef MBEDTLS_MD4_C /* omit md4_vector() */
+#endif
+#endif
+
+#if !defined(CONFIG_NO_RC4) && !defined(CONFIG_NO_WPA)
+#ifndef MBEDTLS_ARC4_C /* (RC4 not in mbedtls 3.x) */
+#include "rc4.c" /* pull in hostap local implementation */
+#endif /* rc4_skip() */
+#else
+#undef MBEDTLS_ARC4_C /* omit rc4_skip() */
+#endif
+
+#if defined(CONFIG_MACSEC) \
+ || defined(CONFIG_NO_RADIUS) \
+ || defined(CONFIG_IEEE80211R) \
+ || defined(EAP_SERVER_FAST) \
+ || defined(EAP_SERVER_TEAP) \
+ || !defined(CONFIG_NO_WPA)
+ /* aes_wrap() aes_unwrap() */
+#else
+#undef MBEDTLS_NIST_KW_C /* omit aes_wrap() aes_unwrap() */
+#endif
+
+#if !defined(CONFIG_SHA256)
+#undef MBEDTLS_SHA256_C
+#endif
+
+#if !defined(CONFIG_SHA384) && !defined(CONFIG_SHA512)
+#undef MBEDTLS_SHA512_C
+#endif
+
+#if defined(CONFIG_HMAC_SHA256_KDF)
+#define CRYPTO_MBEDTLS_HMAC_KDF_SHA256
+#endif
+#if defined(CONFIG_HMAC_SHA384_KDF)
+#define CRYPTO_MBEDTLS_HMAC_KDF_SHA384
+#endif
+#if defined(CONFIG_HMAC_SHA512_KDF)
+#define CRYPTO_MBEDTLS_HMAC_KDF_SHA512
+#endif
+
+#if defined(EAP_SIM) || defined(EAP_SIM_DYNAMIC) || defined(EAP_SERVER_SIM) \
+ || defined(EAP_AKA) || defined(EAP_AKA_DYNAMIC) || defined(EAP_SERVER_AKA)
+/* EAP_SIM=y EAP_AKA=y */
+#define CRYPTO_MBEDTLS_FIPS186_2_PRF
+#endif
+
+#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST) \
+ || defined(EAP_TEAP) || defined(EAP_TEAP_DYNAMIC) || defined(EAP_SERVER_FAST)
+#define CRYPTO_MBEDTLS_SHA1_T_PRF
+#endif
+
+#if defined(CONFIG_DES)
+#define CRYPTO_MBEDTLS_DES_ENCRYPT
+#endif /* des_encrypt() */
+
+#if !defined(CONFIG_NO_PBKDF2)
+#define CRYPTO_MBEDTLS_PBKDF2_SHA1
+#endif /* pbkdf2_sha1() */
+
+#if defined(EAP_IKEV2) \
+ || defined(EAP_IKEV2_DYNAMIC) \
+ || defined(EAP_SERVER_IKEV2) /* CONFIG_EAP_IKEV2=y */
+#define CRYPTO_MBEDTLS_CRYPTO_CIPHER
+#endif /* crypto_cipher_*() */
+
+#if defined(EAP_PWD) || defined(EAP_SERVER_PWD) /* CONFIG_EAP_PWD=y */
+#define CRYPTO_MBEDTLS_CRYPTO_HASH
+#endif /* crypto_hash_*() */
+
+#if defined(EAP_PWD) || defined(EAP_SERVER_PWD) /* CONFIG_EAP_PWD=y */ \
+ || defined(CONFIG_SAE) /* CONFIG_SAE=y */
+#define CRYPTO_MBEDTLS_CRYPTO_BIGNUM
+#endif /* crypto_bignum_*() */
+
+#if defined(EAP_PWD) /* CONFIG_EAP_PWD=y */ \
+ || defined(EAP_EKE) /* CONFIG_EAP_EKE=y */ \
+ || defined(EAP_EKE_DYNAMIC) /* CONFIG_EAP_EKE=y */ \
+ || defined(EAP_SERVER_EKE) /* CONFIG_EAP_EKE=y */ \
+ || defined(EAP_IKEV2) /* CONFIG_EAP_IKEV2y */ \
+ || defined(EAP_IKEV2_DYNAMIC)/* CONFIG_EAP_IKEV2=y */ \
+ || defined(EAP_SERVER_IKEV2) /* CONFIG_EAP_IKEV2=y */ \
+ || defined(CONFIG_SAE) /* CONFIG_SAE=y */ \
+ || defined(CONFIG_WPS) /* CONFIG_WPS=y */
+#define CRYPTO_MBEDTLS_CRYPTO_DH
+#if defined(CONFIG_WPS_NFC)
+#define CRYPTO_MBEDTLS_DH5_INIT_FIXED
+#endif /* dh5_init_fixed() */
+#endif /* crypto_dh_*() */
+
+#if !defined(CONFIG_NO_WPA) /* CONFIG_NO_WPA= */
+#define CRYPTO_MBEDTLS_CRYPTO_ECDH
+#endif /* crypto_ecdh_*() */
+
+#if defined(CONFIG_ECC)
+#define CRYPTO_MBEDTLS_CRYPTO_BIGNUM
+#define CRYPTO_MBEDTLS_CRYPTO_EC
+#endif /* crypto_ec_*() crypto_ec_key_*() */
+
+#if defined(CONFIG_DPP) /* CONFIG_DPP=y */
+#define CRYPTO_MBEDTLS_CRYPTO_EC_DPP /* extra for DPP */
+#define CRYPTO_MBEDTLS_CRYPTO_CSR
+#endif /* crypto_csr_*() */
+
+#if defined(CONFIG_DPP3) /* CONFIG_DPP3=y */
+#define CRYPTO_MBEDTLS_CRYPTO_HPKE
+#endif
+
+#if defined(CONFIG_DPP2) /* CONFIG_DPP2=y */
+#define CRYPTO_MBEDTLS_CRYPTO_PKCS7
+#endif /* crypto_pkcs7_*() */
+
+#if defined(EAP_SIM) || defined(EAP_SIM_DYNAMIC) || defined(EAP_SERVER_SIM) \
+ || defined(EAP_AKA) || defined(EAP_AKA_DYNAMIC) || defined(EAP_SERVER_AKA) \
+ || defined(CONFIG_AP) || defined(HOSTAPD)
+/* CONFIG_EAP_SIM=y CONFIG_EAP_AKA=y CONFIG_AP=y HOSTAPD */
+#if defined(CRYPTO_RSA_OAEP_SHA256)
+#define CRYPTO_MBEDTLS_CRYPTO_RSA
+#endif
+#endif /* crypto_rsa_*() */
+
+
+static int ctr_drbg_init_state;
+static mbedtls_ctr_drbg_context ctr_drbg;
+static mbedtls_entropy_context entropy;
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_BIGNUM
+#include <mbedtls/bignum.h>
+static mbedtls_mpi mpi_sw_A;
+#endif
+
+__attribute_cold__
+__attribute_noinline__
+static mbedtls_ctr_drbg_context * ctr_drbg_init(void)
+{
+ mbedtls_ctr_drbg_init(&ctr_drbg);
+ mbedtls_entropy_init(&entropy);
+ if (mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy,
+ NULL, 0)) {
+ wpa_printf(MSG_ERROR, "Init of random number generator failed");
+ /* XXX: abort? */
+ }
+ else
+ ctr_drbg_init_state = 1;
+
+ return &ctr_drbg;
+}
+
+__attribute_cold__
+void crypto_unload(void)
+{
+ if (ctr_drbg_init_state) {
+ mbedtls_ctr_drbg_free(&ctr_drbg);
+ mbedtls_entropy_free(&entropy);
+ #ifdef CRYPTO_MBEDTLS_CRYPTO_BIGNUM
+ mbedtls_mpi_free(&mpi_sw_A);
+ #endif
+ ctr_drbg_init_state = 0;
+ }
+}
+
+/* init ctr_drbg on first use
+ * crypto_global_init() and crypto_global_deinit() are not available here
+ * (available only when CONFIG_TLS=internal, which is not CONFIG_TLS=mbedtls) */
+mbedtls_ctr_drbg_context * crypto_mbedtls_ctr_drbg(void); /*(not in header)*/
+inline
+mbedtls_ctr_drbg_context * crypto_mbedtls_ctr_drbg(void)
+{
+ return ctr_drbg_init_state ? &ctr_drbg : ctr_drbg_init();
+}
+
+#ifdef CRYPTO_MBEDTLS_CONFIG_FIPS
+int crypto_get_random(void *buf, size_t len)
+{
+ return mbedtls_ctr_drbg_random(crypto_mbedtls_ctr_drbg(),buf,len) ? -1 : 0;
+}
+#endif
+
+
+#if 1
+
+/* tradeoff: slightly smaller code size here at cost of slight increase
+ * in instructions and function calls at runtime versus the expanded
+ * per-message-digest code that follows in #else (~0.5 kib .text larger) */
+
+__attribute_noinline__
+static int md_vector(size_t num_elem, const u8 *addr[], const size_t *len,
+ u8 *mac, mbedtls_md_type_t md_type)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ mbedtls_md_context_t ctx;
+ mbedtls_md_init(&ctx);
+ if (mbedtls_md_setup(&ctx, mbedtls_md_info_from_type(md_type), 0) != 0){
+ mbedtls_md_free(&ctx);
+ return -1;
+ }
+ mbedtls_md_starts(&ctx);
+ for (size_t i = 0; i < num_elem; ++i)
+ mbedtls_md_update(&ctx, addr[i], len[i]);
+ mbedtls_md_finish(&ctx, mac);
+ mbedtls_md_free(&ctx);
+ return 0;
+}
+
+#ifdef MBEDTLS_SHA512_C
+int sha512_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
+{
+ return md_vector(num_elem, addr, len, mac, MBEDTLS_MD_SHA512);
+}
+
+int sha384_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
+{
+ return md_vector(num_elem, addr, len, mac, MBEDTLS_MD_SHA384);
+}
+#endif
+
+#ifdef MBEDTLS_SHA256_C
+int sha256_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
+{
+ return md_vector(num_elem, addr, len, mac, MBEDTLS_MD_SHA256);
+}
+#endif
+
+#ifdef MBEDTLS_SHA1_C
+int sha1_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
+{
+ return md_vector(num_elem, addr, len, mac, MBEDTLS_MD_SHA1);
+}
+#endif
+
+#ifdef MBEDTLS_MD5_C
+int md5_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
+{
+ return md_vector(num_elem, addr, len, mac, MBEDTLS_MD_MD5);
+}
+#endif
+
+#ifdef MBEDTLS_MD4_C
+#include <mbedtls/md4.h>
+int md4_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
+{
+ return md_vector(num_elem, addr, len, mac, MBEDTLS_MD_MD4);
+}
+#endif
+
+#else /* expanded per-message-digest functions */
+
+#ifdef MBEDTLS_SHA512_C
+#include <mbedtls/sha512.h>
+__attribute_noinline__
+static int sha384_512_vector(size_t num_elem, const u8 *addr[],
+ const size_t *len, u8 *mac, int is384)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ struct mbedtls_sha512_context ctx;
+ mbedtls_sha512_init(&ctx);
+ #if MBEDTLS_VERSION_MAJOR >= 3
+ mbedtls_sha512_starts(&ctx, is384);
+ for (size_t i = 0; i < num_elem; ++i)
+ mbedtls_sha512_update(&ctx, addr[i], len[i]);
+ mbedtls_sha512_finish(&ctx, mac);
+ #else
+ mbedtls_sha512_starts_ret(&ctx, is384);
+ for (size_t i = 0; i < num_elem; ++i)
+ mbedtls_sha512_update_ret(&ctx, addr[i], len[i]);
+ mbedtls_sha512_finish_ret(&ctx, mac);
+ #endif
+ mbedtls_sha512_free(&ctx);
+ return 0;
+}
+
+int sha512_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
+{
+ return sha384_512_vector(num_elem, addr, len, mac, 0);
+}
+
+int sha384_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
+{
+ return sha384_512_vector(num_elem, addr, len, mac, 1);
+}
+#endif
+
+#ifdef MBEDTLS_SHA256_C
+#include <mbedtls/sha256.h>
+int sha256_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ struct mbedtls_sha256_context ctx;
+ mbedtls_sha256_init(&ctx);
+ #if MBEDTLS_VERSION_MAJOR >= 3
+ mbedtls_sha256_starts(&ctx, 0);
+ for (size_t i = 0; i < num_elem; ++i)
+ mbedtls_sha256_update(&ctx, addr[i], len[i]);
+ mbedtls_sha256_finish(&ctx, mac);
+ #else
+ mbedtls_sha256_starts_ret(&ctx, 0);
+ for (size_t i = 0; i < num_elem; ++i)
+ mbedtls_sha256_update_ret(&ctx, addr[i], len[i]);
+ mbedtls_sha256_finish_ret(&ctx, mac);
+ #endif
+ mbedtls_sha256_free(&ctx);
+ return 0;
+}
+#endif
+
+#ifdef MBEDTLS_SHA1_C
+#include <mbedtls/sha1.h>
+int sha1_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ struct mbedtls_sha1_context ctx;
+ mbedtls_sha1_init(&ctx);
+ #if MBEDTLS_VERSION_MAJOR >= 3
+ mbedtls_sha1_starts(&ctx);
+ for (size_t i = 0; i < num_elem; ++i)
+ mbedtls_sha1_update(&ctx, addr[i], len[i]);
+ mbedtls_sha1_finish(&ctx, mac);
+ #else
+ mbedtls_sha1_starts_ret(&ctx);
+ for (size_t i = 0; i < num_elem; ++i)
+ mbedtls_sha1_update_ret(&ctx, addr[i], len[i]);
+ mbedtls_sha1_finish_ret(&ctx, mac);
+ #endif
+ mbedtls_sha1_free(&ctx);
+ return 0;
+}
+#endif
+
+#ifdef MBEDTLS_MD5_C
+#include <mbedtls/md5.h>
+int md5_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ struct mbedtls_md5_context ctx;
+ mbedtls_md5_init(&ctx);
+ #if MBEDTLS_VERSION_MAJOR >= 3
+ mbedtls_md5_starts(&ctx);
+ for (size_t i = 0; i < num_elem; ++i)
+ mbedtls_md5_update(&ctx, addr[i], len[i]);
+ mbedtls_md5_finish(&ctx, mac);
+ #else
+ mbedtls_md5_starts_ret(&ctx);
+ for (size_t i = 0; i < num_elem; ++i)
+ mbedtls_md5_update_ret(&ctx, addr[i], len[i]);
+ mbedtls_md5_finish_ret(&ctx, mac);
+ #endif
+ mbedtls_md5_free(&ctx);
+ return 0;
+}
+#endif
+
+#ifdef MBEDTLS_MD4_C
+#include <mbedtls/md4.h>
+int md4_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ struct mbedtls_md4_context ctx;
+ mbedtls_md4_init(&ctx);
+ mbedtls_md4_starts_ret(&ctx);
+ for (size_t i = 0; i < num_elem; ++i)
+ mbedtls_md4_update_ret(&ctx, addr[i], len[i]);
+ mbedtls_md4_finish_ret(&ctx, mac);
+ mbedtls_md4_free(&ctx);
+ return 0;
+}
+#endif
+
+#endif /* expanded per-message-digest functions */
+
+
+__attribute_noinline__
+static int hmac_vector(const u8 *key, size_t key_len, size_t num_elem,
+ const u8 *addr[], const size_t *len, u8 *mac,
+ mbedtls_md_type_t md_type)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ mbedtls_md_context_t ctx;
+ mbedtls_md_init(&ctx);
+ if (mbedtls_md_setup(&ctx, mbedtls_md_info_from_type(md_type), 1) != 0){
+ mbedtls_md_free(&ctx);
+ return -1;
+ }
+ mbedtls_md_hmac_starts(&ctx, key, key_len);
+ for (size_t i = 0; i < num_elem; ++i)
+ mbedtls_md_hmac_update(&ctx, addr[i], len[i]);
+ mbedtls_md_hmac_finish(&ctx, mac);
+ mbedtls_md_free(&ctx);
+ return 0;
+}
+
+#ifdef MBEDTLS_SHA512_C
+int hmac_sha512_vector(const u8 *key, size_t key_len, size_t num_elem,
+ const u8 *addr[], const size_t *len, u8 *mac)
+{
+ return hmac_vector(key, key_len, num_elem, addr, len, mac,
+ MBEDTLS_MD_SHA512);
+}
+
+int hmac_sha512(const u8 *key, size_t key_len, const u8 *data, size_t data_len,
+ u8 *mac)
+{
+ return hmac_vector(key, key_len, 1, &data, &data_len, mac,
+ MBEDTLS_MD_SHA512);
+}
+
+int hmac_sha384_vector(const u8 *key, size_t key_len, size_t num_elem,
+ const u8 *addr[], const size_t *len, u8 *mac)
+{
+ return hmac_vector(key, key_len, num_elem, addr, len, mac,
+ MBEDTLS_MD_SHA384);
+}
+
+int hmac_sha384(const u8 *key, size_t key_len, const u8 *data, size_t data_len,
+ u8 *mac)
+{
+ return hmac_vector(key, key_len, 1, &data, &data_len, mac,
+ MBEDTLS_MD_SHA384);
+}
+#endif
+
+#ifdef MBEDTLS_SHA256_C
+int hmac_sha256_vector(const u8 *key, size_t key_len, size_t num_elem,
+ const u8 *addr[], const size_t *len, u8 *mac)
+{
+ return hmac_vector(key, key_len, num_elem, addr, len, mac,
+ MBEDTLS_MD_SHA256);
+}
+
+int hmac_sha256(const u8 *key, size_t key_len, const u8 *data, size_t data_len,
+ u8 *mac)
+{
+ return hmac_vector(key, key_len, 1, &data, &data_len, mac,
+ MBEDTLS_MD_SHA256);
+}
+#endif
+
+#ifdef MBEDTLS_SHA1_C
+int hmac_sha1_vector(const u8 *key, size_t key_len, size_t num_elem,
+ const u8 *addr[], const size_t *len, u8 *mac)
+{
+ return hmac_vector(key, key_len, num_elem, addr, len, mac,
+ MBEDTLS_MD_SHA1);
+}
+
+int hmac_sha1(const u8 *key, size_t key_len, const u8 *data, size_t data_len,
+ u8 *mac)
+{
+ return hmac_vector(key, key_len, 1, &data, &data_len, mac,
+ MBEDTLS_MD_SHA1);
+}
+#endif
+
+#ifdef MBEDTLS_MD5_C
+int hmac_md5_vector(const u8 *key, size_t key_len, size_t num_elem,
+ const u8 *addr[], const size_t *len, u8 *mac)
+{
+ return hmac_vector(key, key_len, num_elem, addr, len, mac,
+ MBEDTLS_MD_MD5);
+}
+
+int hmac_md5(const u8 *key, size_t key_len, const u8 *data, size_t data_len,
+ u8 *mac)
+{
+ return hmac_vector(key, key_len, 1, &data, &data_len, mac,
+ MBEDTLS_MD_MD5);
+}
+#endif
+
+
+#if defined(MBEDTLS_SHA256_C) || defined(MBEDTLS_SHA512_C)
+
+#if defined(CRYPTO_MBEDTLS_HMAC_KDF_SHA256) \
+ || defined(CRYPTO_MBEDTLS_HMAC_KDF_SHA384) \
+ || defined(CRYPTO_MBEDTLS_HMAC_KDF_SHA512)
+
+#include <mbedtls/hkdf.h>
+
+/* sha256-kdf.c sha384-kdf.c sha512-kdf.c */
+
+/* HMAC-SHA256 KDF (RFC 5295) and HKDF-Expand(SHA256) (RFC 5869) */
+/* HMAC-SHA384 KDF (RFC 5295) and HKDF-Expand(SHA384) (RFC 5869) */
+/* HMAC-SHA512 KDF (RFC 5295) and HKDF-Expand(SHA512) (RFC 5869) */
+__attribute_noinline__
+static int hmac_kdf_expand(const u8 *prk, size_t prk_len,
+ const char *label, const u8 *info, size_t info_len,
+ u8 *okm, size_t okm_len, mbedtls_md_type_t md_type)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md_type);
+ #ifdef MBEDTLS_HKDF_C
+ if (label == NULL) /* RFC 5869 HKDF-Expand when (label == NULL) */
+ return mbedtls_hkdf_expand(md_info, prk, prk_len, info,
+ info_len, okm, okm_len) ? -1 : 0;
+ #endif
+
+ const size_t mac_len = mbedtls_md_get_size(md_info);
+ /* okm_len must not exceed 255 times hash len (RFC 5869 Section 2.3) */
+ if (okm_len > ((mac_len << 8) - mac_len))
+ return -1;
+
+ mbedtls_md_context_t ctx;
+ mbedtls_md_init(&ctx);
+ if (mbedtls_md_setup(&ctx, md_info, 1) != 0) {
+ mbedtls_md_free(&ctx);
+ return -1;
+ }
+ mbedtls_md_hmac_starts(&ctx, prk, prk_len);
+
+ u8 iter = 1;
+ const u8 *addr[4] = { okm, (const u8 *)label, info, &iter };
+ size_t len[4] = { 0, label ? os_strlen(label)+1 : 0, info_len, 1 };
+
+ for (; okm_len >= mac_len; okm_len -= mac_len, ++iter) {
+ for (size_t i = 0; i < ARRAY_SIZE(addr); ++i)
+ mbedtls_md_hmac_update(&ctx, addr[i], len[i]);
+ mbedtls_md_hmac_finish(&ctx, okm);
+ mbedtls_md_hmac_reset(&ctx);
+ addr[0] = okm;
+ okm += mac_len;
+ len[0] = mac_len; /*(include digest in subsequent rounds)*/
+ }
+
+ if (okm_len) {
+ u8 hash[MBEDTLS_MD_MAX_SIZE];
+ for (size_t i = 0; i < ARRAY_SIZE(addr); ++i)
+ mbedtls_md_hmac_update(&ctx, addr[i], len[i]);
+ mbedtls_md_hmac_finish(&ctx, hash);
+ os_memcpy(okm, hash, okm_len);
+ forced_memzero(hash, mac_len);
+ }
+
+ mbedtls_md_free(&ctx);
+ return 0;
+}
+
+#ifdef MBEDTLS_SHA512_C
+#ifdef CRYPTO_MBEDTLS_HMAC_KDF_SHA512
+int hmac_sha512_kdf(const u8 *secret, size_t secret_len,
+ const char *label, const u8 *seed, size_t seed_len,
+ u8 *out, size_t outlen)
+{
+ return hmac_kdf_expand(secret, secret_len, label, seed, seed_len,
+ out, outlen, MBEDTLS_MD_SHA512);
+}
+#endif
+
+#ifdef CRYPTO_MBEDTLS_HMAC_KDF_SHA384
+int hmac_sha384_kdf(const u8 *secret, size_t secret_len,
+ const char *label, const u8 *seed, size_t seed_len,
+ u8 *out, size_t outlen)
+{
+ return hmac_kdf_expand(secret, secret_len, label, seed, seed_len,
+ out, outlen, MBEDTLS_MD_SHA384);
+}
+#endif
+#endif
+
+#ifdef MBEDTLS_SHA256_C
+#ifdef CRYPTO_MBEDTLS_HMAC_KDF_SHA256
+int hmac_sha256_kdf(const u8 *secret, size_t secret_len,
+ const char *label, const u8 *seed, size_t seed_len,
+ u8 *out, size_t outlen)
+{
+ return hmac_kdf_expand(secret, secret_len, label, seed, seed_len,
+ out, outlen, MBEDTLS_MD_SHA256);
+}
+#endif
+#endif
+
+#endif /* CRYPTO_MBEDTLS_HMAC_KDF_* */
+
+
+/* sha256-prf.c sha384-prf.c sha512-prf.c */
+
+/* hmac_prf_bits - IEEE Std 802.11ac-2013, 11.6.1.7.2 Key derivation function */
+__attribute_noinline__
+static int hmac_prf_bits(const u8 *key, size_t key_len, const char *label,
+ const u8 *data, size_t data_len, u8 *buf,
+ size_t buf_len_bits, mbedtls_md_type_t md_type)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ mbedtls_md_context_t ctx;
+ mbedtls_md_init(&ctx);
+ const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md_type);
+ if (mbedtls_md_setup(&ctx, md_info, 1) != 0) {
+ mbedtls_md_free(&ctx);
+ return -1;
+ }
+ mbedtls_md_hmac_starts(&ctx, key, key_len);
+
+ u16 ctr, n_le = host_to_le16(buf_len_bits);
+ const u8 * const addr[] = { (u8 *)&ctr,(u8 *)label,data,(u8 *)&n_le };
+ const size_t len[] = { 2, os_strlen(label), data_len, 2 };
+ const size_t mac_len = mbedtls_md_get_size(md_info);
+ size_t buf_len = (buf_len_bits + 7) / 8;
+ for (ctr = 1; buf_len >= mac_len; buf_len -= mac_len, ++ctr) {
+ #if __BYTE_ORDER == __BIG_ENDIAN
+ ctr = host_to_le16(ctr);
+ #endif
+ for (size_t i = 0; i < ARRAY_SIZE(addr); ++i)
+ mbedtls_md_hmac_update(&ctx, addr[i], len[i]);
+ mbedtls_md_hmac_finish(&ctx, buf);
+ mbedtls_md_hmac_reset(&ctx);
+ buf += mac_len;
+ #if __BYTE_ORDER == __BIG_ENDIAN
+ ctr = le_to_host16(ctr);
+ #endif
+ }
+
+ if (buf_len) {
+ u8 hash[MBEDTLS_MD_MAX_SIZE];
+ #if __BYTE_ORDER == __BIG_ENDIAN
+ ctr = host_to_le16(ctr);
+ #endif
+ for (size_t i = 0; i < ARRAY_SIZE(addr); ++i)
+ mbedtls_md_hmac_update(&ctx, addr[i], len[i]);
+ mbedtls_md_hmac_finish(&ctx, hash);
+ os_memcpy(buf, hash, buf_len);
+ buf += buf_len;
+ forced_memzero(hash, mac_len);
+ }
+
+ /* Mask out unused bits in last octet if it does not use all the bits */
+ if ((buf_len_bits &= 0x7))
+ buf[-1] &= (u8)(0xff << (8 - buf_len_bits));
+
+ mbedtls_md_free(&ctx);
+ return 0;
+}
+
+#ifdef MBEDTLS_SHA512_C
+int sha512_prf(const u8 *key, size_t key_len, const char *label,
+ const u8 *data, size_t data_len, u8 *buf, size_t buf_len)
+{
+ return hmac_prf_bits(key, key_len, label, data, data_len, buf,
+ buf_len * 8, MBEDTLS_MD_SHA512);
+}
+
+int sha384_prf(const u8 *key, size_t key_len, const char *label,
+ const u8 *data, size_t data_len, u8 *buf, size_t buf_len)
+{
+ return hmac_prf_bits(key, key_len, label, data, data_len, buf,
+ buf_len * 8, MBEDTLS_MD_SHA384);
+}
+#endif
+
+#ifdef MBEDTLS_SHA256_C
+int sha256_prf(const u8 *key, size_t key_len, const char *label,
+ const u8 *data, size_t data_len, u8 *buf, size_t buf_len)
+{
+ return hmac_prf_bits(key, key_len, label, data, data_len, buf,
+ buf_len * 8, MBEDTLS_MD_SHA256);
+}
+
+int sha256_prf_bits(const u8 *key, size_t key_len, const char *label,
+ const u8 *data, size_t data_len, u8 *buf,
+ size_t buf_len_bits)
+{
+ return hmac_prf_bits(key, key_len, label, data, data_len, buf,
+ buf_len_bits, MBEDTLS_MD_SHA256);
+}
+#endif
+
+#endif /* MBEDTLS_SHA256_C || MBEDTLS_SHA512_C */
+
+
+#ifdef MBEDTLS_SHA1_C
+
+/* sha1-prf.c */
+
+/* sha1_prf - SHA1-based Pseudo-Random Function (PRF) (IEEE 802.11i, 8.5.1.1) */
+
+int sha1_prf(const u8 *key, size_t key_len, const char *label,
+ const u8 *data, size_t data_len, u8 *buf, size_t buf_len)
+{
+ /*(note: algorithm differs from hmac_prf_bits() */
+ /*(note: smaller code size instead of expanding hmac_sha1_vector()
+ * as is done in hmac_prf_bits(); not expecting large num of loops) */
+ u8 counter = 0;
+ const u8 *addr[] = { (u8 *)label, data, &counter };
+ const size_t len[] = { os_strlen(label)+1, data_len, 1 };
+
+ for (; buf_len >= SHA1_MAC_LEN; buf_len -= SHA1_MAC_LEN, ++counter) {
+ if (hmac_sha1_vector(key, key_len, 3, addr, len, buf))
+ return -1;
+ buf += SHA1_MAC_LEN;
+ }
+
+ if (buf_len) {
+ u8 hash[SHA1_MAC_LEN];
+ if (hmac_sha1_vector(key, key_len, 3, addr, len, hash))
+ return -1;
+ os_memcpy(buf, hash, buf_len);
+ forced_memzero(hash, sizeof(hash));
+ }
+
+ return 0;
+}
+
+#ifdef CRYPTO_MBEDTLS_SHA1_T_PRF
+
+/* sha1-tprf.c */
+
+/* sha1_t_prf - EAP-FAST Pseudo-Random Function (T-PRF) (RFC 4851,Section 5.5)*/
+
+int sha1_t_prf(const u8 *key, size_t key_len, const char *label,
+ const u8 *seed, size_t seed_len, u8 *buf, size_t buf_len)
+{
+ /*(note: algorithm differs from hmac_prf_bits() and hmac_kdf() above)*/
+ /*(note: smaller code size instead of expanding hmac_sha1_vector()
+ * as is done in hmac_prf_bits(); not expecting large num of loops) */
+ u8 ctr;
+ u16 olen = host_to_be16(buf_len);
+ const u8 *addr[] = { buf, (u8 *)label, seed, (u8 *)&olen, &ctr };
+ size_t len[] = { 0, os_strlen(label)+1, seed_len, 2, 1 };
+
+ for (ctr = 1; buf_len >= SHA1_MAC_LEN; buf_len -= SHA1_MAC_LEN, ++ctr) {
+ if (hmac_sha1_vector(key, key_len, 5, addr, len, buf))
+ return -1;
+ addr[0] = buf;
+ buf += SHA1_MAC_LEN;
+ len[0] = SHA1_MAC_LEN; /*(include digest in subsequent rounds)*/
+ }
+
+ if (buf_len) {
+ u8 hash[SHA1_MAC_LEN];
+ if (hmac_sha1_vector(key, key_len, 5, addr, len, hash))
+ return -1;
+ os_memcpy(buf, hash, buf_len);
+ forced_memzero(hash, sizeof(hash));
+ }
+
+ return 0;
+}
+
+#endif /* CRYPTO_MBEDTLS_SHA1_T_PRF */
+
+#ifdef CRYPTO_MBEDTLS_FIPS186_2_PRF
+
+/* fips_prf_internal.c sha1-internal.c */
+
+/* used only by src/eap_common/eap_sim_common.c:eap_sim_prf()
+ * for eap_sim_derive_keys() and eap_sim_derive_keys_reauth()
+ * where xlen is 160 */
+
+int fips186_2_prf(const u8 *seed, size_t seed_len, u8 *x, size_t xlen)
+{
+ /* FIPS 186-2 + change notice 1 */
+
+ mbedtls_sha1_context ctx;
+ u8 * const xkey = ctx.MBEDTLS_PRIVATE(buffer);
+ u32 * const xstate = ctx.MBEDTLS_PRIVATE(state);
+ const u32 xstate_init[] =
+ { 0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0 };
+
+ mbedtls_sha1_init(&ctx);
+ os_memcpy(xkey, seed, seed_len < 64 ? seed_len : 64);
+
+ /* note: does not fill extra bytes if (xlen % 20) (SHA1_MAC_LEN) */
+ for (; xlen >= 20; xlen -= 20) {
+ /* XSEED_j = 0 */
+ /* XVAL = (XKEY + XSEED_j) mod 2^b */
+
+ /* w_i = G(t, XVAL) */
+ os_memcpy(xstate, xstate_init, sizeof(xstate_init));
+ mbedtls_internal_sha1_process(&ctx, xkey);
+
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+ xstate[0] = host_to_be32(xstate[0]);
+ xstate[1] = host_to_be32(xstate[1]);
+ xstate[2] = host_to_be32(xstate[2]);
+ xstate[3] = host_to_be32(xstate[3]);
+ xstate[4] = host_to_be32(xstate[4]);
+ #endif
+ os_memcpy(x, xstate, 20);
+ if (xlen == 20) /*(done; skip prep for next loop)*/
+ break;
+
+ /* XKEY = (1 + XKEY + w_i) mod 2^b */
+ for (u32 carry = 1, k = 20; k-- > 0; carry >>= 8)
+ xkey[k] = (carry += xkey[k] + x[k]) & 0xff;
+ x += 20;
+ /* x_j = w_0|w_1 (each pair of iterations through loop)*/
+ }
+
+ mbedtls_sha1_free(&ctx);
+ return 0;
+}
+
+#endif /* CRYPTO_MBEDTLS_FIPS186_2_PRF */
+
+#endif /* MBEDTLS_SHA1_C */
+
+
+#ifdef CRYPTO_MBEDTLS_DES_ENCRYPT
+#ifdef MBEDTLS_DES_C
+#include <mbedtls/des.h>
+int des_encrypt(const u8 *clear, const u8 *key, u8 *cypher)
+{
+ u8 pkey[8], next, tmp;
+ int i;
+
+ /* Add parity bits to the key */
+ next = 0;
+ for (i = 0; i < 7; i++) {
+ tmp = key[i];
+ pkey[i] = (tmp >> i) | next | 1;
+ next = tmp << (7 - i);
+ }
+ pkey[i] = next | 1;
+
+ mbedtls_des_context des;
+ mbedtls_des_init(&des);
+ int ret = mbedtls_des_setkey_enc(&des, pkey)
+ || mbedtls_des_crypt_ecb(&des, clear, cypher) ? -1 : 0;
+ mbedtls_des_free(&des);
+ return ret;
+}
+#else
+#include "des-internal.c"/* pull in hostap local implementation */
+#endif
+#endif
+
+
+#ifdef CRYPTO_MBEDTLS_PBKDF2_SHA1
+/* sha1-pbkdf2.c */
+#include <mbedtls/pkcs5.h>
+int pbkdf2_sha1(const char *passphrase, const u8 *ssid, size_t ssid_len,
+ int iterations, u8 *buf, size_t buflen)
+{
+ #if MBEDTLS_VERSION_NUMBER >= 0x03020200 /* mbedtls 3.2.2 */
+ return mbedtls_pkcs5_pbkdf2_hmac_ext(MBEDTLS_MD_SHA1,
+ (const u8 *)passphrase, os_strlen(passphrase),
+ ssid, ssid_len, iterations, 32, buf) ? -1 : 0;
+ #else
+ const mbedtls_md_info_t *md_info;
+ md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
+ if (md_info == NULL)
+ return -1;
+ mbedtls_md_context_t ctx;
+ mbedtls_md_init(&ctx);
+ int ret = mbedtls_md_setup(&ctx, md_info, 1)
+ || mbedtls_pkcs5_pbkdf2_hmac(&ctx,
+ (const u8 *)passphrase, os_strlen(passphrase),
+ ssid, ssid_len, iterations, 32, buf) ? -1 : 0;
+ mbedtls_md_free(&ctx);
+ return ret;
+ #endif
+}
+#endif
+
+
+/*#include "aes.h"*/ /* prototypes also included in "crypto.h" */
+
+static void *aes_crypt_init_mode(const u8 *key, size_t len, int mode)
+{
+ if (TEST_FAIL())
+ return NULL;
+
+ mbedtls_aes_context *aes = os_malloc(sizeof(*aes));
+ if (!aes)
+ return NULL;
+
+ mbedtls_aes_init(aes);
+ if ((mode == MBEDTLS_AES_ENCRYPT
+ ? mbedtls_aes_setkey_enc(aes, key, len * 8)
+ : mbedtls_aes_setkey_dec(aes, key, len * 8)) == 0)
+ return aes;
+
+ mbedtls_aes_free(aes);
+ os_free(aes);
+ return NULL;
+}
+
+void *aes_encrypt_init(const u8 *key, size_t len)
+{
+ return aes_crypt_init_mode(key, len, MBEDTLS_AES_ENCRYPT);
+}
+
+int aes_encrypt(void *ctx, const u8 *plain, u8 *crypt)
+{
+ return mbedtls_aes_crypt_ecb(ctx, MBEDTLS_AES_ENCRYPT, plain, crypt);
+}
+
+void aes_encrypt_deinit(void *ctx)
+{
+ mbedtls_aes_free(ctx);
+ os_free(ctx);
+}
+
+void *aes_decrypt_init(const u8 *key, size_t len)
+{
+ return aes_crypt_init_mode(key, len, MBEDTLS_AES_DECRYPT);
+}
+
+int aes_decrypt(void *ctx, const u8 *crypt, u8 *plain)
+{
+ return mbedtls_aes_crypt_ecb(ctx, MBEDTLS_AES_DECRYPT, crypt, plain);
+}
+
+void aes_decrypt_deinit(void *ctx)
+{
+ mbedtls_aes_free(ctx);
+ os_free(ctx);
+}
+
+
+#include "aes_wrap.h"
+
+
+#ifdef MBEDTLS_NIST_KW_C
+
+#include <mbedtls/nist_kw.h>
+
+/* aes-wrap.c */
+int aes_wrap(const u8 *kek, size_t kek_len, int n, const u8 *plain, u8 *cipher)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ mbedtls_nist_kw_context ctx;
+ mbedtls_nist_kw_init(&ctx);
+ size_t olen;
+ int ret = mbedtls_nist_kw_setkey(&ctx, MBEDTLS_CIPHER_ID_AES,
+ kek, kek_len*8, 1)
+ || mbedtls_nist_kw_wrap(&ctx, MBEDTLS_KW_MODE_KW, plain, n*8,
+ cipher, &olen, (n+1)*8) ? -1 : 0;
+ mbedtls_nist_kw_free(&ctx);
+ return ret;
+}
+
+/* aes-unwrap.c */
+int aes_unwrap(const u8 *kek, size_t kek_len, int n, const u8 *cipher, u8 *plain)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ mbedtls_nist_kw_context ctx;
+ mbedtls_nist_kw_init(&ctx);
+ size_t olen;
+ int ret = mbedtls_nist_kw_setkey(&ctx, MBEDTLS_CIPHER_ID_AES,
+ kek, kek_len*8, 0)
+ || mbedtls_nist_kw_unwrap(&ctx, MBEDTLS_KW_MODE_KW, cipher,
+ (n+1)*8, plain, &olen, n*8) ? -1 : 0;
+ mbedtls_nist_kw_free(&ctx);
+ return ret;
+}
+
+#else
+
+#ifndef CRYPTO_MBEDTLS_CONFIG_FIPS
+#include "aes-wrap.c" /* pull in hostap local implementation */
+#include "aes-unwrap.c" /* pull in hostap local implementation */
+#endif
+
+#endif /* MBEDTLS_NIST_KW_C */
+
+
+#ifdef MBEDTLS_CMAC_C
+
+/* aes-omac1.c */
+
+#include <mbedtls/cmac.h>
+
+int omac1_aes_vector(
+ const u8 *key, size_t key_len, size_t num_elem, const u8 *addr[],
+ const size_t *len, u8 *mac)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ mbedtls_cipher_type_t cipher_type;
+ switch (key_len) {
+ case 16: cipher_type = MBEDTLS_CIPHER_AES_128_ECB; break;
+ case 24: cipher_type = MBEDTLS_CIPHER_AES_192_ECB; break;
+ case 32: cipher_type = MBEDTLS_CIPHER_AES_256_ECB; break;
+ default: return -1;
+ }
+ const mbedtls_cipher_info_t *cipher_info;
+ cipher_info = mbedtls_cipher_info_from_type(cipher_type);
+ if (cipher_info == NULL)
+ return -1;
+
+ mbedtls_cipher_context_t ctx;
+ mbedtls_cipher_init(&ctx);
+ int ret = -1;
+ if (mbedtls_cipher_setup(&ctx, cipher_info) == 0
+ && mbedtls_cipher_cmac_starts(&ctx, key, key_len*8) == 0) {
+ ret = 0;
+ for (size_t i = 0; i < num_elem && ret == 0; ++i)
+ ret = mbedtls_cipher_cmac_update(&ctx, addr[i], len[i]);
+ }
+ if (ret == 0)
+ ret = mbedtls_cipher_cmac_finish(&ctx, mac);
+ mbedtls_cipher_free(&ctx);
+ return ret ? -1 : 0;
+}
+
+int omac1_aes_128_vector(const u8 *key, size_t num_elem,
+ const u8 *addr[], const size_t *len,
+ u8 *mac)
+{
+ return omac1_aes_vector(key, 16, num_elem, addr, len, mac);
+}
+
+int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
+{
+ return omac1_aes_vector(key, 16, 1, &data, &data_len, mac);
+}
+
+int omac1_aes_256(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
+{
+ return omac1_aes_vector(key, 32, 1, &data, &data_len, mac);
+}
+
+#else
+
+#include "aes-omac1.c" /* pull in hostap local implementation */
+
+#ifndef MBEDTLS_AES_BLOCK_SIZE
+#define MBEDTLS_AES_BLOCK_SIZE 16
+#endif
+
+#endif /* MBEDTLS_CMAC_C */
+
+
+/* These interfaces can be inefficient when used in loops, as the overhead of
+ * initialization each call is large for each block input (e.g. 16 bytes) */
+
+
+/* aes-encblock.c */
+int aes_128_encrypt_block(const u8 *key, const u8 *in, u8 *out)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ mbedtls_aes_context aes;
+ mbedtls_aes_init(&aes);
+ int ret = mbedtls_aes_setkey_enc(&aes, key, 128)
+ || mbedtls_aes_crypt_ecb(&aes, MBEDTLS_AES_ENCRYPT, in, out)
+ ? -1
+ : 0;
+ mbedtls_aes_free(&aes);
+ return ret;
+}
+
+
+/* aes-ctr.c */
+int aes_ctr_encrypt(const u8 *key, size_t key_len, const u8 *nonce,
+ u8 *data, size_t data_len)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ unsigned char counter[MBEDTLS_AES_BLOCK_SIZE];
+ unsigned char stream_block[MBEDTLS_AES_BLOCK_SIZE];
+ os_memcpy(counter, nonce, MBEDTLS_AES_BLOCK_SIZE);/*(must be writable)*/
+
+ mbedtls_aes_context ctx;
+ mbedtls_aes_init(&ctx);
+ size_t nc_off = 0;
+ int ret = mbedtls_aes_setkey_enc(&ctx, key, key_len*8)
+ || mbedtls_aes_crypt_ctr(&ctx, data_len, &nc_off,
+ counter, stream_block,
+ data, data) ? -1 : 0;
+ forced_memzero(stream_block, sizeof(stream_block));
+ mbedtls_aes_free(&ctx);
+ return ret;
+}
+
+int aes_128_ctr_encrypt(const u8 *key, const u8 *nonce,
+ u8 *data, size_t data_len)
+{
+ return aes_ctr_encrypt(key, 16, nonce, data, data_len);
+}
+
+
+/* aes-cbc.c */
+static int aes_128_cbc_oper(const u8 *key, const u8 *iv,
+ u8 *data, size_t data_len, int mode)
+{
+ unsigned char ivec[MBEDTLS_AES_BLOCK_SIZE];
+ os_memcpy(ivec, iv, MBEDTLS_AES_BLOCK_SIZE); /*(must be writable)*/
+
+ mbedtls_aes_context ctx;
+ mbedtls_aes_init(&ctx);
+ int ret = (mode == MBEDTLS_AES_ENCRYPT
+ ? mbedtls_aes_setkey_enc(&ctx, key, 128)
+ : mbedtls_aes_setkey_dec(&ctx, key, 128))
+ || mbedtls_aes_crypt_cbc(&ctx, mode, data_len, ivec, data, data);
+ mbedtls_aes_free(&ctx);
+ return ret ? -1 : 0;
+}
+
+int aes_128_cbc_encrypt(const u8 *key, const u8 *iv, u8 *data, size_t data_len)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ return aes_128_cbc_oper(key, iv, data, data_len, MBEDTLS_AES_ENCRYPT);
+}
+
+int aes_128_cbc_decrypt(const u8 *key, const u8 *iv, u8 *data, size_t data_len)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ return aes_128_cbc_oper(key, iv, data, data_len, MBEDTLS_AES_DECRYPT);
+}
+
+
+/*
+ * Much of the following is documented in crypto.h as for CONFIG_TLS=internal
+ * but such comments are not accurate:
+ *
+ * "This function is only used with internal TLSv1 implementation
+ * (CONFIG_TLS=internal). If that is not used, the crypto wrapper does not need
+ * to implement this."
+ */
+
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_CIPHER
+
+#include <mbedtls/cipher.h>
+
+struct crypto_cipher
+{
+ mbedtls_cipher_context_t ctx_enc;
+ mbedtls_cipher_context_t ctx_dec;
+};
+
+struct crypto_cipher * crypto_cipher_init(enum crypto_cipher_alg alg,
+ const u8 *iv, const u8 *key,
+ size_t key_len)
+{
+ /* IKEv2 src/eap_common/ikev2_common.c:ikev2_{encr,decr}_encrypt()
+ * uses one of CRYPTO_CIPHER_ALG_AES or CRYPTO_CIPHER_ALG_3DES */
+
+ mbedtls_cipher_type_t cipher_type;
+ size_t iv_len;
+ switch (alg) {
+ #ifdef MBEDTLS_ARC4_C
+ #if 0
+ case CRYPTO_CIPHER_ALG_RC4:
+ cipher_type = MBEDTLS_CIPHER_ARC4_128;
+ iv_len = 0;
+ break;
+ #endif
+ #endif
+ #ifdef MBEDTLS_AES_C
+ case CRYPTO_CIPHER_ALG_AES:
+ if (key_len == 16) cipher_type = MBEDTLS_CIPHER_AES_128_CTR;
+ if (key_len == 24) cipher_type = MBEDTLS_CIPHER_AES_192_CTR;
+ if (key_len == 32) cipher_type = MBEDTLS_CIPHER_AES_256_CTR;
+ iv_len = 16;
+ break;
+ #endif
+ #ifdef MBEDTLS_DES_C
+ case CRYPTO_CIPHER_ALG_3DES:
+ cipher_type = MBEDTLS_CIPHER_DES_EDE3_CBC;
+ iv_len = 8;
+ break;
+ #if 0
+ case CRYPTO_CIPHER_ALG_DES:
+ cipher_type = MBEDTLS_CIPHER_DES_CBC;
+ iv_len = 8;
+ break;
+ #endif
+ #endif
+ default:
+ return NULL;
+ }
+
+ const mbedtls_cipher_info_t *cipher_info;
+ cipher_info = mbedtls_cipher_info_from_type(cipher_type);
+ if (cipher_info == NULL)
+ return NULL;
+
+ key_len *= 8; /* key_bitlen */
+ #if 0 /*(were key_bitlen not already available)*/
+ #if MBEDTLS_VERSION_NUMBER >= 0x03010000 /* mbedtls 3.1.0 */
+ key_len = mbedtls_cipher_info_get_key_bitlen(cipher_info);
+ #else
+ key_len = cipher_info->MBEDTLS_PRIVATE(key_bitlen);
+ #endif
+ #endif
+
+ #if 0 /*(were iv_len not known above, would need MBEDTLS_PRIVATE(iv_size))*/
+ iv_len = cipher_info->MBEDTLS_PRIVATE(iv_size);
+ #endif
+
+ struct crypto_cipher *ctx = os_malloc(sizeof(*ctx));
+ if (!ctx)
+ return NULL;
+
+ mbedtls_cipher_init(&ctx->ctx_enc);
+ mbedtls_cipher_init(&ctx->ctx_dec);
+ if ( mbedtls_cipher_setup(&ctx->ctx_enc,cipher_info) == 0
+ && mbedtls_cipher_setup(&ctx->ctx_dec,cipher_info) == 0
+ && mbedtls_cipher_setkey(&ctx->ctx_enc,key,key_len,MBEDTLS_ENCRYPT) == 0
+ && mbedtls_cipher_setkey(&ctx->ctx_dec,key,key_len,MBEDTLS_DECRYPT) == 0
+ && mbedtls_cipher_set_iv(&ctx->ctx_enc,iv,iv_len) == 0
+ && mbedtls_cipher_set_iv(&ctx->ctx_dec,iv,iv_len) == 0
+ && mbedtls_cipher_reset(&ctx->ctx_enc) == 0
+ && mbedtls_cipher_reset(&ctx->ctx_dec) == 0) {
+ return ctx;
+ }
+
+ mbedtls_cipher_free(&ctx->ctx_enc);
+ mbedtls_cipher_free(&ctx->ctx_dec);
+ os_free(ctx);
+ return NULL;
+}
+
+int crypto_cipher_encrypt(struct crypto_cipher *ctx,
+ const u8 *plain, u8 *crypt, size_t len)
+{
+ size_t olen = 0; /*(poor interface above; unknown size of u8 *crypt)*/
+ return (mbedtls_cipher_update(&ctx->ctx_enc, plain, len, crypt, &olen)
+ || mbedtls_cipher_finish(&ctx->ctx_enc, crypt + olen, &olen)) ? -1 : 0;
+}
+
+int crypto_cipher_decrypt(struct crypto_cipher *ctx,
+ const u8 *crypt, u8 *plain, size_t len)
+{
+ size_t olen = 0; /*(poor interface above; unknown size of u8 *plain)*/
+ return (mbedtls_cipher_update(&ctx->ctx_dec, crypt, len, plain, &olen)
+ || mbedtls_cipher_finish(&ctx->ctx_dec, plain + olen, &olen)) ? -1 : 0;
+}
+
+void crypto_cipher_deinit(struct crypto_cipher *ctx)
+{
+ mbedtls_cipher_free(&ctx->ctx_enc);
+ mbedtls_cipher_free(&ctx->ctx_dec);
+ os_free(ctx);
+}
+
+#endif /* CRYPTO_MBEDTLS_CRYPTO_CIPHER */
+
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_HASH
+
+struct crypto_hash * crypto_hash_init(enum crypto_hash_alg alg, const u8 *key,
+ size_t key_len)
+{
+ mbedtls_md_type_t md_type;
+ int is_hmac = 0;
+
+ switch (alg) {
+ #ifdef MBEDTLS_MD5_C
+ case CRYPTO_HASH_ALG_MD5:
+ md_type = MBEDTLS_MD_MD5;
+ break;
+ #endif
+ #ifdef MBEDTLS_SHA1_C
+ case CRYPTO_HASH_ALG_SHA1:
+ md_type = MBEDTLS_MD_SHA1;
+ break;
+ #endif
+ #ifdef MBEDTLS_MD5_C
+ case CRYPTO_HASH_ALG_HMAC_MD5:
+ md_type = MBEDTLS_MD_MD5;
+ is_hmac = 1;
+ break;
+ #endif
+ #ifdef MBEDTLS_SHA1_C
+ case CRYPTO_HASH_ALG_HMAC_SHA1:
+ md_type = MBEDTLS_MD_SHA1;
+ is_hmac = 1;
+ break;
+ #endif
+ #ifdef MBEDTLS_SHA256_C
+ case CRYPTO_HASH_ALG_SHA256:
+ md_type = MBEDTLS_MD_SHA256;
+ break;
+ case CRYPTO_HASH_ALG_HMAC_SHA256:
+ md_type = MBEDTLS_MD_SHA256;
+ is_hmac = 1;
+ break;
+ #endif
+ #ifdef MBEDTLS_SHA512_C
+ case CRYPTO_HASH_ALG_SHA384:
+ md_type = MBEDTLS_MD_SHA384;
+ break;
+ case CRYPTO_HASH_ALG_SHA512:
+ md_type = MBEDTLS_MD_SHA512;
+ break;
+ #endif
+ default:
+ return NULL;
+ }
+
+ const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md_type);
+ if (!md_info)
+ return NULL;
+
+ mbedtls_md_context_t *mctx = os_malloc(sizeof(*mctx));
+ if (mctx == NULL)
+ return NULL;
+
+ mbedtls_md_init(mctx);
+ if (mbedtls_md_setup(mctx, md_info, is_hmac) != 0) {
+ os_free(mctx);
+ return NULL;
+ }
+
+ if (is_hmac)
+ mbedtls_md_hmac_starts(mctx, key, key_len);
+ else
+ mbedtls_md_starts(mctx);
+ return (struct crypto_hash *)((uintptr_t)mctx | is_hmac);
+}
+
+void crypto_hash_update(struct crypto_hash *ctx, const u8 *data, size_t len)
+{
+ mbedtls_md_context_t *mctx = (mbedtls_md_context_t*)((uintptr_t)ctx & ~1uL);
+ #if 0
+ /*(mbedtls_md_hmac_update() and mbedtls_md_update()
+ * make same modifications under the hood in mbedtls)*/
+ if ((uintptr_t)ctx & 1uL)
+ mbedtls_md_hmac_update(mctx, data, len);
+ else
+ #endif
+ mbedtls_md_update(mctx, data, len);
+}
+
+int crypto_hash_finish(struct crypto_hash *ctx, u8 *mac, size_t *len)
+{
+ mbedtls_md_context_t *mctx = (mbedtls_md_context_t*)((uintptr_t)ctx & ~1uL);
+ if (mac != NULL && len != NULL) { /*(NULL if caller just freeing context)*/
+ #if MBEDTLS_VERSION_NUMBER >= 0x03020000 /* mbedtls 3.2.0 */
+ const mbedtls_md_info_t *md_info = mbedtls_md_info_from_ctx(mctx);
+ #else
+ const mbedtls_md_info_t *md_info = mctx->MBEDTLS_PRIVATE(md_info);
+ #endif
+ size_t maclen = mbedtls_md_get_size(md_info);
+ if (*len < maclen) {
+ *len = maclen;
+ /*(note: ctx not freed; can call again with larger *len)*/
+ return -1;
+ }
+ *len = maclen;
+ if ((uintptr_t)ctx & 1uL)
+ mbedtls_md_hmac_finish(mctx, mac);
+ else
+ mbedtls_md_finish(mctx, mac);
+ }
+ mbedtls_md_free(mctx);
+ os_free(mctx);
+
+ if (TEST_FAIL())
+ return -1;
+
+ return 0;
+}
+
+#endif /* CRYPTO_MBEDTLS_CRYPTO_HASH */
+
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_BIGNUM
+
+#include <mbedtls/bignum.h>
+
+/* crypto.h bignum interfaces */
+
+struct crypto_bignum *crypto_bignum_init(void)
+{
+ if (TEST_FAIL())
+ return NULL;
+
+ mbedtls_mpi *bn = os_malloc(sizeof(*bn));
+ if (bn)
+ mbedtls_mpi_init(bn);
+ return (struct crypto_bignum *)bn;
+}
+
+struct crypto_bignum *crypto_bignum_init_set(const u8 *buf, size_t len)
+{
+ if (TEST_FAIL())
+ return NULL;
+
+ mbedtls_mpi *bn = os_malloc(sizeof(*bn));
+ if (bn) {
+ mbedtls_mpi_init(bn);
+ if (mbedtls_mpi_read_binary(bn, buf, len) == 0)
+ return (struct crypto_bignum *)bn;
+ }
+
+ os_free(bn);
+ return NULL;
+}
+
+struct crypto_bignum *crypto_bignum_init_uint(unsigned int val)
+{
+ if (TEST_FAIL())
+ return NULL;
+
+ #if 0 /*(hostap use of this interface passes int, not uint)*/
+ val = host_to_be32(val);
+ return crypto_bignum_init_set((const u8 *)&val, sizeof(val));
+ #else
+ mbedtls_mpi *bn = os_malloc(sizeof(*bn));
+ if (bn) {
+ mbedtls_mpi_init(bn);
+ if (mbedtls_mpi_lset(bn, (int)val) == 0)
+ return (struct crypto_bignum *)bn;
+ }
+
+ os_free(bn);
+ return NULL;
+ #endif
+}
+
+void crypto_bignum_deinit(struct crypto_bignum *n, int clear)
+{
+ mbedtls_mpi_free((mbedtls_mpi *)n);
+ os_free(n);
+}
+
+int crypto_bignum_to_bin(const struct crypto_bignum *a,
+ u8 *buf, size_t buflen, size_t padlen)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ size_t n = mbedtls_mpi_size((mbedtls_mpi *)a);
+ if (n < padlen)
+ n = padlen;
+ return n > buflen || mbedtls_mpi_write_binary((mbedtls_mpi *)a, buf, n)
+ ? -1
+ : (int)(n);
+}
+
+int crypto_bignum_rand(struct crypto_bignum *r, const struct crypto_bignum *m)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ /*assert(r != m);*//* r must not be same as m for mbedtls_mpi_random()*/
+ #if MBEDTLS_VERSION_NUMBER >= 0x021B0000 /* mbedtls 2.27.0 */
+ return mbedtls_mpi_random((mbedtls_mpi *)r, 0, (mbedtls_mpi *)m,
+ mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg()) ? -1 : 0;
+ #else
+ /* (needed by EAP_PWD, SAE, DPP) */
+ wpa_printf(MSG_ERROR,
+ "mbedtls 2.27.0 or later required for mbedtls_mpi_random()");
+ return -1;
+ #endif
+}
+
+int crypto_bignum_add(const struct crypto_bignum *a,
+ const struct crypto_bignum *b,
+ struct crypto_bignum *c)
+{
+ return mbedtls_mpi_add_mpi((mbedtls_mpi *)c,
+ (const mbedtls_mpi *)a,
+ (const mbedtls_mpi *)b) ? -1 : 0;
+}
+
+int crypto_bignum_mod(const struct crypto_bignum *a,
+ const struct crypto_bignum *b,
+ struct crypto_bignum *c)
+{
+ return mbedtls_mpi_mod_mpi((mbedtls_mpi *)c,
+ (const mbedtls_mpi *)a,
+ (const mbedtls_mpi *)b) ? -1 : 0;
+}
+
+int crypto_bignum_exptmod(const struct crypto_bignum *a,
+ const struct crypto_bignum *b,
+ const struct crypto_bignum *c,
+ struct crypto_bignum *d)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ /* (check if input params match d; d is the result) */
+ /* (a == d) is ok in current mbedtls implementation */
+ if (b == d || c == d) { /*(not ok; store result in intermediate)*/
+ mbedtls_mpi R;
+ mbedtls_mpi_init(&R);
+ int rc = mbedtls_mpi_exp_mod(&R,
+ (const mbedtls_mpi *)a,
+ (const mbedtls_mpi *)b,
+ (const mbedtls_mpi *)c,
+ NULL)
+ || mbedtls_mpi_copy((mbedtls_mpi *)d, &R) ? -1 : 0;
+ mbedtls_mpi_free(&R);
+ return rc;
+ }
+ else {
+ return mbedtls_mpi_exp_mod((mbedtls_mpi *)d,
+ (const mbedtls_mpi *)a,
+ (const mbedtls_mpi *)b,
+ (const mbedtls_mpi *)c,
+ NULL) ? -1 : 0;
+ }
+}
+
+int crypto_bignum_inverse(const struct crypto_bignum *a,
+ const struct crypto_bignum *b,
+ struct crypto_bignum *c)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ return mbedtls_mpi_inv_mod((mbedtls_mpi *)c,
+ (const mbedtls_mpi *)a,
+ (const mbedtls_mpi *)b) ? -1 : 0;
+}
+
+int crypto_bignum_sub(const struct crypto_bignum *a,
+ const struct crypto_bignum *b,
+ struct crypto_bignum *c)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ return mbedtls_mpi_sub_mpi((mbedtls_mpi *)c,
+ (const mbedtls_mpi *)a,
+ (const mbedtls_mpi *)b) ? -1 : 0;
+}
+
+int crypto_bignum_div(const struct crypto_bignum *a,
+ const struct crypto_bignum *b,
+ struct crypto_bignum *c)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ /*(most current use of this crypto.h interface has a == c (result),
+ * so store result in an intermediate to avoid overwritten input)*/
+ mbedtls_mpi R;
+ mbedtls_mpi_init(&R);
+ int rc = mbedtls_mpi_div_mpi(&R, NULL,
+ (const mbedtls_mpi *)a,
+ (const mbedtls_mpi *)b)
+ || mbedtls_mpi_copy((mbedtls_mpi *)c, &R) ? -1 : 0;
+ mbedtls_mpi_free(&R);
+ return rc;
+}
+
+int crypto_bignum_addmod(const struct crypto_bignum *a,
+ const struct crypto_bignum *b,
+ const struct crypto_bignum *c,
+ struct crypto_bignum *d)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ return mbedtls_mpi_add_mpi((mbedtls_mpi *)d,
+ (const mbedtls_mpi *)a,
+ (const mbedtls_mpi *)b)
+ || mbedtls_mpi_mod_mpi((mbedtls_mpi *)d,
+ (mbedtls_mpi *)d,
+ (const mbedtls_mpi *)c) ? -1 : 0;
+}
+
+int crypto_bignum_mulmod(const struct crypto_bignum *a,
+ const struct crypto_bignum *b,
+ const struct crypto_bignum *c,
+ struct crypto_bignum *d)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ return mbedtls_mpi_mul_mpi((mbedtls_mpi *)d,
+ (const mbedtls_mpi *)a,
+ (const mbedtls_mpi *)b)
+ || mbedtls_mpi_mod_mpi((mbedtls_mpi *)d,
+ (mbedtls_mpi *)d,
+ (const mbedtls_mpi *)c) ? -1 : 0;
+}
+
+int crypto_bignum_sqrmod(const struct crypto_bignum *a,
+ const struct crypto_bignum *b,
+ struct crypto_bignum *c)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ #if 1
+ return crypto_bignum_mulmod(a, a, b, c);
+ #else
+ mbedtls_mpi bn;
+ mbedtls_mpi_init(&bn);
+ if (mbedtls_mpi_lset(&bn, 2)) /* alt?: mbedtls_mpi_set_bit(&bn, 1) */
+ return -1;
+ int ret = mbedtls_mpi_exp_mod((mbedtls_mpi *)c,
+ (const mbedtls_mpi *)a, &bn,
+ (const mbedtls_mpi *)b, NULL) ? -1 : 0;
+ mbedtls_mpi_free(&bn);
+ return ret;
+ #endif
+}
+
+int crypto_bignum_rshift(const struct crypto_bignum *a, int n,
+ struct crypto_bignum *r)
+{
+ return mbedtls_mpi_copy((mbedtls_mpi *)r, (const mbedtls_mpi *)a)
+ || mbedtls_mpi_shift_r((mbedtls_mpi *)r, n) ? -1 : 0;
+}
+
+int crypto_bignum_cmp(const struct crypto_bignum *a,
+ const struct crypto_bignum *b)
+{
+ return mbedtls_mpi_cmp_mpi((const mbedtls_mpi *)a, (const mbedtls_mpi *)b);
+}
+
+int crypto_bignum_is_zero(const struct crypto_bignum *a)
+{
+ /* XXX: src/common/sae.c:sswu() contains comment:
+ * "TODO: Make sure crypto_bignum_is_zero() is constant time"
+ * Note: mbedtls_mpi_cmp_int() *is not* constant time */
+ return (mbedtls_mpi_cmp_int((const mbedtls_mpi *)a, 0) == 0);
+}
+
+int crypto_bignum_is_one(const struct crypto_bignum *a)
+{
+ return (mbedtls_mpi_cmp_int((const mbedtls_mpi *)a, 1) == 0);
+}
+
+int crypto_bignum_is_odd(const struct crypto_bignum *a)
+{
+ return mbedtls_mpi_get_bit((const mbedtls_mpi *)a, 0);
+}
+
+#include "utils/const_time.h"
+int crypto_bignum_legendre(const struct crypto_bignum *a,
+ const struct crypto_bignum *p)
+{
+ if (TEST_FAIL())
+ return -2;
+
+ /* Security Note:
+ * mbedtls_mpi_exp_mod() is not documented to run in constant time,
+ * though mbedtls/library/bignum.c uses constant_time_internal.h funcs.
+ * Compare to crypto_openssl.c:crypto_bignum_legendre()
+ * which uses openssl BN_mod_exp_mont_consttime()
+ * mbedtls/library/ecp.c has further countermeasures to timing attacks,
+ * (but ecp.c funcs are not used here) */
+
+ mbedtls_mpi exp, tmp;
+ mbedtls_mpi_init(&exp);
+ mbedtls_mpi_init(&tmp);
+
+ /* exp = (p-1) / 2 */
+ int res;
+ if (mbedtls_mpi_sub_int(&exp, (const mbedtls_mpi *)p, 1) == 0
+ && mbedtls_mpi_shift_r(&exp, 1) == 0
+ && mbedtls_mpi_exp_mod(&tmp, (const mbedtls_mpi *)a, &exp,
+ (const mbedtls_mpi *)p, NULL) == 0) {
+ /*(modified from crypto_openssl.c:crypto_bignum_legendre())*/
+ /* Return 1 if tmp == 1, 0 if tmp == 0, or -1 otherwise. Need
+ * to use constant time selection to avoid branches here. */
+ unsigned int mask;
+ res = -1;
+ mask = const_time_eq((mbedtls_mpi_cmp_int(&tmp, 1) == 0), 1);
+ res = const_time_select_int(mask, 1, res);
+ mask = const_time_eq((mbedtls_mpi_cmp_int(&tmp, 0) == 0), 1);
+ res = const_time_select_int(mask, 0, res);
+ } else {
+ res = -2;
+ }
+
+ mbedtls_mpi_free(&tmp);
+ mbedtls_mpi_free(&exp);
+ return res;
+}
+
+#endif /* CRYPTO_MBEDTLS_CRYPTO_BIGNUM */
+
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_DH
+
+/* crypto_internal-modexp.c */
+
+#include <mbedtls/bignum.h>
+#include <mbedtls/dhm.h>
+
+#if 0 /* crypto_dh_init() and crypto_dh_derive_secret() prefer to use mbedtls */
+int crypto_mod_exp(const u8 *base, size_t base_len,
+ const u8 *power, size_t power_len,
+ const u8 *modulus, size_t modulus_len,
+ u8 *result, size_t *result_len)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ mbedtls_mpi bn_base, bn_exp, bn_modulus, bn_result;
+ mbedtls_mpi_init(&bn_base);
+ mbedtls_mpi_init(&bn_exp);
+ mbedtls_mpi_init(&bn_modulus);
+ mbedtls_mpi_init(&bn_result);
+
+ size_t len;
+ int ret = mbedtls_mpi_read_binary(&bn_base, base, base_len)
+ || mbedtls_mpi_read_binary(&bn_exp, power, power_len)
+ || mbedtls_mpi_read_binary(&bn_modulus, modulus, modulus_len)
+ || mbedtls_mpi_exp_mod(&bn_result,&bn_base,&bn_exp,&bn_modulus,NULL)
+ || (len = mbedtls_mpi_size(&bn_result)) > *result_len
+ || mbedtls_mpi_write_binary(&bn_result, result, (*result_len = len))
+ ? -1
+ : 0;
+
+ mbedtls_mpi_free(&bn_base);
+ mbedtls_mpi_free(&bn_exp);
+ mbedtls_mpi_free(&bn_modulus);
+ mbedtls_mpi_free(&bn_result);
+ return ret;
+}
+#endif
+
+static int crypto_mbedtls_dh_set_bin_pg(mbedtls_dhm_context *ctx, u8 generator,
+ const u8 *prime, size_t prime_len)
+{
+ /*(could set these directly in MBEDTLS_PRIVATE members)*/
+ mbedtls_mpi P, G;
+ mbedtls_mpi_init(&P);
+ mbedtls_mpi_init(&G);
+ int ret = mbedtls_mpi_lset(&G, generator)
+ || mbedtls_mpi_read_binary(&P, prime, prime_len)
+ || mbedtls_dhm_set_group(ctx, &P, &G);
+ mbedtls_mpi_free(&P);
+ mbedtls_mpi_free(&G);
+ return ret;
+}
+
+__attribute_noinline__
+static int crypto_mbedtls_dh_init_public(mbedtls_dhm_context *ctx, u8 generator,
+ const u8 *prime, size_t prime_len,
+ u8 *privkey, u8 *pubkey)
+{
+ if (crypto_mbedtls_dh_set_bin_pg(ctx, generator, prime, prime_len)
+ || mbedtls_dhm_make_public(ctx, (int)prime_len, pubkey, prime_len,
+ mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg()))
+ return -1;
+
+ /*(enable later when upstream mbedtls interface changes require)*/
+ #if 0 && MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
+ mbedtls_mpi X;
+ mbedtls_mpi_init(&X);
+ int ret = mbedtls_dhm_get_value(ctx, MBEDTLS_DHM_PARAM_X, &X)
+ || mbedtls_mpi_write_binary(&X, privkey, prime_len) ? -1 : 0;
+ mbedtls_mpi_free(&X);
+ return ret;
+ #else
+ return mbedtls_mpi_write_binary(&ctx->MBEDTLS_PRIVATE(X),
+ privkey, prime_len) ? -1 : 0;
+ #endif
+}
+
+int crypto_dh_init(u8 generator, const u8 *prime, size_t prime_len, u8 *privkey,
+ u8 *pubkey)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ #if 0 /*(crypto_dh_init() duplicated (and identical) in crypto_*.c modules)*/
+ size_t pubkey_len, pad;
+
+ if (os_get_random(privkey, prime_len) < 0)
+ return -1;
+ if (os_memcmp(privkey, prime, prime_len) > 0) {
+ /* Make sure private value is smaller than prime */
+ privkey[0] = 0;
+ }
+
+ pubkey_len = prime_len;
+ if (crypto_mod_exp(&generator, 1, privkey, prime_len, prime, prime_len,
+ pubkey, &pubkey_len) < 0)
+ return -1;
+ if (pubkey_len < prime_len) {
+ pad = prime_len - pubkey_len;
+ os_memmove(pubkey + pad, pubkey, pubkey_len);
+ os_memset(pubkey, 0, pad);
+ }
+
+ return 0;
+ #else
+ /* Prefer to use mbedtls to derive our public/private key, as doing so
+ * leverages mbedtls to properly format output and to perform blinding*/
+ mbedtls_dhm_context ctx;
+ mbedtls_dhm_init(&ctx);
+ int ret = crypto_mbedtls_dh_init_public(&ctx, generator, prime,
+ prime_len, privkey, pubkey);
+ mbedtls_dhm_free(&ctx);
+ return ret;
+ #endif
+}
+
+/*(crypto_dh_derive_secret() could be implemented using crypto.h APIs
+ * instead of being reimplemented in each crypto_*.c)*/
+int crypto_dh_derive_secret(u8 generator, const u8 *prime, size_t prime_len,
+ const u8 *order, size_t order_len,
+ const u8 *privkey, size_t privkey_len,
+ const u8 *pubkey, size_t pubkey_len,
+ u8 *secret, size_t *len)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ #if 0
+ if (pubkey_len > prime_len ||
+ (pubkey_len == prime_len &&
+ os_memcmp(pubkey, prime, prime_len) >= 0))
+ return -1;
+
+ int res = 0;
+ mbedtls_mpi pub;
+ mbedtls_mpi_init(&pub);
+ if (mbedtls_mpi_read_binary(&pub, pubkey, pubkey_len)
+ || mbedtls_mpi_cmp_int(&pub, 1) <= 0) {
+ res = -1;
+ } else if (order) {
+ mbedtls_mpi p, q, tmp;
+ mbedtls_mpi_init(&p);
+ mbedtls_mpi_init(&q);
+ mbedtls_mpi_init(&tmp);
+
+ /* verify: pubkey^q == 1 mod p */
+ res = (mbedtls_mpi_read_binary(&p, prime, prime_len)
+ || mbedtls_mpi_read_binary(&q, order, order_len)
+ || mbedtls_mpi_exp_mod(&tmp, &pub, &q, &p, NULL)
+ || mbedtls_mpi_cmp_int(&tmp, 1) != 0);
+
+ mbedtls_mpi_free(&p);
+ mbedtls_mpi_free(&q);
+ mbedtls_mpi_free(&tmp);
+ }
+ mbedtls_mpi_free(&pub);
+
+ return (res == 0)
+ ? crypto_mod_exp(pubkey, pubkey_len, privkey, privkey_len,
+ prime, prime_len, secret, len)
+ : -1;
+ #else
+ /* Prefer to use mbedtls to derive DH shared secret, as doing so
+ * leverages mbedtls to validate params and to perform blinding.
+ *
+ * Attempt to reconstitute DH context to derive shared secret
+ * (due to limitations of the interface, which ought to pass context).
+ * Force provided G (our private key) into context without validation.
+ * Regenerating GX (our public key) not needed to derive shared secret.
+ */
+ /*(older compilers might not support VLAs)*/
+ /*unsigned char buf[2+prime_len+2+1+2+pubkey_len];*/
+ unsigned char buf[2+MBEDTLS_MPI_MAX_SIZE+2+1+2+MBEDTLS_MPI_MAX_SIZE];
+ unsigned char *p = buf + 2 + prime_len;
+ if (2+prime_len+2+1+2+pubkey_len > sizeof(buf))
+ return -1;
+ WPA_PUT_BE16(buf, prime_len); /*(2-byte big-endian size of prime)*/
+ p[0] = 0; /*(2-byte big-endian size of generator)*/
+ p[1] = 1;
+ p[2] = generator;
+ WPA_PUT_BE16(p+3, pubkey_len); /*(2-byte big-endian size of pubkey)*/
+ os_memcpy(p+5, pubkey, pubkey_len);
+ os_memcpy(buf+2, prime, prime_len);
+
+ mbedtls_dhm_context ctx;
+ mbedtls_dhm_init(&ctx);
+ p = buf;
+ int ret = mbedtls_dhm_read_params(&ctx, &p, p+2+prime_len+5+pubkey_len)
+ || mbedtls_mpi_read_binary(&ctx.MBEDTLS_PRIVATE(X),
+ privkey, privkey_len)
+ || mbedtls_dhm_calc_secret(&ctx, secret, *len, len,
+ mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg()) ? -1 : 0;
+ mbedtls_dhm_free(&ctx);
+ return ret;
+ #endif
+}
+
+/* dh_group5.c */
+
+#include "dh_group5.h"
+
+/* RFC3526_PRIME_1536[] and RFC3526_GENERATOR_1536[] from crypto_wolfssl.c */
+
+static const unsigned char RFC3526_PRIME_1536[] = {
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2,
+ 0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
+ 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6,
+ 0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
+ 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D,
+ 0xF2, 0x5F, 0x14, 0x37, 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45,
+ 0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6, 0xF4, 0x4C, 0x42, 0xE9,
+ 0xA6, 0x37, 0xED, 0x6B, 0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED,
+ 0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE, 0x9F, 0x24, 0x11,
+ 0x7C, 0x4B, 0x1F, 0xE6, 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE4, 0x5B, 0x3D,
+ 0xC2, 0x00, 0x7C, 0xB8, 0xA1, 0x63, 0xBF, 0x05, 0x98, 0xDA, 0x48, 0x36,
+ 0x1C, 0x55, 0xD3, 0x9A, 0x69, 0x16, 0x3F, 0xA8, 0xFD, 0x24, 0xCF, 0x5F,
+ 0x83, 0x65, 0x5D, 0x23, 0xDC, 0xA3, 0xAD, 0x96, 0x1C, 0x62, 0xF3, 0x56,
+ 0x20, 0x85, 0x52, 0xBB, 0x9E, 0xD5, 0x29, 0x07, 0x70, 0x96, 0x96, 0x6D,
+ 0x67, 0x0C, 0x35, 0x4E, 0x4A, 0xBC, 0x98, 0x04, 0xF1, 0x74, 0x6C, 0x08,
+ 0xCA, 0x23, 0x73, 0x27, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+static const unsigned char RFC3526_GENERATOR_1536[] = {
+ 0x02
+};
+
+void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
+{
+ const unsigned char * const prime = RFC3526_PRIME_1536;
+ const size_t prime_len = sizeof(RFC3526_PRIME_1536);
+ const u8 generator = *RFC3526_GENERATOR_1536;
+ struct wpabuf *wpubl = NULL, *wpriv = NULL;
+
+ mbedtls_dhm_context *ctx = os_malloc(sizeof(*ctx));
+ if (ctx == NULL)
+ return NULL;
+ mbedtls_dhm_init(ctx);
+
+ if ( (wpubl = wpabuf_alloc(prime_len))
+ && (wpriv = wpabuf_alloc(prime_len))
+ && crypto_mbedtls_dh_init_public(ctx, generator, prime, prime_len,
+ wpabuf_put(wpriv, prime_len),
+ wpabuf_put(wpubl, prime_len))==0) {
+ wpabuf_free(*publ);
+ wpabuf_clear_free(*priv);
+ *publ = wpubl;
+ *priv = wpriv;
+ return ctx;
+ }
+
+ wpabuf_clear_free(wpriv);
+ wpabuf_free(wpubl);
+ mbedtls_dhm_free(ctx);
+ os_free(ctx);
+ return NULL;
+}
+
+#ifdef CRYPTO_MBEDTLS_DH5_INIT_FIXED
+void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
+{
+ const unsigned char * const prime = RFC3526_PRIME_1536;
+ const size_t prime_len = sizeof(RFC3526_PRIME_1536);
+ const u8 generator = *RFC3526_GENERATOR_1536;
+
+ mbedtls_dhm_context *ctx = os_malloc(sizeof(*ctx));
+ if (ctx == NULL)
+ return NULL;
+ mbedtls_dhm_init(ctx);
+
+ if (crypto_mbedtls_dh_set_bin_pg(ctx, generator, prime, prime_len)==0
+ #if 0 /*(ignore; not required to derive shared secret)*/
+ && mbedtls_mpi_read_binary(&ctx->MBEDTLS_PRIVATE(GX),
+ wpabuf_head(publ),wpabuf_len(publ))==0
+ #endif
+ && mbedtls_mpi_read_binary(&ctx->MBEDTLS_PRIVATE(X),
+ wpabuf_head(priv),wpabuf_len(priv))==0) {
+ return ctx;
+ }
+
+ mbedtls_dhm_free(ctx);
+ os_free(ctx);
+ return NULL;
+}
+#endif
+
+struct wpabuf * dh5_derive_shared(void *ctx, const struct wpabuf *peer_public,
+ const struct wpabuf *own_private)
+{
+ /*((mbedtls_dhm_context *)ctx must already contain own_private)*/
+ /* mbedtls 2.x: prime_len = ctx->len; */
+ /* mbedtls 3.x: prime_len = mbedtls_dhm_get_len(ctx); */
+ size_t olen = sizeof(RFC3526_PRIME_1536); /*(sizeof(); prime known)*/
+ struct wpabuf *buf = wpabuf_alloc(olen);
+ if (buf == NULL)
+ return NULL;
+ if (mbedtls_dhm_read_public((mbedtls_dhm_context *)ctx,
+ wpabuf_head(peer_public),
+ wpabuf_len(peer_public)) == 0
+ && mbedtls_dhm_calc_secret(ctx, wpabuf_mhead(buf), olen, &olen,
+ mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg()) == 0) {
+ wpabuf_put(buf, olen);
+ return buf;
+ }
+
+ wpabuf_free(buf);
+ return NULL;
+}
+
+void dh5_free(void *ctx)
+{
+ mbedtls_dhm_free(ctx);
+ os_free(ctx);
+}
+
+#endif /* CRYPTO_MBEDTLS_CRYPTO_DH */
+
+
+#if defined(CRYPTO_MBEDTLS_CRYPTO_ECDH) || defined(CRYPTO_MBEDTLS_CRYPTO_EC)
+
+#include <mbedtls/ecp.h>
+
+#define CRYPTO_EC_pbits(e) (((mbedtls_ecp_group *)(e))->pbits)
+#define CRYPTO_EC_plen(e) ((((mbedtls_ecp_group *)(e))->pbits+7)>>3)
+#define CRYPTO_EC_P(e) (&((mbedtls_ecp_group *)(e))->P)
+#define CRYPTO_EC_N(e) (&((mbedtls_ecp_group *)(e))->N)
+#define CRYPTO_EC_A(e) (&((mbedtls_ecp_group *)(e))->A)
+#define CRYPTO_EC_B(e) (&((mbedtls_ecp_group *)(e))->B)
+#define CRYPTO_EC_G(e) (&((mbedtls_ecp_group *)(e))->G)
+
+static mbedtls_ecp_group_id crypto_mbedtls_ecp_group_id_from_ike_id(int group)
+{
+ /* https://www.iana.org/assignments/ikev2-parameters/ikev2-parameters.xhtml */
+ switch (group) {
+ #ifdef MBEDTLS_ECP_DP_SECP256R1_ENABLED
+ case 19: return MBEDTLS_ECP_DP_SECP256R1;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_SECP384R1_ENABLED
+ case 20: return MBEDTLS_ECP_DP_SECP384R1;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_SECP521R1_ENABLED
+ case 21: return MBEDTLS_ECP_DP_SECP521R1;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_SECP192R1_ENABLED
+ case 25: return MBEDTLS_ECP_DP_SECP192R1;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_SECP224R1_ENABLED
+ case 26: return MBEDTLS_ECP_DP_SECP224R1;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_BP256R1_ENABLED
+ case 28: return MBEDTLS_ECP_DP_BP256R1;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_BP384R1_ENABLED
+ case 29: return MBEDTLS_ECP_DP_BP384R1;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_BP512R1_ENABLED
+ case 30: return MBEDTLS_ECP_DP_BP512R1;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_CURVE25519_ENABLED
+ case 31: return MBEDTLS_ECP_DP_CURVE25519;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_CURVE448_ENABLED
+ case 32: return MBEDTLS_ECP_DP_CURVE448;
+ #endif
+ default: return MBEDTLS_ECP_DP_NONE;
+ }
+}
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_EC
+static int crypto_mbedtls_ike_id_from_ecp_group_id(mbedtls_ecp_group_id grp_id)
+{
+ /* https://www.iana.org/assignments/ikev2-parameters/ikev2-parameters.xhtml */
+ /*(for crypto_ec_key_group())*/
+ switch (grp_id) {
+ #ifdef MBEDTLS_ECP_DP_SECP256R1_ENABLED
+ case MBEDTLS_ECP_DP_SECP256R1: return 19;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_SECP384R1_ENABLED
+ case MBEDTLS_ECP_DP_SECP384R1: return 20;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_SECP521R1_ENABLED
+ case MBEDTLS_ECP_DP_SECP521R1: return 21;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_SECP192R1_ENABLED
+ case MBEDTLS_ECP_DP_SECP192R1: return 25;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_SECP224R1_ENABLED
+ case MBEDTLS_ECP_DP_SECP224R1: return 26;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_BP256R1_ENABLED
+ case MBEDTLS_ECP_DP_BP256R1: return 28;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_BP384R1_ENABLED
+ case MBEDTLS_ECP_DP_BP384R1: return 29;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_BP512R1_ENABLED
+ case MBEDTLS_ECP_DP_BP512R1: return 30;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_CURVE25519_ENABLED
+ case MBEDTLS_ECP_DP_CURVE25519: return 31;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_CURVE448_ENABLED
+ case MBEDTLS_ECP_DP_CURVE448: return 32;
+ #endif
+ default: return -1;
+ }
+}
+#endif
+
+#endif /* CRYPTO_MBEDTLS_CRYPTO_ECDH || CRYPTO_MBEDTLS_CRYPTO_EC */
+
+
+#if defined(CRYPTO_MBEDTLS_CRYPTO_ECDH) || defined(CRYPTO_MBEDTLS_CRYPTO_EC_DPP)
+
+#include <mbedtls/ecp.h>
+#include <mbedtls/pk.h>
+
+static int crypto_mbedtls_keypair_gen(int group, mbedtls_pk_context *pk)
+{
+ mbedtls_ecp_group_id grp_id =
+ crypto_mbedtls_ecp_group_id_from_ike_id(group);
+ if (grp_id == MBEDTLS_ECP_DP_NONE)
+ return -1;
+ const mbedtls_pk_info_t *pk_info =
+ mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY);
+ if (pk_info == NULL)
+ return -1;
+ return mbedtls_pk_setup(pk, pk_info)
+ || mbedtls_ecp_gen_key(grp_id, mbedtls_pk_ec(*pk),
+ mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg()) ? -1 : 0;
+}
+
+#endif
+
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_ECDH
+
+#include <mbedtls/ecdh.h>
+#include <mbedtls/ecdsa.h>
+#include <mbedtls/ecp.h>
+#include <mbedtls/pk.h>
+
+/* wrap mbedtls_ecdh_context for more future-proof direct access to components
+ * (mbedtls_ecdh_context internal implementation may change between releases)
+ *
+ * If mbedtls_pk_context -- specifically underlying mbedtls_ecp_keypair --
+ * lifetime were guaranteed to be longer than that of mbedtls_ecdh_context,
+ * then mbedtls_pk_context or mbedtls_ecp_keypair could be stored in crypto_ecdh
+ * (or crypto_ec_key could be stored in crypto_ecdh, and crypto_ec_key could
+ * wrap mbedtls_ecp_keypair and components, to avoid MBEDTLS_PRIVATE access) */
+struct crypto_ecdh {
+ mbedtls_ecdh_context ctx;
+ mbedtls_ecp_group grp;
+ mbedtls_ecp_point Q;
+};
+
+struct crypto_ecdh * crypto_ecdh_init(int group)
+{
+ mbedtls_pk_context pk;
+ mbedtls_pk_init(&pk);
+ struct crypto_ecdh *ecdh = crypto_mbedtls_keypair_gen(group, &pk) == 0
+ ? crypto_ecdh_init2(group, (struct crypto_ec_key *)&pk)
+ : NULL;
+ mbedtls_pk_free(&pk);
+ return ecdh;
+}
+
+struct crypto_ecdh * crypto_ecdh_init2(int group,
+ struct crypto_ec_key *own_key)
+{
+ mbedtls_ecp_group_id grp_id =
+ crypto_mbedtls_ecp_group_id_from_ike_id(group);
+ if (grp_id == MBEDTLS_ECP_DP_NONE)
+ return NULL;
+ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)own_key);
+ struct crypto_ecdh *ecdh = os_malloc(sizeof(*ecdh));
+ if (ecdh == NULL)
+ return NULL;
+ mbedtls_ecdh_init(&ecdh->ctx);
+ mbedtls_ecp_group_init(&ecdh->grp);
+ mbedtls_ecp_point_init(&ecdh->Q);
+ if (mbedtls_ecdh_setup(&ecdh->ctx, grp_id) == 0
+ && mbedtls_ecdh_get_params(&ecdh->ctx,ecp_kp,MBEDTLS_ECDH_OURS) == 0) {
+ /* copy grp and Q for later use
+ * (retrieving this info later is more convoluted
+ * even if mbedtls_ecdh_make_public() is considered)*/
+ #if MBEDTLS_VERSION_NUMBER >= 0x03020000 /* mbedtls 3.2.0 */
+ mbedtls_mpi d;
+ mbedtls_mpi_init(&d);
+ if (mbedtls_ecp_export(ecp_kp, &ecdh->grp, &d, &ecdh->Q) == 0) {
+ mbedtls_mpi_free(&d);
+ return ecdh;
+ }
+ mbedtls_mpi_free(&d);
+ #else
+ if (mbedtls_ecp_group_load(&ecdh->grp, grp_id) == 0
+ && mbedtls_ecp_copy(&ecdh->Q, &ecp_kp->MBEDTLS_PRIVATE(Q)) == 0)
+ return ecdh;
+ #endif
+ }
+
+ mbedtls_ecp_point_free(&ecdh->Q);
+ mbedtls_ecp_group_free(&ecdh->grp);
+ mbedtls_ecdh_free(&ecdh->ctx);
+ os_free(ecdh);
+ return NULL;
+}
+
+struct wpabuf * crypto_ecdh_get_pubkey(struct crypto_ecdh *ecdh, int inc_y)
+{
+ mbedtls_ecp_group *grp = &ecdh->grp;
+ size_t prime_len = CRYPTO_EC_plen(grp);
+ size_t output_len = prime_len;
+ u8 output_offset = 0;
+ u8 buf[256];
+
+ #ifdef MBEDTLS_ECP_MONTGOMERY_ENABLED
+ /* len */
+ #endif
+ #ifdef MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED
+ if (mbedtls_ecp_get_type(grp) == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS) {
+ output_len = inc_y ? prime_len * 2 + 1 : prime_len + 1;
+ output_offset = 1;
+ }
+ #endif
+
+ if (output_len > sizeof(buf))
+ return NULL;
+
+ inc_y = inc_y ? MBEDTLS_ECP_PF_UNCOMPRESSED : MBEDTLS_ECP_PF_COMPRESSED;
+ if (mbedtls_ecp_point_write_binary(grp, &ecdh->Q, inc_y, &output_len,
+ buf, output_len) == 0) {
+ return wpabuf_alloc_copy(buf + output_offset, output_len - output_offset);
+ }
+
+ return NULL;
+}
+
+#if defined(MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED)
+static int crypto_mbedtls_short_weierstrass_derive_y(mbedtls_ecp_group *grp,
+ mbedtls_mpi *bn,
+ int parity_bit)
+{
+ /* y^2 = x^3 + ax + b
+ * sqrt(w) = w^((p+1)/4) mod p (for prime p where p = 3 mod 4) */
+ mbedtls_mpi *cy2 = (mbedtls_mpi *)
+ crypto_ec_point_compute_y_sqr((struct crypto_ec *)grp,
+ (const struct crypto_bignum *)bn); /*x*/
+ if (cy2 == NULL)
+ return -1;
+
+ /*mbedtls_mpi_free(bn);*/
+ /*(reuse bn to store result (y))*/
+
+ mbedtls_mpi exp;
+ mbedtls_mpi_init(&exp);
+ int ret = mbedtls_mpi_get_bit(&grp->P, 0) != 1 /*(p = 3 mod 4)*/
+ || mbedtls_mpi_get_bit(&grp->P, 1) != 1 /*(p = 3 mod 4)*/
+ || mbedtls_mpi_add_int(&exp, &grp->P, 1)
+ || mbedtls_mpi_shift_r(&exp, 2)
+ || mbedtls_mpi_exp_mod(bn, cy2, &exp, &grp->P, NULL)
+ || (mbedtls_mpi_get_bit(bn, 0) != parity_bit
+ && mbedtls_mpi_sub_mpi(bn, &grp->P, bn));
+ mbedtls_mpi_free(&exp);
+ mbedtls_mpi_free(cy2);
+ os_free(cy2);
+ return ret;
+}
+#endif
+
+struct wpabuf * crypto_ecdh_set_peerkey(struct crypto_ecdh *ecdh, int inc_y,
+ const u8 *key, size_t len)
+{
+ if (len == 0) /*(invalid peer key)*/
+ return NULL;
+
+ mbedtls_ecp_group *grp = &ecdh->grp;
+
+ #if defined(MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED)
+ if (mbedtls_ecp_get_type(grp) == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS) {
+ /* add header for mbedtls_ecdh_read_public() */
+ u8 buf[256];
+ if (sizeof(buf)-1 < len)
+ return NULL;
+ buf[0] = (u8)(len);
+ os_memcpy(buf+1, key, len);
+
+ if (inc_y) {
+ if (!(len & 1)) { /*(dpp code/tests does not include tag?!?)*/
+ if (sizeof(buf)-2 < len)
+ return NULL;
+ buf[0] = (u8)(1+len);
+ buf[1] = 0x04;
+ os_memcpy(buf+2, key, len);
+ }
+ len >>= 1; /*(repurpose len to prime_len)*/
+ } else { /* (inc_y == 0) */
+ /* mbedtls_ecp_point_read_binary() does not currently support
+ * MBEDTLS_ECP_PF_COMPRESSED format (buf[1] = 0x02 or 0x03)
+ * (returns MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE) */
+
+ /* derive y, amend buf[] with y for UNCOMPRESSED format */
+ if (sizeof(buf)-2 < len*2 || len == 0)
+ return NULL;
+
+ buf[0] = (u8)(1+len*2);
+ buf[1] = 0x04;
+ os_memcpy(buf+2, key, len);
+
+ mbedtls_mpi bn;
+ mbedtls_mpi_init(&bn);
+ int ret = mbedtls_mpi_read_binary(&bn, key, len)
+ || crypto_mbedtls_short_weierstrass_derive_y(grp, &bn, 0)
+ || mbedtls_mpi_write_binary(&bn, buf+2+len, len);
+ mbedtls_mpi_free(&bn);
+ if (ret != 0)
+ return NULL;
+ }
+
+ if (mbedtls_ecdh_read_public(&ecdh->ctx, buf, buf[0]+1))
+ return NULL;
+ }
+ #endif
+ #if defined(MBEDTLS_ECP_MONTGOMERY_ENABLED)
+ if (mbedtls_ecp_get_type(grp) == MBEDTLS_ECP_TYPE_MONTGOMERY) {
+ if (mbedtls_ecdh_read_public(&ecdh->ctx, key, len))
+ return NULL;
+ }
+ #endif
+
+ struct wpabuf *buf = wpabuf_alloc(len);
+ if (buf == NULL)
+ return NULL;
+
+ if (mbedtls_ecdh_calc_secret(&ecdh->ctx, &len,
+ wpabuf_mhead(buf), len,
+ mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg()) == 0) {
+ wpabuf_put(buf, len);
+ return buf;
+ }
+
+ wpabuf_clear_free(buf);
+ return NULL;
+}
+
+void crypto_ecdh_deinit(struct crypto_ecdh *ecdh)
+{
+ if (ecdh == NULL)
+ return;
+ mbedtls_ecp_point_free(&ecdh->Q);
+ mbedtls_ecp_group_free(&ecdh->grp);
+ mbedtls_ecdh_free(&ecdh->ctx);
+ os_free(ecdh);
+}
+
+size_t crypto_ecdh_prime_len(struct crypto_ecdh *ecdh)
+{
+ return CRYPTO_EC_plen(&ecdh->grp);
+}
+
+#endif /* CRYPTO_MBEDTLS_CRYPTO_ECDH */
+
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_EC
+
+#include <mbedtls/ecp.h>
+
+struct crypto_ec *crypto_ec_init(int group)
+{
+ mbedtls_ecp_group_id grp_id =
+ crypto_mbedtls_ecp_group_id_from_ike_id(group);
+ if (grp_id == MBEDTLS_ECP_DP_NONE)
+ return NULL;
+ mbedtls_ecp_group *e = os_malloc(sizeof(*e));
+ if (e == NULL)
+ return NULL;
+ mbedtls_ecp_group_init(e);
+ if (mbedtls_ecp_group_load(e, grp_id) == 0)
+ return (struct crypto_ec *)e;
+
+ mbedtls_ecp_group_free(e);
+ os_free(e);
+ return NULL;
+}
+
+void crypto_ec_deinit(struct crypto_ec *e)
+{
+ mbedtls_ecp_group_free((mbedtls_ecp_group *)e);
+ os_free(e);
+}
+
+size_t crypto_ec_prime_len(struct crypto_ec *e)
+{
+ return CRYPTO_EC_plen(e);
+}
+
+size_t crypto_ec_prime_len_bits(struct crypto_ec *e)
+{
+ return CRYPTO_EC_pbits(e);
+}
+
+size_t crypto_ec_order_len(struct crypto_ec *e)
+{
+ return (mbedtls_mpi_bitlen(CRYPTO_EC_N(e)) + 7) / 8;
+}
+
+const struct crypto_bignum *crypto_ec_get_prime(struct crypto_ec *e)
+{
+ return (const struct crypto_bignum *)CRYPTO_EC_P(e);
+}
+
+const struct crypto_bignum *crypto_ec_get_order(struct crypto_ec *e)
+{
+ return (const struct crypto_bignum *)CRYPTO_EC_N(e);
+}
+
+const struct crypto_bignum *crypto_ec_get_a(struct crypto_ec *e)
+{
+ static const uint8_t secp256r1_a[] =
+ {0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x01,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfc};
+ static const uint8_t secp384r1_a[] =
+ {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,
+ 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xfc};
+ static const uint8_t secp521r1_a[] =
+ {0x01,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xfc};
+ static const uint8_t secp192r1_a[] =
+ {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfc};
+ static const uint8_t secp224r1_a[] =
+ {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xfe};
+
+ const uint8_t *bin = NULL;
+ size_t len = 0;
+
+ /* (mbedtls groups matching supported sswu_curve_param() IKE groups) */
+ switch (((mbedtls_ecp_group *)e)->id) {
+ #ifdef MBEDTLS_ECP_DP_SECP256R1_ENABLED
+ case MBEDTLS_ECP_DP_SECP256R1:
+ bin = secp256r1_a;
+ len = sizeof(secp256r1_a);
+ break;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_SECP384R1_ENABLED
+ case MBEDTLS_ECP_DP_SECP384R1:
+ bin = secp384r1_a;
+ len = sizeof(secp384r1_a);
+ break;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_SECP521R1_ENABLED
+ case MBEDTLS_ECP_DP_SECP521R1:
+ bin = secp521r1_a;
+ len = sizeof(secp521r1_a);
+ break;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_SECP192R1_ENABLED
+ case MBEDTLS_ECP_DP_SECP192R1:
+ bin = secp192r1_a;
+ len = sizeof(secp192r1_a);
+ break;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_SECP224R1_ENABLED
+ case MBEDTLS_ECP_DP_SECP224R1:
+ bin = secp224r1_a;
+ len = sizeof(secp224r1_a);
+ break;
+ #endif
+ #ifdef MBEDTLS_ECP_DP_BP256R1_ENABLED
+ case MBEDTLS_ECP_DP_BP256R1:
+ return (const struct crypto_bignum *)CRYPTO_EC_A(e);
+ #endif
+ #ifdef MBEDTLS_ECP_DP_BP384R1_ENABLED
+ case MBEDTLS_ECP_DP_BP384R1:
+ return (const struct crypto_bignum *)CRYPTO_EC_A(e);
+ #endif
+ #ifdef MBEDTLS_ECP_DP_BP512R1_ENABLED
+ case MBEDTLS_ECP_DP_BP512R1:
+ return (const struct crypto_bignum *)CRYPTO_EC_A(e);
+ #endif
+ #ifdef MBEDTLS_ECP_DP_CURVE25519_ENABLED
+ case MBEDTLS_ECP_DP_CURVE25519:
+ return (const struct crypto_bignum *)CRYPTO_EC_A(e);
+ #endif
+ #ifdef MBEDTLS_ECP_DP_CURVE448_ENABLED
+ case MBEDTLS_ECP_DP_CURVE448:
+ return (const struct crypto_bignum *)CRYPTO_EC_A(e);
+ #endif
+ default:
+ return NULL;
+ }
+
+ /*(note: not thread-safe; returns file-scoped static storage)*/
+ if (mbedtls_mpi_read_binary(&mpi_sw_A, bin, len) == 0)
+ return (const struct crypto_bignum *)&mpi_sw_A;
+ return NULL;
+}
+
+const struct crypto_bignum *crypto_ec_get_b(struct crypto_ec *e)
+{
+ return (const struct crypto_bignum *)CRYPTO_EC_B(e);
+}
+
+const struct crypto_ec_point * crypto_ec_get_generator(struct crypto_ec *e)
+{
+ return (const struct crypto_ec_point *)CRYPTO_EC_G(e);
+}
+
+struct crypto_ec_point *crypto_ec_point_init(struct crypto_ec *e)
+{
+ if (TEST_FAIL())
+ return NULL;
+
+ mbedtls_ecp_point *p = os_malloc(sizeof(*p));
+ if (p != NULL)
+ mbedtls_ecp_point_init(p);
+ return (struct crypto_ec_point *)p;
+}
+
+void crypto_ec_point_deinit(struct crypto_ec_point *p, int clear)
+{
+ mbedtls_ecp_point_free((mbedtls_ecp_point *)p);
+ os_free(p);
+}
+
+int crypto_ec_point_x(struct crypto_ec *e, const struct crypto_ec_point *p,
+ struct crypto_bignum *x)
+{
+ mbedtls_mpi *px = &((mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(X);
+ return mbedtls_mpi_copy((mbedtls_mpi *)x, px)
+ ? -1
+ : 0;
+}
+
+int crypto_ec_point_to_bin(struct crypto_ec *e,
+ const struct crypto_ec_point *point, u8 *x, u8 *y)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ /* crypto.h documents crypto_ec_point_to_bin() output is big-endian */
+ size_t len = CRYPTO_EC_plen(e);
+ if (x) {
+ mbedtls_mpi *px = &((mbedtls_ecp_point *)point)->MBEDTLS_PRIVATE(X);
+ if (mbedtls_mpi_write_binary(px, x, len))
+ return -1;
+ }
+ if (y) {
+ #if 0 /*(should not be necessary; py mpi should be in initial state)*/
+ #ifdef MBEDTLS_ECP_MONTGOMERY_ENABLED
+ if (mbedtls_ecp_get_type((mbedtls_ecp_group *)e)
+ == MBEDTLS_ECP_TYPE_MONTGOMERY) {
+ os_memset(y, 0, len);
+ return 0;
+ }
+ #endif
+ #endif
+ mbedtls_mpi *py = &((mbedtls_ecp_point *)point)->MBEDTLS_PRIVATE(Y);
+ if (mbedtls_mpi_write_binary(py, y, len))
+ return -1;
+ }
+ return 0;
+}
+
+struct crypto_ec_point * crypto_ec_point_from_bin(struct crypto_ec *e,
+ const u8 *val)
+{
+ if (TEST_FAIL())
+ return NULL;
+
+ size_t len = CRYPTO_EC_plen(e);
+ mbedtls_ecp_point *p = os_malloc(sizeof(*p));
+ u8 buf[1+MBEDTLS_MPI_MAX_SIZE*2];
+ if (p == NULL)
+ return NULL;
+ mbedtls_ecp_point_init(p);
+
+ #ifdef MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED
+ if (mbedtls_ecp_get_type((mbedtls_ecp_group *)e)
+ == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS) {
+ #if 0 /* prefer alternative to MBEDTLS_PRIVATE() access */
+ mbedtls_mpi *px = &((mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(X);
+ mbedtls_mpi *py = &((mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(Y);
+ mbedtls_mpi *pz = &((mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(Z);
+
+ if (mbedtls_mpi_read_binary(px, val, len) == 0
+ && mbedtls_mpi_read_binary(py, val + len, len) == 0
+ && mbedtls_mpi_lset(pz, 1) == 0)
+ return (struct crypto_ec_point *)p;
+ #else
+ buf[0] = 0x04;
+ os_memcpy(buf+1, val, len*2);
+ if (mbedtls_ecp_point_read_binary((mbedtls_ecp_group *)e, p,
+ buf, 1+len*2) == 0)
+ return (struct crypto_ec_point *)p;
+ #endif
+ }
+ #endif
+ #ifdef MBEDTLS_ECP_MONTGOMERY_ENABLED
+ if (mbedtls_ecp_get_type((mbedtls_ecp_group *)e)
+ == MBEDTLS_ECP_TYPE_MONTGOMERY) {
+ /* crypto.h interface documents crypto_ec_point_from_bin()
+ * val is length: prime_len * 2 and is big-endian
+ * (Short Weierstrass is assumed by hostap)
+ * Reverse to little-endian format for Montgomery */
+ for (unsigned int i = 0; i < len; ++i)
+ buf[i] = val[len-1-i];
+ if (mbedtls_ecp_point_read_binary((mbedtls_ecp_group *)e, p,
+ buf, len) == 0)
+ return (struct crypto_ec_point *)p;
+ }
+ #endif
+
+ mbedtls_ecp_point_free(p);
+ os_free(p);
+ return NULL;
+}
+
+int crypto_ec_point_add(struct crypto_ec *e, const struct crypto_ec_point *a,
+ const struct crypto_ec_point *b,
+ struct crypto_ec_point *c)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ /* mbedtls does not provide an mbedtls_ecp_point add function */
+ mbedtls_mpi one;
+ mbedtls_mpi_init(&one);
+ int ret = mbedtls_mpi_lset(&one, 1)
+ || mbedtls_ecp_muladd(
+ (mbedtls_ecp_group *)e, (mbedtls_ecp_point *)c,
+ &one, (const mbedtls_ecp_point *)a,
+ &one, (const mbedtls_ecp_point *)b) ? -1 : 0;
+ mbedtls_mpi_free(&one);
+ return ret;
+}
+
+int crypto_ec_point_mul(struct crypto_ec *e, const struct crypto_ec_point *p,
+ const struct crypto_bignum *b,
+ struct crypto_ec_point *res)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ return mbedtls_ecp_mul(
+ (mbedtls_ecp_group *)e, (mbedtls_ecp_point *)res,
+ (const mbedtls_mpi *)b, (const mbedtls_ecp_point *)p,
+ mbedtls_ctr_drbg_random, crypto_mbedtls_ctr_drbg()) ? -1 : 0;
+}
+
+int crypto_ec_point_invert(struct crypto_ec *e, struct crypto_ec_point *p)
+{
+ if (TEST_FAIL())
+ return -1;
+
+ if (mbedtls_ecp_get_type((mbedtls_ecp_group *)e)
+ == MBEDTLS_ECP_TYPE_MONTGOMERY) {
+ /* e.g. MBEDTLS_ECP_DP_CURVE25519 and MBEDTLS_ECP_DP_CURVE448 */
+ wpa_printf(MSG_ERROR,
+ "%s not implemented for Montgomery curves",__func__);
+ return -1;
+ }
+
+ /* mbedtls does not provide an mbedtls_ecp_point invert function */
+ /* below works for Short Weierstrass; incorrect for Montgomery curves */
+ mbedtls_mpi *py = &((mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(Y);
+ return mbedtls_ecp_is_zero((mbedtls_ecp_point *)p) /*point at infinity*/
+ || mbedtls_mpi_cmp_int(py, 0) == 0 /*point is its own inverse*/
+ || mbedtls_mpi_sub_abs(py, CRYPTO_EC_P(e), py) == 0 ? 0 : -1;
+}
+
+#ifdef MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED
+static int
+crypto_ec_point_y_sqr_weierstrass(mbedtls_ecp_group *e, const mbedtls_mpi *x,
+ mbedtls_mpi *y2)
+{
+ /* MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS y^2 = x^3 + a x + b */
+
+ /* Short Weierstrass elliptic curve group w/o A set treated as A = -3 */
+ /* Attempt to match mbedtls/library/ecp.c:ecp_check_pubkey_sw() behavior
+ * and elsewhere in mbedtls/library/ecp.c where if A is not set, it is
+ * treated as if A = -3. */
+
+ #if 0
+ /* y^2 = x^3 + ax + b */
+ mbedtls_mpi *A = &e->A;
+ mbedtls_mpi t, A_neg3;
+ if (&e->A.p == NULL) {
+ mbedtls_mpi_init(&A_neg3);
+ if (mbedtls_mpi_lset(&A_neg3, -3) != 0) {
+ mbedtls_mpi_free(&A_neg3);
+ return -1;
+ }
+ A = &A_neg3;
+ }
+ mbedtls_mpi_init(&t);
+ int ret = /* x^3 */
+ mbedtls_mpi_lset(&t, 3)
+ || mbedtls_mpi_exp_mod(y2, x, &t, &e->P, NULL)
+ /* ax */
+ || mbedtls_mpi_mul_mpi(y2, y2, A)
+ || mbedtls_mpi_mod_mpi(&t, &t, &e->P)
+ /* ax + b */
+ || mbedtls_mpi_add_mpi(&t, &t, &e->B)
+ || mbedtls_mpi_mod_mpi(&t, &t, &e->P)
+ /* x^3 + ax + b */
+ || mbedtls_mpi_add_mpi(&t, &t, y2) /* ax + b + x^3 */
+ || mbedtls_mpi_mod_mpi(y2, &t, &e->P);
+ mbedtls_mpi_free(&t);
+ if (A == &A_neg3)
+ mbedtls_mpi_free(&A_neg3);
+ return ret; /* 0: success, non-zero: failure */
+ #else
+ /* y^2 = x^3 + ax + b = (x^2 + a)x + b */
+ return /* x^2 */
+ mbedtls_mpi_mul_mpi(y2, x, x)
+ || mbedtls_mpi_mod_mpi(y2, y2, &e->P)
+ /* x^2 + a */
+ || (e->A.MBEDTLS_PRIVATE(p)
+ ? mbedtls_mpi_add_mpi(y2, y2, &e->A)
+ : mbedtls_mpi_sub_int(y2, y2, 3))
+ || mbedtls_mpi_mod_mpi(y2, y2, &e->P)
+ /* (x^2 + a)x */
+ || mbedtls_mpi_mul_mpi(y2, y2, x)
+ || mbedtls_mpi_mod_mpi(y2, y2, &e->P)
+ /* (x^2 + a)x + b */
+ || mbedtls_mpi_add_mpi(y2, y2, &e->B)
+ || mbedtls_mpi_mod_mpi(y2, y2, &e->P);
+ #endif
+}
+#endif /* MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED */
+
+#if 0 /* not used by hostap */
+#ifdef MBEDTLS_ECP_MONTGOMERY_ENABLED
+static int
+crypto_ec_point_y_sqr_montgomery(mbedtls_ecp_group *e, const mbedtls_mpi *x,
+ mbedtls_mpi *y2)
+{
+ /* XXX: !!! must be reviewed and audited for correctness !!! */
+
+ /* MBEDTLS_ECP_TYPE_MONTGOMERY y^2 = x^3 + a x^2 + x */
+
+ /* y^2 = x^3 + a x^2 + x = (x + a)x^2 + x */
+ mbedtls_mpi x2;
+ mbedtls_mpi_init(&x2);
+ int ret = /* x^2 */
+ mbedtls_mpi_mul_mpi(&x2, x, x)
+ || mbedtls_mpi_mod_mpi(&x2, &x2, &e->P)
+ /* x + a */
+ || mbedtls_mpi_add_mpi(y2, x, &e->A)
+ || mbedtls_mpi_mod_mpi(y2, y2, &e->P)
+ /* (x + a)x^2 */
+ || mbedtls_mpi_mul_mpi(y2, y2, &x2)
+ || mbedtls_mpi_mod_mpi(y2, y2, &e->P)
+ /* (x + a)x^2 + x */
+ || mbedtls_mpi_add_mpi(y2, y2, x)
+ || mbedtls_mpi_mod_mpi(y2, y2, &e->P);
+ mbedtls_mpi_free(&x2);
+ return ret; /* 0: success, non-zero: failure */
+}
+#endif /* MBEDTLS_ECP_MONTGOMERY_ENABLED */
+#endif
+
+struct crypto_bignum *
+crypto_ec_point_compute_y_sqr(struct crypto_ec *e,
+ const struct crypto_bignum *x)
+{
+ if (TEST_FAIL())
+ return NULL;
+
+ mbedtls_mpi *y2 = os_malloc(sizeof(*y2));
+ if (y2 == NULL)
+ return NULL;
+ mbedtls_mpi_init(y2);
+
+ #ifdef MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED
+ if (mbedtls_ecp_get_type((mbedtls_ecp_group *)e)
+ == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS
+ && crypto_ec_point_y_sqr_weierstrass((mbedtls_ecp_group *)e,
+ (const mbedtls_mpi *)x,
+ y2) == 0)
+ return (struct crypto_bignum *)y2;
+ #endif
+ #if 0 /* not used by hostap */
+ #ifdef MBEDTLS_ECP_MONTGOMERY_ENABLED
+ if (mbedtls_ecp_get_type((mbedtls_ecp_group *)e)
+ == MBEDTLS_ECP_TYPE_MONTGOMERY
+ && crypto_ec_point_y_sqr_montgomery((mbedtls_ecp_group *)e,
+ (const mbedtls_mpi *)x,
+ y2) == 0)
+ return (struct crypto_bignum *)y2;
+ #endif
+ #endif
+
+ mbedtls_mpi_free(y2);
+ os_free(y2);
+ return NULL;
+}
+
+int crypto_ec_point_is_at_infinity(struct crypto_ec *e,
+ const struct crypto_ec_point *p)
+{
+ return mbedtls_ecp_is_zero((mbedtls_ecp_point *)p);
+}
+
+int crypto_ec_point_is_on_curve(struct crypto_ec *e,
+ const struct crypto_ec_point *p)
+{
+ #if 1
+ return mbedtls_ecp_check_pubkey((const mbedtls_ecp_group *)e,
+ (const mbedtls_ecp_point *)p) == 0;
+ #else
+ /* compute y^2 mod P and compare to y^2 mod P */
+ /*(ref: src/eap_common/eap_pwd_common.c:compute_password_element())*/
+ const mbedtls_mpi *px = &((const mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(X);
+ mbedtls_mpi *cy2 = (mbedtls_mpi *)
+ crypto_ec_point_compute_y_sqr(e, (const struct crypto_bignum *)px);
+ if (cy2 == NULL)
+ return 0;
+
+ mbedtls_mpi y2;
+ mbedtls_mpi_init(&y2);
+ const mbedtls_mpi *py = &((const mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(Y);
+ int is_on_curve = mbedtls_mpi_mul_mpi(&y2, py, py) /* y^2 mod P */
+ || mbedtls_mpi_mod_mpi(&y2, &y2, CRYPTO_EC_P(e))
+ || mbedtls_mpi_cmp_mpi(&y2, cy2) != 0 ? 0 : 1;
+
+ mbedtls_mpi_free(&y2);
+ mbedtls_mpi_free(cy2);
+ os_free(cy2);
+ return is_on_curve;
+ #endif
+}
+
+int crypto_ec_point_cmp(const struct crypto_ec *e,
+ const struct crypto_ec_point *a,
+ const struct crypto_ec_point *b)
+{
+ return mbedtls_ecp_point_cmp((const mbedtls_ecp_point *)a,
+ (const mbedtls_ecp_point *)b);
+}
+
+#if !defined(CONFIG_NO_STDOUT_DEBUG)
+void crypto_ec_point_debug_print(const struct crypto_ec *e,
+ const struct crypto_ec_point *p,
+ const char *title)
+{
+ u8 x[MBEDTLS_MPI_MAX_SIZE];
+ u8 y[MBEDTLS_MPI_MAX_SIZE];
+ size_t len = CRYPTO_EC_plen(e);
+ /* crypto_ec_point_to_bin ought to take (const struct crypto_ec *e) */
+ struct crypto_ec *ee;
+ *(const struct crypto_ec **)&ee = e; /*(cast away const)*/
+ if (crypto_ec_point_to_bin(ee, p, x, y) == 0) {
+ if (title)
+ wpa_printf(MSG_DEBUG, "%s", title);
+ wpa_hexdump(MSG_DEBUG, "x:", x, len);
+ wpa_hexdump(MSG_DEBUG, "y:", y, len);
+ }
+}
+#endif
+
+
+struct crypto_ec_key * crypto_ec_key_parse_priv(const u8 *der, size_t der_len)
+{
+ mbedtls_pk_context *ctx = os_malloc(sizeof(*ctx));
+ if (ctx == NULL)
+ return NULL;
+ mbedtls_pk_init(ctx);
+ #if MBEDTLS_VERSION_NUMBER < 0x03000000 /* mbedtls 3.0.0 */
+ if (mbedtls_pk_parse_key(ctx, der, der_len, NULL, 0) == 0)
+ #else
+ if (mbedtls_pk_parse_key(ctx, der, der_len, NULL, 0,
+ mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg()) == 0)
+ #endif
+ return (struct crypto_ec_key *)ctx;
+
+ mbedtls_pk_free(ctx);
+ os_free(ctx);
+ return NULL;
+}
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_HPKE
+#ifdef CONFIG_MODULE_TESTS
+/*(for crypto_module_tests.c)*/
+struct crypto_ec_key * crypto_ec_key_set_priv(int group,
+ const u8 *raw, size_t raw_len)
+{
+ mbedtls_ecp_group_id grp_id =
+ crypto_mbedtls_ecp_group_id_from_ike_id(group);
+ if (grp_id == MBEDTLS_ECP_DP_NONE)
+ return NULL;
+ const mbedtls_pk_info_t *pk_info =
+ mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY);
+ if (pk_info == NULL)
+ return NULL;
+ mbedtls_pk_context *ctx = os_malloc(sizeof(*ctx));
+ if (ctx == NULL)
+ return NULL;
+ mbedtls_pk_init(ctx);
+ if (mbedtls_pk_setup(ctx, pk_info) == 0
+ && mbedtls_ecp_read_key(grp_id,mbedtls_pk_ec(*ctx),raw,raw_len) == 0) {
+ return (struct crypto_ec_key *)ctx;
+ }
+
+ mbedtls_pk_free(ctx);
+ os_free(ctx);
+ return NULL;
+}
+#endif
+#endif
+
+#include <mbedtls/error.h>
+#include <mbedtls/oid.h>
+static int crypto_mbedtls_pk_parse_subpubkey_compressed(mbedtls_pk_context *ctx, const u8 *der, size_t der_len)
+{
+ /* The following is modified from:
+ * mbedtls/library/pkparse.c:mbedtls_pk_parse_subpubkey()
+ * mbedtls/library/pkparse.c:pk_get_pk_alg()
+ * mbedtls/library/pkparse.c:pk_use_ecparams()
+ */
+ mbedtls_pk_type_t pk_alg = MBEDTLS_PK_NONE;
+ const mbedtls_pk_info_t *pk_info;
+ int ret;
+ size_t len;
+ const unsigned char *end = der+der_len;
+ unsigned char *p;
+ *(const unsigned char **)&p = der;
+
+ if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+ {
+ return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT, ret ) );
+ }
+
+ end = p + len;
+
+ /*
+ if( ( ret = pk_get_pk_alg( &p, end, &pk_alg, &alg_params ) ) != 0 )
+ return( ret );
+ */
+ mbedtls_asn1_buf alg_oid, params;
+ memset( &params, 0, sizeof(mbedtls_asn1_buf) );
+ if( ( ret = mbedtls_asn1_get_alg( &p, end, &alg_oid, &params ) ) != 0 )
+ return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PK_INVALID_ALG, ret ) );
+ if( mbedtls_oid_get_pk_alg( &alg_oid, &pk_alg ) != 0 )
+ return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+
+ if( ( ret = mbedtls_asn1_get_bitstring_null( &p, end, &len ) ) != 0 )
+ return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PK_INVALID_PUBKEY, ret ) );
+
+ if( p + len != end )
+ return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PK_INVALID_PUBKEY,
+ MBEDTLS_ERR_ASN1_LENGTH_MISMATCH ) );
+
+ if( ( pk_info = mbedtls_pk_info_from_type( pk_alg ) ) == NULL )
+ return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+
+ if( ( ret = mbedtls_pk_setup( ctx, pk_info ) ) != 0 )
+ return( ret );
+
+ /* assume mbedtls_pk_parse_subpubkey(&der, der+der_len, ctx)
+ * has already run with ctx initialized up to pk_get_ecpubkey(),
+ * and pk_get_ecpubkey() has returned MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE
+ *
+ * mbedtls mbedtls_ecp_point_read_binary()
+ * does not handle point in COMPRESSED format
+ *
+ * (validate assumption that algorithm is EC) */
+ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*ctx);
+ if (ecp_kp == NULL)
+ return( MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE );
+ mbedtls_ecp_group *ecp_kp_grp = &ecp_kp->MBEDTLS_PRIVATE(grp);
+ mbedtls_ecp_point *ecp_kp_Q = &ecp_kp->MBEDTLS_PRIVATE(Q);
+ mbedtls_ecp_group_id grp_id;
+
+
+ /* mbedtls/library/pkparse.c:pk_use_ecparams() */
+
+ if( params.tag == MBEDTLS_ASN1_OID )
+ {
+ if( mbedtls_oid_get_ec_grp( &params, &grp_id ) != 0 )
+ return( MBEDTLS_ERR_PK_UNKNOWN_NAMED_CURVE );
+ }
+ else
+ {
+#if defined(MBEDTLS_PK_PARSE_EC_EXTENDED)
+ /*(large code block not copied from mbedtls; unsupported)*/
+ #if 0
+ if( ( ret = pk_group_id_from_specified( &params, &grp_id ) ) != 0 )
+ return( ret );
+ #endif
+#endif
+ return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+ }
+
+ /*
+ * grp may already be initialized; if so, make sure IDs match
+ */
+ if( ecp_kp_grp->id != MBEDTLS_ECP_DP_NONE && ecp_kp_grp->id != grp_id )
+ return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+
+ if( ( ret = mbedtls_ecp_group_load( ecp_kp_grp, grp_id ) ) != 0 )
+ return( ret );
+
+
+ /* (validate assumption that EC point is in COMPRESSED format) */
+ len = CRYPTO_EC_plen(ecp_kp_grp);
+ if( mbedtls_ecp_get_type(ecp_kp_grp) != MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS
+ || (end - p) != 1+len
+ || (*p != 0x02 && *p != 0x03) )
+ return( MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE );
+
+ /* Instead of calling mbedtls/library/pkparse.c:pk_get_ecpubkey() to call
+ * mbedtls_ecp_point_read_binary(), manually parse point into ecp_kp_Q */
+ mbedtls_mpi *X = &ecp_kp_Q->MBEDTLS_PRIVATE(X);
+ mbedtls_mpi *Y = &ecp_kp_Q->MBEDTLS_PRIVATE(Y);
+ mbedtls_mpi *Z = &ecp_kp_Q->MBEDTLS_PRIVATE(Z);
+ ret = mbedtls_mpi_lset(Z, 1);
+ if (ret != 0)
+ return( ret );
+ ret = mbedtls_mpi_read_binary(X, p+1, len);
+ if (ret != 0)
+ return( ret );
+ /* derive Y
+ * (similar derivation of Y in crypto_mbedtls.c:crypto_ecdh_set_peerkey())*/
+ ret = mbedtls_mpi_copy(Y, X) /*(Y is used as input and output obj below)*/
+ || crypto_mbedtls_short_weierstrass_derive_y(ecp_kp_grp, Y, (*p & 1));
+ if (ret != 0)
+ return( ret );
+
+ return mbedtls_ecp_check_pubkey( ecp_kp_grp, ecp_kp_Q );
+}
+
+struct crypto_ec_key * crypto_ec_key_parse_pub(const u8 *der, size_t der_len)
+{
+ mbedtls_pk_context *ctx = os_malloc(sizeof(*ctx));
+ if (ctx == NULL)
+ return NULL;
+ mbedtls_pk_init(ctx);
+ /*int rc = mbedtls_pk_parse_subpubkey(&der, der+der_len, ctx);*/
+ int rc = mbedtls_pk_parse_public_key(ctx, der, der_len);
+ if (rc == 0)
+ return (struct crypto_ec_key *)ctx;
+ else if (rc == MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE) {
+ /* mbedtls mbedtls_ecp_point_read_binary()
+ * does not handle point in COMPRESSED format; parse internally */
+ rc = crypto_mbedtls_pk_parse_subpubkey_compressed(ctx,der,der_len);
+ if (rc == 0)
+ return (struct crypto_ec_key *)ctx;
+ }
+
+ mbedtls_pk_free(ctx);
+ os_free(ctx);
+ return NULL;
+}
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_EC_DPP
+
+static struct crypto_ec_key *
+crypto_ec_key_set_pub_point_for_group(mbedtls_ecp_group_id grp_id,
+ const mbedtls_ecp_point *pub,
+ const u8 *buf, size_t len)
+{
+ const mbedtls_pk_info_t *pk_info =
+ mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY);
+ if (pk_info == NULL)
+ return NULL;
+ mbedtls_pk_context *ctx = os_malloc(sizeof(*ctx));
+ if (ctx == NULL)
+ return NULL;
+ mbedtls_pk_init(ctx);
+ if (mbedtls_pk_setup(ctx, pk_info) == 0) {
+ /* (Is private key generation necessary for callers?)
+ * alt: gen key then overwrite Q
+ * mbedtls_ecp_gen_key(grp_id, ecp_kp,
+ * mbedtls_ctr_drbg_random,
+ * crypto_mbedtls_ctr_drbg()) == 0
+ */
+ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*ctx);
+ mbedtls_ecp_group *ecp_kp_grp = &ecp_kp->MBEDTLS_PRIVATE(grp);
+ mbedtls_ecp_point *ecp_kp_Q = &ecp_kp->MBEDTLS_PRIVATE(Q);
+ mbedtls_mpi *ecp_kp_d = &ecp_kp->MBEDTLS_PRIVATE(d);
+ if (mbedtls_ecp_group_load(ecp_kp_grp, grp_id) == 0
+ && (pub
+ ? mbedtls_ecp_copy(ecp_kp_Q, pub) == 0
+ : mbedtls_ecp_point_read_binary(ecp_kp_grp, ecp_kp_Q,
+ buf, len) == 0)
+ && mbedtls_ecp_gen_privkey(ecp_kp_grp, ecp_kp_d,
+ mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg()) == 0){
+ return (struct crypto_ec_key *)ctx;
+ }
+ }
+
+ mbedtls_pk_free(ctx);
+ os_free(ctx);
+ return NULL;
+}
+
+struct crypto_ec_key * crypto_ec_key_set_pub(int group, const u8 *x,
+ const u8 *y, size_t len)
+{
+ mbedtls_ecp_group_id grp_id =
+ crypto_mbedtls_ecp_group_id_from_ike_id(group);
+ if (grp_id == MBEDTLS_ECP_DP_NONE)
+ return NULL;
+ if (len > MBEDTLS_MPI_MAX_SIZE)
+ return NULL;
+ u8 buf[1+MBEDTLS_MPI_MAX_SIZE*2];
+ buf[0] = 0x04; /* assume x,y for Short Weierstrass */
+ os_memcpy(buf+1, x, len);
+ os_memcpy(buf+1+len, y, len);
+
+ return crypto_ec_key_set_pub_point_for_group(grp_id,NULL,buf,1+len*2);
+}
+
+struct crypto_ec_key *
+crypto_ec_key_set_pub_point(struct crypto_ec *e,
+ const struct crypto_ec_point *pub)
+{
+ mbedtls_ecp_group_id grp_id = ((mbedtls_ecp_group *)e)->id;
+ mbedtls_ecp_point *p = (mbedtls_ecp_point *)pub;
+ return crypto_ec_key_set_pub_point_for_group(grp_id, p, NULL, 0);
+}
+
+
+struct crypto_ec_key * crypto_ec_key_gen(int group)
+{
+ mbedtls_pk_context *ctx = os_malloc(sizeof(*ctx));
+ if (ctx == NULL)
+ return NULL;
+ mbedtls_pk_init(ctx);
+ if (crypto_mbedtls_keypair_gen(group, ctx) == 0)
+ return (struct crypto_ec_key *)ctx;
+ mbedtls_pk_free(ctx);
+ os_free(ctx);
+ return NULL;
+}
+
+#endif /* CRYPTO_MBEDTLS_CRYPTO_EC_DPP */
+
+void crypto_ec_key_deinit(struct crypto_ec_key *key)
+{
+ mbedtls_pk_free((mbedtls_pk_context *)key);
+ os_free(key);
+}
+
+struct wpabuf * crypto_ec_key_get_subject_public_key(struct crypto_ec_key *key)
+{
+ /* (similar to crypto_ec_key_get_pubkey_point(),
+ * but compressed point format and ASN.1 DER wrapping)*/
+#ifndef MBEDTLS_PK_ECP_PUB_DER_MAX_BYTES /*(mbedtls/library/pkwrite.h)*/
+#define MBEDTLS_PK_ECP_PUB_DER_MAX_BYTES ( 30 + 2 * MBEDTLS_ECP_MAX_BYTES )
+#endif
+ unsigned char buf[MBEDTLS_PK_ECP_PUB_DER_MAX_BYTES];
+ int len = mbedtls_pk_write_pubkey_der((mbedtls_pk_context *)key,
+ buf, sizeof(buf));
+ if (len < 0)
+ return NULL;
+ /* Note: data is written at the end of the buffer! Use the
+ * return value to determine where you should start
+ * using the buffer */
+ unsigned char *p = buf+sizeof(buf)-len;
+
+ #ifdef MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED
+ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)key);
+ if (ecp_kp == NULL)
+ return NULL;
+ mbedtls_ecp_group *grp = &ecp_kp->MBEDTLS_PRIVATE(grp);
+ /* Note: sae_pk.c expects pubkey point in compressed format,
+ * but mbedtls_pk_write_pubkey_der() writes uncompressed format.
+ * Manually translate format and update lengths in DER format */
+ if (mbedtls_ecp_get_type(grp) == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS) {
+ unsigned char *end = buf+sizeof(buf);
+ size_t n;
+ /* SubjectPublicKeyInfo SEQUENCE */
+ mbedtls_asn1_get_tag(&p, end, &n,
+ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+ /* algorithm AlgorithmIdentifier */
+ unsigned char *a = p;
+ size_t alen;
+ mbedtls_asn1_get_tag(&p, end, &alen,
+ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+ p += alen;
+ alen = (size_t)(p - a);
+ /* subjectPublicKey BIT STRING */
+ mbedtls_asn1_get_tag(&p, end, &n, MBEDTLS_ASN1_BIT_STRING);
+ /* rewrite into compressed point format and rebuild ASN.1 */
+ p[1] = (buf[sizeof(buf)-1] & 1) ? 0x03 : 0x02;
+ n = 1 + 1 + (n-2)/2;
+ len = mbedtls_asn1_write_len(&p, buf, n) + (int)n;
+ len += mbedtls_asn1_write_tag(&p, buf, MBEDTLS_ASN1_BIT_STRING);
+ os_memmove(p-alen, a, alen);
+ len += alen;
+ p -= alen;
+ len += mbedtls_asn1_write_len(&p, buf, (size_t)len);
+ len += mbedtls_asn1_write_tag(&p, buf,
+ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+ }
+ #endif
+ return wpabuf_alloc_copy(p, (size_t)len);
+}
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_EC_DPP
+
+struct wpabuf * crypto_ec_key_get_ecprivate_key(struct crypto_ec_key *key,
+ bool include_pub)
+{
+#ifndef MBEDTLS_PK_ECP_PRV_DER_MAX_BYTES /*(mbedtls/library/pkwrite.h)*/
+#define MBEDTLS_PK_ECP_PRV_DER_MAX_BYTES ( 29 + 3 * MBEDTLS_ECP_MAX_BYTES )
+#endif
+ unsigned char priv[MBEDTLS_PK_ECP_PRV_DER_MAX_BYTES];
+ int privlen = mbedtls_pk_write_key_der((mbedtls_pk_context *)key,
+ priv, sizeof(priv));
+ if (privlen < 0)
+ return NULL;
+
+ struct wpabuf *wbuf;
+
+ /* Note: data is written at the end of the buffer! Use the
+ * return value to determine where you should start
+ * using the buffer */
+ /* mbedtls_pk_write_key_der() includes publicKey in DER */
+ if (include_pub)
+ wbuf = wpabuf_alloc_copy(priv+sizeof(priv)-privlen, privlen);
+ else {
+ /* calculate publicKey offset and skip from end of buffer */
+ unsigned char *p = priv+sizeof(priv)-privlen;
+ unsigned char *end = priv+sizeof(priv);
+ size_t len;
+ /* ECPrivateKey SEQUENCE */
+ mbedtls_asn1_get_tag(&p, end, &len,
+ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+ /* version INTEGER */
+ unsigned char *v = p;
+ mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_INTEGER);
+ p += len;
+ /* privateKey OCTET STRING */
+ mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OCTET_STRING);
+ p += len;
+ /* parameters ECParameters */
+ mbedtls_asn1_get_tag(&p, end, &len,
+ MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED);
+ p += len;
+
+ /* write new SEQUENCE header (we know that it fits in priv[]) */
+ len = (size_t)(p - v);
+ p = v;
+ len += mbedtls_asn1_write_len(&p, priv, len);
+ len += mbedtls_asn1_write_tag(&p, priv,
+ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+ wbuf = wpabuf_alloc_copy(p, len);
+ }
+
+ forced_memzero(priv, sizeof(priv));
+ return wbuf;
+}
+
+struct wpabuf * crypto_ec_key_get_pubkey_point(struct crypto_ec_key *key,
+ int prefix)
+{
+ /*(similarities to crypto_ecdh_get_pubkey(), but different struct)*/
+ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)key);
+ if (ecp_kp == NULL)
+ return NULL;
+ mbedtls_ecp_group *grp = &ecp_kp->MBEDTLS_PRIVATE(grp);
+ size_t len = CRYPTO_EC_plen(grp);
+ #ifdef MBEDTLS_ECP_MONTGOMERY_ENABLED
+ /* len */
+ #endif
+ #ifdef MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED
+ if (mbedtls_ecp_get_type(grp) == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS)
+ len = len*2+1;
+ #endif
+ struct wpabuf *buf = wpabuf_alloc(len);
+ if (buf == NULL)
+ return NULL;
+ mbedtls_ecp_point *ecp_kp_Q = &ecp_kp->MBEDTLS_PRIVATE(Q);
+ if (mbedtls_ecp_point_write_binary(grp, ecp_kp_Q,
+ MBEDTLS_ECP_PF_UNCOMPRESSED, &len,
+ wpabuf_mhead_u8(buf), len) == 0) {
+ if (!prefix) /* Remove 0x04 prefix if requested */
+ os_memmove(wpabuf_mhead(buf),wpabuf_mhead(buf)+1,--len);
+ wpabuf_put(buf, len);
+ return buf;
+ }
+
+ wpabuf_free(buf);
+ return NULL;
+}
+
+struct crypto_ec_point *
+crypto_ec_key_get_public_key(struct crypto_ec_key *key)
+{
+ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)key);
+ if (ecp_kp == NULL)
+ return NULL;
+ mbedtls_ecp_point *p = os_malloc(sizeof(*p));
+ if (p != NULL) {
+ /*(mbedtls_ecp_export() uses &ecp_kp->MBEDTLS_PRIVATE(grp))*/
+ mbedtls_ecp_point_init(p);
+ mbedtls_ecp_point *ecp_kp_Q = &ecp_kp->MBEDTLS_PRIVATE(Q);
+ if (mbedtls_ecp_copy(p, ecp_kp_Q)) {
+ mbedtls_ecp_point_free(p);
+ os_free(p);
+ p = NULL;
+ }
+ }
+ return (struct crypto_ec_point *)p;
+}
+
+struct crypto_bignum *
+crypto_ec_key_get_private_key(struct crypto_ec_key *key)
+{
+ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)key);
+ if (ecp_kp == NULL)
+ return NULL;
+ mbedtls_mpi *bn = os_malloc(sizeof(*bn));
+ if (bn) {
+ /*(mbedtls_ecp_export() uses &ecp_kp->MBEDTLS_PRIVATE(grp))*/
+ mbedtls_mpi_init(bn);
+ mbedtls_mpi *ecp_kp_d = &ecp_kp->MBEDTLS_PRIVATE(d);
+ if (mbedtls_mpi_copy(bn, ecp_kp_d)) {
+ mbedtls_mpi_free(bn);
+ os_free(bn);
+ bn = NULL;
+ }
+ }
+ return (struct crypto_bignum *)bn;
+}
+
+#endif /* CRYPTO_MBEDTLS_CRYPTO_EC_DPP */
+
+static mbedtls_md_type_t crypto_ec_key_sign_md(size_t len)
+{
+ /* get mbedtls_md_type_t from length of hash data to be signed */
+ switch (len) {
+ case 64: return MBEDTLS_MD_SHA512;
+ case 48: return MBEDTLS_MD_SHA384;
+ case 32: return MBEDTLS_MD_SHA256;
+ case 20: return MBEDTLS_MD_SHA1;
+ case 16: return MBEDTLS_MD_MD5;
+ default: return MBEDTLS_MD_NONE;
+ }
+}
+
+struct wpabuf * crypto_ec_key_sign(struct crypto_ec_key *key, const u8 *data,
+ size_t len)
+{
+ #ifndef MBEDTLS_PK_SIGNATURE_MAX_SIZE /*(defined since mbedtls 2.20.0)*/
+ #if MBEDTLS_ECDSA_MAX_LEN > MBEDTLS_MPI_MAX_SIZE
+ #define MBEDTLS_PK_SIGNATURE_MAX_SIZE MBEDTLS_ECDSA_MAX_LEN
+ #else
+ #define MBEDTLS_PK_SIGNATURE_MAX_SIZE MBEDTLS_MPI_MAX_SIZE
+ #endif
+ #endif
+ size_t sig_len = MBEDTLS_PK_SIGNATURE_MAX_SIZE;
+ struct wpabuf *buf = wpabuf_alloc(sig_len);
+ if (buf == NULL)
+ return NULL;
+ if (mbedtls_pk_sign((mbedtls_pk_context *)key,
+ crypto_ec_key_sign_md(len), data, len,
+ wpabuf_mhead_u8(buf),
+ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
+ sig_len,
+ #endif
+ &sig_len,
+ mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg()) == 0) {
+ wpabuf_put(buf, sig_len);
+ return buf;
+ }
+
+ wpabuf_free(buf);
+ return NULL;
+}
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_EC_DPP
+struct wpabuf * crypto_ec_key_sign_r_s(struct crypto_ec_key *key,
+ const u8 *data, size_t len)
+{
+ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)key);
+ if (ecp_kp == NULL)
+ return NULL;
+
+ size_t sig_len = MBEDTLS_ECDSA_MAX_LEN;
+ u8 buf[MBEDTLS_ECDSA_MAX_LEN];
+ if (mbedtls_ecdsa_write_signature(ecp_kp, crypto_ec_key_sign_md(len),
+ data, len, buf,
+ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
+ sig_len,
+ #endif
+ &sig_len,
+ mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg())) {
+ return NULL;
+ }
+
+ /*(mbedtls_ecdsa_write_signature() writes signature in ASN.1)*/
+ /* parse ASN.1 to get r and s and lengths */
+ u8 *p = buf, *r, *s;
+ u8 *end = p + sig_len;
+ size_t rlen, slen;
+ mbedtls_asn1_get_tag(&p, end, &rlen,
+ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+ mbedtls_asn1_get_tag(&p, end, &rlen, MBEDTLS_ASN1_INTEGER);
+ r = p;
+ p += rlen;
+ mbedtls_asn1_get_tag(&p, end, &slen, MBEDTLS_ASN1_INTEGER);
+ s = p;
+
+ /* write raw r and s into out
+ * (including removal of leading 0 if added for ASN.1 integer)
+ * note: DPP caller expects raw r, s each padded to prime len */
+ mbedtls_ecp_group *ecp_kp_grp = &ecp_kp->MBEDTLS_PRIVATE(grp);
+ size_t plen = CRYPTO_EC_plen(ecp_kp_grp);
+ if (rlen > plen) {
+ r += (rlen - plen);
+ rlen = plen;
+ }
+ if (slen > plen) {
+ s += (slen - plen);
+ slen = plen;
+ }
+ struct wpabuf *out = wpabuf_alloc(plen*2);
+ if (out) {
+ wpabuf_put(out, plen*2);
+ p = wpabuf_mhead_u8(out);
+ os_memset(p, 0, plen*2);
+ os_memcpy(p+plen*1-rlen, r, rlen);
+ os_memcpy(p+plen*2-slen, s, slen);
+ }
+ return out;
+}
+#endif /* CRYPTO_MBEDTLS_CRYPTO_EC_DPP */
+
+int crypto_ec_key_verify_signature(struct crypto_ec_key *key, const u8 *data,
+ size_t len, const u8 *sig, size_t sig_len)
+{
+ switch (mbedtls_pk_verify((mbedtls_pk_context *)key,
+ crypto_ec_key_sign_md(len), data, len,
+ sig, sig_len)) {
+ case 0:
+ /*case MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH:*//* XXX: allow? */
+ return 1;
+ case MBEDTLS_ERR_ECP_VERIFY_FAILED:
+ return 0;
+ default:
+ return -1;
+ }
+}
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_EC_DPP
+int crypto_ec_key_verify_signature_r_s(struct crypto_ec_key *key,
+ const u8 *data, size_t len,
+ const u8 *r, size_t r_len,
+ const u8 *s, size_t s_len)
+{
+ /* reimplement mbedtls_ecdsa_read_signature() without encoding r and s
+ * into ASN.1 just for mbedtls_ecdsa_read_signature() to decode ASN.1 */
+ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)key);
+ if (ecp_kp == NULL)
+ return -1;
+ mbedtls_ecp_group *ecp_kp_grp = &ecp_kp->MBEDTLS_PRIVATE(grp);
+ mbedtls_ecp_point *ecp_kp_Q = &ecp_kp->MBEDTLS_PRIVATE(Q);
+
+ mbedtls_mpi mpi_r;
+ mbedtls_mpi mpi_s;
+ mbedtls_mpi_init(&mpi_r);
+ mbedtls_mpi_init(&mpi_s);
+ int ret = mbedtls_mpi_read_binary(&mpi_r, r, r_len)
+ || mbedtls_mpi_read_binary(&mpi_s, s, s_len) ? -1 : 0;
+ if (ret == 0) {
+ ret = mbedtls_ecdsa_verify(ecp_kp_grp, data, len,
+ ecp_kp_Q, &mpi_r, &mpi_s);
+ ret = ret ? ret == MBEDTLS_ERR_ECP_BAD_INPUT_DATA ? 0 : -1 : 1;
+ }
+ mbedtls_mpi_free(&mpi_r);
+ mbedtls_mpi_free(&mpi_s);
+ return ret;
+}
+#endif /* CRYPTO_MBEDTLS_CRYPTO_EC_DPP */
+
+int crypto_ec_key_group(struct crypto_ec_key *key)
+{
+ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)key);
+ if (ecp_kp == NULL)
+ return -1;
+ mbedtls_ecp_group *ecp_group = &ecp_kp->MBEDTLS_PRIVATE(grp);
+ return crypto_mbedtls_ike_id_from_ecp_group_id(ecp_group->id);
+}
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_EC_DPP
+
+int crypto_ec_key_cmp(struct crypto_ec_key *key1, struct crypto_ec_key *key2)
+{
+#if 0 /*(DPP is passing two public keys; unable to use pk_check_pair())*/
+ #if MBEDTLS_VERSION_NUMBER < 0x03000000 /* mbedtls 3.0.0 */
+ return mbedtls_pk_check_pair((const mbedtls_pk_context *)key1,
+ (const mbedtls_pk_context *)key2) ? -1 : 0;
+ #else
+ return mbedtls_pk_check_pair((const mbedtls_pk_context *)key1,
+ (const mbedtls_pk_context *)key2,
+ mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg()) ? -1 : 0;
+ #endif
+#else
+ mbedtls_ecp_keypair *ecp_kp1=mbedtls_pk_ec(*(mbedtls_pk_context *)key1);
+ mbedtls_ecp_keypair *ecp_kp2=mbedtls_pk_ec(*(mbedtls_pk_context *)key2);
+ if (ecp_kp1 == NULL || ecp_kp2 == NULL)
+ return -1;
+ mbedtls_ecp_group *ecp_kp1_grp = &ecp_kp1->MBEDTLS_PRIVATE(grp);
+ mbedtls_ecp_group *ecp_kp2_grp = &ecp_kp2->MBEDTLS_PRIVATE(grp);
+ mbedtls_ecp_point *ecp_kp1_Q = &ecp_kp1->MBEDTLS_PRIVATE(Q);
+ mbedtls_ecp_point *ecp_kp2_Q = &ecp_kp2->MBEDTLS_PRIVATE(Q);
+ return ecp_kp1_grp->id != ecp_kp2_grp->id
+ || mbedtls_ecp_point_cmp(ecp_kp1_Q, ecp_kp2_Q) ? -1 : 0;
+#endif
+}
+
+void crypto_ec_key_debug_print(const struct crypto_ec_key *key,
+ const char *title)
+{
+ /* TBD: what info is desirable here and in what human readable format?*/
+ /*(crypto_openssl.c prints a human-readably public key and attributes)*/
+ #if 0
+ struct mbedtls_pk_debug_item debug_item;
+ if (mbedtls_pk_debug((const mbedtls_pk_context *)key, &debug_item))
+ return;
+ /* ... */
+ #endif
+ wpa_printf(MSG_DEBUG, "%s: %s not implemented", title, __func__);
+}
+
+#endif /* CRYPTO_MBEDTLS_CRYPTO_EC_DPP */
+
+#endif /* CRYPTO_MBEDTLS_CRYPTO_EC */
+
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_CSR
+
+#include <mbedtls/x509_csr.h>
+#include <mbedtls/oid.h>
+
+struct crypto_csr * crypto_csr_init(void)
+{
+ mbedtls_x509write_csr *csr = os_malloc(sizeof(*csr));
+ if (csr != NULL)
+ mbedtls_x509write_csr_init(csr);
+ return (struct crypto_csr *)csr;
+}
+
+struct crypto_csr * crypto_csr_verify(const struct wpabuf *req)
+{
+ /* future: look for alternatives to MBEDTLS_PRIVATE() access */
+
+ /* sole caller src/common/dpp_crypto.c:dpp_validate_csr()
+ * uses (mbedtls_x509_csr *) to obtain CSR_ATTR_CHALLENGE_PASSWORD
+ * so allocate different object (mbedtls_x509_csr *) and special-case
+ * object when used in crypto_csr_get_attribute() and when free()d in
+ * crypto_csr_deinit(). */
+
+ mbedtls_x509_csr *csr = os_malloc(sizeof(*csr));
+ if (csr == NULL)
+ return NULL;
+ mbedtls_x509_csr_init(csr);
+ const mbedtls_md_info_t *md_info;
+ unsigned char digest[MBEDTLS_MD_MAX_SIZE];
+ if (mbedtls_x509_csr_parse_der(csr,wpabuf_head(req),wpabuf_len(req))==0
+ && (md_info=mbedtls_md_info_from_type(csr->MBEDTLS_PRIVATE(sig_md)))
+ != NULL
+ && mbedtls_md(md_info, csr->cri.p, csr->cri.len, digest) == 0) {
+ switch (mbedtls_pk_verify(&csr->pk,csr->MBEDTLS_PRIVATE(sig_md),
+ digest, mbedtls_md_get_size(md_info),
+ csr->MBEDTLS_PRIVATE(sig).p,
+ csr->MBEDTLS_PRIVATE(sig).len)) {
+ case 0:
+ /*case MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH:*//* XXX: allow? */
+ return (struct crypto_csr *)((uintptr_t)csr | 1uL);
+ default:
+ break;
+ }
+ }
+
+ mbedtls_x509_csr_free(csr);
+ os_free(csr);
+ return NULL;
+}
+
+void crypto_csr_deinit(struct crypto_csr *csr)
+{
+ if ((uintptr_t)csr & 1uL) {
+ csr = (struct crypto_csr *)((uintptr_t)csr & ~1uL);
+ mbedtls_x509_csr_free((mbedtls_x509_csr *)csr);
+ }
+ else
+ mbedtls_x509write_csr_free((mbedtls_x509write_csr *)csr);
+ os_free(csr);
+}
+
+int crypto_csr_set_ec_public_key(struct crypto_csr *csr,
+ struct crypto_ec_key *key)
+{
+ mbedtls_x509write_csr_set_key((mbedtls_x509write_csr *)csr,
+ (mbedtls_pk_context *)key);
+ return 0;
+}
+
+int crypto_csr_set_name(struct crypto_csr *csr, enum crypto_csr_name type,
+ const char *name)
+{
+ /* specialized for src/common/dpp_crypto.c */
+
+ /* sole caller src/common/dpp_crypto.c:dpp_build_csr()
+ * calls this function only once, using type == CSR_NAME_CN
+ * (If called more than once, this code would need to append
+ * components to the subject name, which we could do by
+ * appending to (mbedtls_x509write_csr *) private member
+ * mbedtls_asn1_named_data *MBEDTLS_PRIVATE(subject)) */
+
+ const char *label;
+ switch (type) {
+ case CSR_NAME_CN: label = "CN="; break;
+ case CSR_NAME_SN: label = "SN="; break;
+ case CSR_NAME_C: label = "C="; break;
+ case CSR_NAME_O: label = "O="; break;
+ case CSR_NAME_OU: label = "OU="; break;
+ default: return -1;
+ }
+
+ size_t len = strlen(name);
+ struct wpabuf *buf = wpabuf_alloc(3+len+1);
+ if (buf == NULL)
+ return -1;
+ wpabuf_put_data(buf, label, strlen(label));
+ wpabuf_put_data(buf, name, len+1); /*(include trailing '\0')*/
+ /* Note: 'name' provided is set as given and should be backslash-escaped
+ * by caller when necessary, e.g. literal ',' which are not separating
+ * components should be backslash-escaped */
+
+ int ret =
+ mbedtls_x509write_csr_set_subject_name((mbedtls_x509write_csr *)csr,
+ wpabuf_head(buf)) ? -1 : 0;
+ wpabuf_free(buf);
+ return ret;
+}
+
+/* OBJ_pkcs9_challengePassword 1 2 840 113549 1 9 7 */
+static const char OBJ_pkcs9_challengePassword[] = MBEDTLS_OID_PKCS9 "\x07";
+
+int crypto_csr_set_attribute(struct crypto_csr *csr, enum crypto_csr_attr attr,
+ int attr_type, const u8 *value, size_t len)
+{
+ /* specialized for src/common/dpp_crypto.c */
+ /* sole caller src/common/dpp_crypto.c:dpp_build_csr() passes
+ * attr == CSR_ATTR_CHALLENGE_PASSWORD
+ * attr_type == ASN1_TAG_UTF8STRING */
+
+ const char *oid;
+ size_t oid_len;
+ switch (attr) {
+ case CSR_ATTR_CHALLENGE_PASSWORD:
+ oid = OBJ_pkcs9_challengePassword;
+ oid_len = sizeof(OBJ_pkcs9_challengePassword)-1;
+ break;
+ default:
+ return -1;
+ }
+
+ #if 0 /*(incorrect; sets an extension, not an attribute)*/
+ return mbedtls_x509write_csr_set_extension((mbedtls_x509write_csr *)csr,
+ oid, oid_len,
+ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
+ 0, /*(critical flag)*/
+ #endif
+ value, len) ? -1 : 0;
+ #else
+ (void)oid;
+ (void)oid_len;
+ #endif
+
+ /* mbedtls does not currently provide way to set an attribute in a CSR:
+ * https://github.com/Mbed-TLS/mbedtls/issues/4886 */
+ wpa_printf(MSG_ERROR,
+ "mbedtls does not currently support setting challengePassword "
+ "attribute in CSR");
+ return -1;
+}
+
+const u8 * mbedtls_x509_csr_attr_oid_value(mbedtls_x509_csr *csr,
+ const char *oid, size_t oid_len,
+ size_t *vlen, int *vtype)
+{
+ /* Note: mbedtls_x509_csr_parse_der() has parsed and validated CSR,
+ * so validation checks are not repeated here
+ *
+ * It would be nicer if (mbedtls_x509_csr *) had an mbedtls_x509_buf of
+ * Attributes (or at least a pointer) since mbedtls_x509_csr_parse_der()
+ * already parsed the rest of CertificationRequestInfo, some of which is
+ * repeated here to step to Attributes. Since csr->subject_raw.p points
+ * into csr->cri.p, which points into csr->raw.p, step over version and
+ * subject of CertificationRequestInfo (SEQUENCE) */
+ unsigned char *p = csr->subject_raw.p + csr->subject_raw.len;
+ unsigned char *end = csr->cri.p + csr->cri.len, *ext;
+ size_t len;
+
+ /* step over SubjectPublicKeyInfo */
+ mbedtls_asn1_get_tag(&p, end, &len,
+ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+ p += len;
+
+ /* Attributes
+ * { ATTRIBUTE:IOSet } ::= SET OF { SEQUENCE { OID, value } }
+ */
+ if (mbedtls_asn1_get_tag(&p, end, &len,
+ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_CONTEXT_SPECIFIC) != 0) {
+ return NULL;
+ }
+ while (p < end) {
+ if (mbedtls_asn1_get_tag(&p, end, &len,
+ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) != 0) {
+ return NULL;
+ }
+ ext = p;
+ p += len;
+
+ if (mbedtls_asn1_get_tag(&ext,end,&len,MBEDTLS_ASN1_OID) != 0)
+ return NULL;
+ if (oid_len != len || 0 != memcmp(ext, oid, oid_len))
+ continue;
+
+ /* found oid; return value */
+ *vtype = *ext++; /* tag */
+ return (mbedtls_asn1_get_len(&ext,end,vlen) == 0) ? ext : NULL;
+ }
+
+ return NULL;
+}
+
+const u8 * crypto_csr_get_attribute(struct crypto_csr *csr,
+ enum crypto_csr_attr attr,
+ size_t *len, int *type)
+{
+ /* specialized for src/common/dpp_crypto.c */
+ /* sole caller src/common/dpp_crypto.c:dpp_build_csr() passes
+ * attr == CSR_ATTR_CHALLENGE_PASSWORD */
+
+ const char *oid;
+ size_t oid_len;
+ switch (attr) {
+ case CSR_ATTR_CHALLENGE_PASSWORD:
+ oid = OBJ_pkcs9_challengePassword;
+ oid_len = sizeof(OBJ_pkcs9_challengePassword)-1;
+ break;
+ default:
+ return NULL;
+ }
+
+ /* see crypto_csr_verify(); expecting (mbedtls_x509_csr *) tagged |=1 */
+ if (!((uintptr_t)csr & 1uL))
+ return NULL;
+ csr = (struct crypto_csr *)((uintptr_t)csr & ~1uL);
+
+ return mbedtls_x509_csr_attr_oid_value((mbedtls_x509_csr *)csr,
+ oid, oid_len, len, type);
+}
+
+struct wpabuf * crypto_csr_sign(struct crypto_csr *csr,
+ struct crypto_ec_key *key,
+ enum crypto_hash_alg algo)
+{
+ mbedtls_md_type_t sig_md;
+ switch (algo) {
+ #ifdef MBEDTLS_SHA256_C
+ case CRYPTO_HASH_ALG_SHA256: sig_md = MBEDTLS_MD_SHA256; break;
+ #endif
+ #ifdef MBEDTLS_SHA512_C
+ case CRYPTO_HASH_ALG_SHA384: sig_md = MBEDTLS_MD_SHA384; break;
+ case CRYPTO_HASH_ALG_SHA512: sig_md = MBEDTLS_MD_SHA512; break;
+ #endif
+ default:
+ return NULL;
+ }
+ mbedtls_x509write_csr_set_md_alg((mbedtls_x509write_csr *)csr, sig_md);
+
+ #if 0
+ unsigned char key_usage = MBEDTLS_X509_KU_DIGITAL_SIGNATURE
+ | MBEDTLS_X509_KU_KEY_CERT_SIGN;
+ if (mbedtls_x509write_csr_set_key_usage((mbedtls_x509write_csr *)csr,
+ key_usage))
+ return NULL;
+ #endif
+
+ #if 0
+ unsigned char ns_cert_type = MBEDTLS_X509_NS_CERT_TYPE_SSL_CLIENT
+ | MBEDTLS_X509_NS_CERT_TYPE_EMAIL;
+ if (mbedtls_x509write_csr_set_ns_cert_type((mbedtls_x509write_csr *)csr,
+ ns_cert_type))
+ return NULL;
+ #endif
+
+ #if 0
+ /* mbedtls does not currently provide way to set an attribute in a CSR:
+ * https://github.com/Mbed-TLS/mbedtls/issues/4886
+ * XXX: hwsim dpp_enterprise test fails due to this limitation.
+ *
+ * Current usage of this function is solely by dpp_build_csr(),
+ * so as a kludge, might consider custom (struct crypto_csr *)
+ * containing (mbedtls_x509write_csr *) and a list of attributes
+ * (i.e. challengePassword). Might have to totally reimplement
+ * mbedtls_x509write_csr_der(); underlying x509write_csr_der_internal()
+ * handles signing the CSR. (This is more work that appending an
+ * Attributes section to end of CSR and adjusting ASN.1 length of CSR.)
+ */
+ #endif
+
+ unsigned char buf[4096]; /* XXX: large enough? too large? */
+ int len = mbedtls_x509write_csr_der((mbedtls_x509write_csr *)csr,
+ buf, sizeof(buf),
+ mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg());
+ if (len < 0)
+ return NULL;
+ /* Note: data is written at the end of the buffer! Use the
+ * return value to determine where you should start
+ * using the buffer */
+ return wpabuf_alloc_copy(buf+sizeof(buf)-len, (size_t)len);
+}
+
+#endif /* CRYPTO_MBEDTLS_CRYPTO_CSR */
+
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_PKCS7
+
+#if 0
+#include <mbedtls/pkcs7.h> /* PKCS7 is not currently supported in mbedtls */
+#include <mbedtls/pem.h>
+#endif
+
+struct wpabuf * crypto_pkcs7_get_certificates(const struct wpabuf *pkcs7)
+{
+ /* PKCS7 is not currently supported in mbedtls */
+ return NULL;
+
+#if 0
+ /* https://github.com/naynajain/mbedtls-1 branch: development-pkcs7
+ * (??? potential future contribution to mbedtls ???) */
+
+ /* Note: PKCS7 signature *is not* verified by this function.
+ * The function interface does not provide for passing a certificate */
+
+ mbedtls_pkcs7 mpkcs7;
+ mbedtls_pkcs7_init(&mpkcs7);
+ int pkcs7_type = mbedtls_pkcs7_parse_der(wpabuf_head(pkcs7),
+ wpabuf_len(pkcs7),
+ &mpkcs7);
+ wpabuf *buf = NULL;
+ do {
+ if (pkcs7_type < 0)
+ break;
+
+ /* src/common/dpp.c:dpp_parse_cred_dot1x() interested in certs
+ * for wpa_supplicant/dpp_supplicant.c:wpas_dpp_add_network()
+ * (? are adding certificate headers and footers desired ?) */
+
+ /* development-pkcs7 branch does not currently provide
+ * additional interfaces to retrieve the parsed data */
+
+ mbedtls_x509_crt *certs =
+ &mpkcs7.MBEDTLS_PRIVATE(signed_data).MBEDTLS_PRIVATE(certs);
+ int ncerts =
+ mpkcs7.MBEDTLS_PRIVATE(signed_data).MBEDTLS_PRIVATE(no_of_certs);
+
+ /* allocate buffer for PEM (base64-encoded DER)
+ * plus header, footer, newlines, and some extra */
+ buf = wpabuf_alloc((wpabuf_len(pkcs7)+2)/3*4 + ncerts*64);
+ if (buf == NULL)
+ break;
+
+ #define PEM_BEGIN_CRT "-----BEGIN CERTIFICATE-----\n"
+ #define PEM_END_CRT "-----END CERTIFICATE-----\n"
+ size_t olen;
+ for (int i = 0; i < ncerts; ++i) {
+ int ret = mbedtls_pem_write_buffer(
+ PEM_BEGIN_CRT, PEM_END_CRT,
+ certs[i].raw.p, certs[i].raw.len,
+ wpabuf_mhead(buf, 0), wpabuf_tailroom(buf),
+ &olen));
+ if (ret == 0)
+ wpabuf_put(buf, olen);
+ } else {
+ if (ret == MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL)
+ ret = wpabuf_resize(
+ &buf,olen-wpabuf_tailroom(buf));
+ if (ret == 0) {
+ --i;/*(adjust loop iterator for retry)*/
+ continue;
+ }
+ wpabuf_free(buf);
+ buf = NULL;
+ break;
+ }
+ }
+ } while (0);
+
+ mbedtls_pkcs7_free(&mpkcs7);
+ return buf;
+#endif
+}
+
+#endif /* CRYPTO_MBEDTLS_CRYPTO_PKCS7 */
+
+
+#ifdef MBEDTLS_ARC4_C
+#include <mbedtls/arc4.h>
+int rc4_skip(const u8 *key, size_t keylen, size_t skip,
+ u8 *data, size_t data_len)
+{
+ mbedtls_arc4_context ctx;
+ mbedtls_arc4_init(&ctx);
+ mbedtls_arc4_setup(&ctx, key, keylen);
+
+ if (skip) {
+ /*(prefer [16] on ancient hardware with smaller cache lines)*/
+ unsigned char skip_buf[64]; /*('skip' is generally small)*/
+ /*os_memset(skip_buf, 0, sizeof(skip_buf));*/ /*(necessary?)*/
+ size_t len;
+ do {
+ len = skip > sizeof(skip_buf) ? sizeof(skip_buf) : skip;
+ mbedtls_arc4_crypt(&ctx, len, skip_buf, skip_buf);
+ } while ((skip -= len));
+ }
+
+ int ret = mbedtls_arc4_crypt(&ctx, data_len, data, data);
+ mbedtls_arc4_free(&ctx);
+ return ret;
+}
+#endif
+
+
+/* duplicated in tls_mbedtls.c:tls_mbedtls_readfile()*/
+__attribute_noinline__
+static int crypto_mbedtls_readfile(const char *path, u8 **buf, size_t *n)
+{
+ #if 0 /* #ifdef MBEDTLS_FS_IO */
+ /*(includes +1 for '\0' needed by mbedtls PEM parsing funcs)*/
+ if (mbedtls_pk_load_file(path, (unsigned char **)buf, n) != 0) {
+ wpa_printf(MSG_ERROR, "error: mbedtls_pk_load_file %s", path);
+ return -1;
+ }
+ #else
+ /*(use os_readfile() so that we can use os_free()
+ *(if we use mbedtls_pk_load_file() above, macros prevent calling free()
+ * directly #if defined(OS_REJECT_C_LIB_FUNCTIONS) and calling os_free()
+ * on buf aborts in tests if buf not allocated via os_malloc())*/
+ *buf = (u8 *)os_readfile(path, n);
+ if (!*buf) {
+ wpa_printf(MSG_ERROR, "error: os_readfile %s", path);
+ return -1;
+ }
+ u8 *buf0 = os_realloc(*buf, *n+1);
+ if (!buf0) {
+ bin_clear_free(*buf, *n);
+ *buf = NULL;
+ return -1;
+ }
+ buf0[(*n)++] = '\0';
+ *buf = buf0;
+ #endif
+ return 0;
+}
+
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_RSA
+#ifdef MBEDTLS_RSA_C
+
+#include <mbedtls/pk.h>
+#include <mbedtls/rsa.h>
+
+struct crypto_rsa_key * crypto_rsa_key_read(const char *file, bool private_key)
+{
+ /* mbedtls_pk_parse_keyfile() and mbedtls_pk_parse_public_keyfile()
+ * require #ifdef MBEDTLS_FS_IO in mbedtls library. Prefer to use
+ * crypto_mbedtls_readfile(), which wraps os_readfile() */
+ u8 *data;
+ size_t len;
+ if (crypto_mbedtls_readfile(file, &data, &len) != 0)
+ return NULL;
+
+ mbedtls_pk_context *ctx = os_malloc(sizeof(*ctx));
+ if (ctx == NULL) {
+ bin_clear_free(data, len);
+ return NULL;
+ }
+ mbedtls_pk_init(ctx);
+
+ int rc;
+ rc = (private_key
+ ? mbedtls_pk_parse_key(ctx, data, len, NULL, 0
+ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
+ ,mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg()
+ #endif
+ )
+ : mbedtls_pk_parse_public_key(ctx, data, len)) == 0
+ && mbedtls_pk_can_do(ctx, MBEDTLS_PK_RSA);
+
+ bin_clear_free(data, len);
+
+ if (rc) {
+ /* use MBEDTLS_RSA_PKCS_V21 padding for RSAES-OAEP */
+ /* use MBEDTLS_MD_SHA256 for these hostap interfaces */
+ #if MBEDTLS_VERSION_NUMBER < 0x03000000 /* mbedtls 3.0.0 */
+ /*(no return value in mbedtls 2.x)*/
+ mbedtls_rsa_set_padding(mbedtls_pk_rsa(*ctx),
+ MBEDTLS_RSA_PKCS_V21,
+ MBEDTLS_MD_SHA256);
+ #else
+ if (mbedtls_rsa_set_padding(mbedtls_pk_rsa(*ctx),
+ MBEDTLS_RSA_PKCS_V21,
+ MBEDTLS_MD_SHA256) == 0)
+ #endif
+ return (struct crypto_rsa_key *)ctx;
+ }
+
+ mbedtls_pk_free(ctx);
+ os_free(ctx);
+ return NULL;
+}
+
+struct wpabuf * crypto_rsa_oaep_sha256_encrypt(struct crypto_rsa_key *key,
+ const struct wpabuf *in)
+{
+ mbedtls_rsa_context *pk_rsa = mbedtls_pk_rsa(*(mbedtls_pk_context*)key);
+ size_t olen = mbedtls_rsa_get_len(pk_rsa);
+ struct wpabuf *buf = wpabuf_alloc(olen);
+ if (buf == NULL)
+ return NULL;
+
+ /* mbedtls_pk_encrypt() takes a few more hops to get to same func */
+ if (mbedtls_rsa_rsaes_oaep_encrypt(pk_rsa,
+ mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg(),
+ #if MBEDTLS_VERSION_NUMBER < 0x03000000 /* mbedtls 3.0.0 */
+ MBEDTLS_RSA_PRIVATE,
+ #endif
+ NULL, 0,
+ wpabuf_len(in), wpabuf_head(in),
+ wpabuf_put(buf, olen)) == 0) {
+ return buf;
+ }
+
+ wpabuf_clear_free(buf);
+ return NULL;
+}
+
+struct wpabuf * crypto_rsa_oaep_sha256_decrypt(struct crypto_rsa_key *key,
+ const struct wpabuf *in)
+{
+ mbedtls_rsa_context *pk_rsa = mbedtls_pk_rsa(*(mbedtls_pk_context*)key);
+ size_t olen = mbedtls_rsa_get_len(pk_rsa);
+ struct wpabuf *buf = wpabuf_alloc(olen);
+ if (buf == NULL)
+ return NULL;
+
+ /* mbedtls_pk_decrypt() takes a few more hops to get to same func */
+ if (mbedtls_rsa_rsaes_oaep_decrypt(pk_rsa,
+ mbedtls_ctr_drbg_random,
+ crypto_mbedtls_ctr_drbg(),
+ #if MBEDTLS_VERSION_NUMBER < 0x03000000 /* mbedtls 3.0.0 */
+ MBEDTLS_RSA_PUBLIC,
+ #endif
+ NULL, 0, &olen, wpabuf_head(in),
+ wpabuf_mhead(buf), olen) == 0) {
+ wpabuf_put(buf, olen);
+ return buf;
+ }
+
+ wpabuf_clear_free(buf);
+ return NULL;
+}
+
+void crypto_rsa_key_free(struct crypto_rsa_key *key)
+{
+ mbedtls_pk_free((mbedtls_pk_context *)key);
+ os_free(key);
+}
+
+#endif /* MBEDTLS_RSA_C */
+#endif /* CRYPTO_MBEDTLS_CRYPTO_RSA */
+
+#ifdef CRYPTO_MBEDTLS_CRYPTO_HPKE
+
+struct wpabuf * hpke_base_seal(enum hpke_kem_id kem_id,
+ enum hpke_kdf_id kdf_id,
+ enum hpke_aead_id aead_id,
+ struct crypto_ec_key *peer_pub,
+ const u8 *info, size_t info_len,
+ const u8 *aad, size_t aad_len,
+ const u8 *pt, size_t pt_len)
+{
+ /* not yet implemented */
+ return NULL;
+}
+
+struct wpabuf * hpke_base_open(enum hpke_kem_id kem_id,
+ enum hpke_kdf_id kdf_id,
+ enum hpke_aead_id aead_id,
+ struct crypto_ec_key *own_priv,
+ const u8 *info, size_t info_len,
+ const u8 *aad, size_t aad_len,
+ const u8 *enc_ct, size_t enc_ct_len)
+{
+ /* not yet implemented */
+ return NULL;
+}
+
+#endif
diff --git a/src/crypto/crypto_module_tests.c b/src/crypto/crypto_module_tests.c
index ffeddbadd..07c36d850 100644
--- a/src/crypto/crypto_module_tests.c
+++ b/src/crypto/crypto_module_tests.c
@@ -2470,6 +2470,139 @@ static int test_hpke(void)
}
+static int test_ecc(void)
+{
+#ifdef CONFIG_ECC
+#ifndef CONFIG_TLS_INTERNAL
+#ifndef CONFIG_TLS_GNUTLS
+#if defined(CONFIG_TLS_MBEDTLS) \
+ || defined(CONFIG_TLS_OPENSSL) \
+ || defined(CONFIG_TLS_WOLFSSL)
+ wpa_printf(MSG_INFO, "Testing ECC");
+ /* Note: some tests below are valid on supported Short Weierstrass
+ * curves, but not on Montgomery curves (e.g. IKE groups 31 and 32)
+ * (e.g. deriving and comparing y^2 test below not valid on Montgomery)
+ */
+#ifdef CONFIG_TLS_MBEDTLS
+ const int grps[] = {19, 20, 21, 25, 26, 28};
+#endif
+#ifdef CONFIG_TLS_OPENSSL
+ const int grps[] = {19, 20, 21, 26};
+#endif
+#ifdef CONFIG_TLS_WOLFSSL
+ const int grps[] = {19, 20, 21, 26};
+#endif
+ uint32_t i;
+ struct crypto_ec *e = NULL;
+ struct crypto_ec_point *p = NULL, *q = NULL;
+ struct crypto_bignum *x = NULL, *y = NULL;
+#ifdef CONFIG_DPP
+ u8 bin[4096];
+#endif
+ for (i = 0; i < ARRAY_SIZE(grps); ++i) {
+ e = crypto_ec_init(grps[i]);
+ if (e == NULL
+ || crypto_ec_prime_len(e) == 0
+ || crypto_ec_prime_len_bits(e) == 0
+ || crypto_ec_order_len(e) == 0
+ || crypto_ec_get_prime(e) == NULL
+ || crypto_ec_get_order(e) == NULL
+ || crypto_ec_get_a(e) == NULL
+ || crypto_ec_get_b(e) == NULL
+ || crypto_ec_get_generator(e) == NULL) {
+ break;
+ }
+#ifdef CONFIG_DPP
+ struct crypto_ec_key *key = crypto_ec_key_gen(grps[i]);
+ if (key == NULL)
+ break;
+ p = crypto_ec_key_get_public_key(key);
+ q = crypto_ec_key_get_public_key(key);
+ crypto_ec_key_deinit(key);
+ if (p == NULL || q == NULL)
+ break;
+ if (!crypto_ec_point_is_on_curve(e, p))
+ break;
+
+ /* inverted point should not match original;
+ * double-invert should match */
+ if (crypto_ec_point_invert(e, q) != 0
+ || crypto_ec_point_cmp(e, p, q) == 0
+ || crypto_ec_point_invert(e, q) != 0
+ || crypto_ec_point_cmp(e, p, q) != 0) {
+ break;
+ }
+
+ /* crypto_ec_point_to_bin() and crypto_ec_point_from_bin()
+ * imbalanced interfaces? */
+ size_t prime_len = crypto_ec_prime_len(e);
+ if (prime_len * 2 > sizeof(bin))
+ break;
+ if (crypto_ec_point_to_bin(e, p, bin, bin+prime_len) != 0)
+ break;
+ struct crypto_ec_point *tmp = crypto_ec_point_from_bin(e, bin);
+ if (tmp == NULL)
+ break;
+ if (crypto_ec_point_cmp(e, p, tmp) != 0) {
+ crypto_ec_point_deinit(tmp, 0);
+ break;
+ }
+ crypto_ec_point_deinit(tmp, 0);
+
+ x = crypto_bignum_init();
+ y = crypto_bignum_init_set(bin+prime_len, prime_len);
+ if (x == NULL || y == NULL || crypto_ec_point_x(e, p, x) != 0)
+ break;
+ struct crypto_bignum *y2 = crypto_ec_point_compute_y_sqr(e, x);
+ if (y2 == NULL)
+ break;
+ if (crypto_bignum_sqrmod(y, crypto_ec_get_prime(e), y) != 0
+ || crypto_bignum_cmp(y, y2) != 0) {
+ crypto_bignum_deinit(y2, 0);
+ break;
+ }
+ crypto_bignum_deinit(y2, 0);
+ crypto_bignum_deinit(x, 0);
+ crypto_bignum_deinit(y, 0);
+ x = NULL;
+ y = NULL;
+
+ x = crypto_bignum_init();
+ if (x == NULL)
+ break;
+ if (crypto_bignum_rand(x, crypto_ec_get_prime(e)) != 0)
+ break;
+ crypto_bignum_deinit(x, 0);
+ x = NULL;
+
+ crypto_ec_point_deinit(p, 0);
+ p = NULL;
+ crypto_ec_point_deinit(q, 0);
+ q = NULL;
+#endif /* CONFIG_DPP */
+ crypto_ec_deinit(e);
+ e = NULL;
+ }
+ if (i != ARRAY_SIZE(grps)) {
+ crypto_bignum_deinit(x, 0);
+ crypto_bignum_deinit(y, 0);
+ crypto_ec_point_deinit(p, 0);
+ crypto_ec_point_deinit(q, 0);
+ crypto_ec_deinit(e);
+ wpa_printf(MSG_INFO,
+ "ECC test case failed tls_id:%d", grps[i]);
+ return -1;
+ }
+
+ wpa_printf(MSG_INFO, "ECC test cases passed");
+#endif
+#endif /* !CONFIG_TLS_GNUTLS */
+#endif /* !CONFIG_TLS_INTERNAL */
+#endif /* CONFIG_ECC */
+ return 0;
+}
+
+
static int test_ms_funcs(void)
{
#ifndef CONFIG_FIPS
@@ -2591,6 +2724,7 @@ int crypto_module_tests(void)
test_fips186_2_prf() ||
test_extract_expand_hkdf() ||
test_hpke() ||
+ test_ecc() ||
test_ms_funcs())
ret = -1;
diff --git a/src/crypto/tls_mbedtls.c b/src/crypto/tls_mbedtls.c
new file mode 100644
index 000000000..d83a3db73
--- /dev/null
+++ b/src/crypto/tls_mbedtls.c
@@ -0,0 +1,3313 @@
+/*
+ * SSL/TLS interface functions for mbed TLS
+ *
+ * SPDX-FileCopyrightText: 2022 Glenn Strauss <gstrauss@gluelogic.com>
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
+ *
+ * template: src/crypto/tls_none.c
+ * reference: src/crypto/tls_*.c
+ *
+ * Known Limitations:
+ * - no TLSv1.3 (not available in mbedtls 2.x; experimental in mbedtls 3.x)
+ * - no OCSP (not yet available in mbedtls)
+ * - mbedtls does not support all certificate encodings used by hwsim tests
+ * PCKS#5 v1.5
+ * PCKS#12
+ * DH DSA
+ * - EAP-FAST, EAP-TEAP session ticket support not implemented in tls_mbedtls.c
+ * - mbedtls does not currently provide way to set an attribute in a CSR
+ * https://github.com/Mbed-TLS/mbedtls/issues/4886
+ * so tests/hwsim dpp_enterprise tests fail
+ * - DPP2 not supported
+ * PKCS#7 parsing is not supported in mbedtls
+ * See crypto_mbedtls.c:crypto_pkcs7_get_certificates() comments
+ * - DPP3 not supported
+ * hpke_base_seal() and hpke_base_seal() not implemented in crypto_mbedtls.c
+ *
+ * Status:
+ * - code written to be compatible with mbedtls 2.x and mbedtls 3.x
+ * (currently requires mbedtls >= 2.27.0 for mbedtls_mpi_random())
+ * (currently requires mbedtls >= 2.18.0 for mbedtls_ssl_tls_prf())
+ * - builds with tests/build/build-wpa_supplicant-mbedtls.config
+ * - passes all tests/ crypto module tests (incomplete coverage)
+ * ($ cd tests; make clean; make -j 4 run-tests CONFIG_TLS=mbedtls)
+ * - passes almost all tests/hwsim tests
+ * (hwsim tests skipped for missing features)
+ *
+ * RFE:
+ * - EAP-FAST, EAP-TEAP session ticket support not implemented in tls_mbedtls.c
+ * - client/server session resumption, and/or save client session ticket
+ */
+
+#include "includes.h"
+#include "common.h"
+
+#include <mbedtls/version.h>
+#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/error.h>
+#include <mbedtls/oid.h>
+#include <mbedtls/pem.h>
+#include <mbedtls/platform.h> /* mbedtls_calloc() mbedtls_free() */
+#include <mbedtls/platform_util.h> /* mbedtls_platform_zeroize() */
+#include <mbedtls/ssl.h>
+#include <mbedtls/ssl_ticket.h>
+#include <mbedtls/x509.h>
+#include <mbedtls/x509_crt.h>
+
+#if MBEDTLS_VERSION_NUMBER >= 0x02040000 /* mbedtls 2.4.0 */
+#include <mbedtls/net_sockets.h>
+#else
+#include <mbedtls/net.h>
+#endif
+
+#ifndef MBEDTLS_PRIVATE
+#define MBEDTLS_PRIVATE(x) x
+#endif
+
+#if MBEDTLS_VERSION_NUMBER < 0x03020000 /* mbedtls 3.2.0 */
+#define mbedtls_ssl_get_ciphersuite_id_from_ssl(ssl) \
+ ((ssl)->MBEDTLS_PRIVATE(session) \
+ ?(ssl)->MBEDTLS_PRIVATE(session)->MBEDTLS_PRIVATE(ciphersuite) \
+ : 0)
+#define mbedtls_ssl_ciphersuite_get_name(info) \
+ (info)->MBEDTLS_PRIVATE(name)
+#endif
+
+#include "crypto.h" /* sha256_vector() */
+#include "tls.h"
+
+#ifndef SHA256_DIGEST_LENGTH
+#define SHA256_DIGEST_LENGTH 32
+#endif
+
+#ifndef MBEDTLS_EXPKEY_FIXED_SECRET_LEN
+#define MBEDTLS_EXPKEY_FIXED_SECRET_LEN 48
+#endif
+
+#ifndef MBEDTLS_EXPKEY_RAND_LEN
+#define MBEDTLS_EXPKEY_RAND_LEN 32
+#endif
+
+#if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
+static mbedtls_ssl_export_keys_t tls_connection_export_keys_cb;
+#elif MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */
+static mbedtls_ssl_export_keys_ext_t tls_connection_export_keys_cb;
+#else /*(not implemented; return error)*/
+#define mbedtls_ssl_tls_prf(a,b,c,d,e,f,g,h) (-1)
+typedef mbedtls_tls_prf_types int;
+#endif
+
+
+/* hostapd/wpa_supplicant provides forced_memzero(),
+ * but prefer mbedtls_platform_zeroize() */
+#define forced_memzero(ptr,sz) mbedtls_platform_zeroize(ptr,sz)
+
+
+#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST) \
+ || defined(EAP_TEAP) || defined(EAP_SERVER_TEAP)
+#ifdef MBEDTLS_SSL_SESSION_TICKETS
+#ifdef MBEDTLS_SSL_TICKET_C
+#define TLS_MBEDTLS_SESSION_TICKETS
+#if defined(EAP_TEAP) || defined(EAP_SERVER_TEAP)
+#define TLS_MBEDTLS_EAP_TEAP
+#endif
+#if !defined(CONFIG_FIPS) /* EAP-FAST keys cannot be exported in FIPS mode */
+#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)
+#define TLS_MBEDTLS_EAP_FAST
+#endif
+#endif
+#endif
+#endif
+#endif
+
+
+struct tls_conf {
+ mbedtls_ssl_config conf;
+
+ unsigned int verify_peer:1;
+ unsigned int verify_depth0_only:1;
+ unsigned int check_crl:2; /*(needs :2 bits for 0, 1, 2)*/
+ unsigned int check_crl_strict:1; /*(needs :1 bit for 0, 1)*/
+ unsigned int ca_cert_probe:1;
+ unsigned int has_ca_cert:1;
+ unsigned int has_client_cert:1;
+ unsigned int has_private_key:1;
+ unsigned int suiteb128:1;
+ unsigned int suiteb192:1;
+ mbedtls_x509_crl *crl;
+ mbedtls_x509_crt ca_cert;
+ mbedtls_x509_crt client_cert;
+ mbedtls_pk_context private_key;
+
+ uint32_t refcnt;
+
+ unsigned int flags;
+ char *subject_match;
+ char *altsubject_match;
+ char *suffix_match;
+ char *domain_match;
+ char *check_cert_subject;
+ u8 ca_cert_hash[SHA256_DIGEST_LENGTH];
+
+ int *ciphersuites; /* list of ciphersuite ids for mbedtls_ssl_config */
+#if MBEDTLS_VERSION_NUMBER < 0x03010000 /* mbedtls 3.1.0 */
+ mbedtls_ecp_group_id *curves;
+#else
+ uint16_t *curves; /* list of curve ids for mbedtls_ssl_config */
+#endif
+};
+
+
+struct tls_global {
+ struct tls_conf *tls_conf;
+ char *ocsp_stapling_response;
+ mbedtls_ctr_drbg_context *ctr_drbg; /*(see crypto_mbedtls.c)*/
+ #ifdef MBEDTLS_SSL_SESSION_TICKETS
+ mbedtls_ssl_ticket_context ticket_ctx;
+ #endif
+ char *ca_cert_file;
+ struct os_reltime crl_reload_previous;
+ unsigned int crl_reload_interval;
+ uint32_t refcnt;
+ struct tls_config init_conf;
+};
+
+static struct tls_global tls_ctx_global;
+
+
+struct tls_connection {
+ struct tls_conf *tls_conf;
+ struct wpabuf *push_buf;
+ struct wpabuf *pull_buf;
+ size_t pull_buf_offset;
+
+ unsigned int established:1;
+ unsigned int resumed:1;
+ unsigned int verify_peer:1;
+ unsigned int is_server:1;
+
+ mbedtls_ssl_context ssl;
+
+ mbedtls_tls_prf_types tls_prf_type;
+ size_t expkey_keyblock_size;
+ size_t expkey_secret_len;
+ #if MBEDTLS_VERSION_NUMBER < 0x03000000 /* mbedtls 3.0.0 */
+ unsigned char expkey_secret[MBEDTLS_EXPKEY_FIXED_SECRET_LEN];
+ #else
+ unsigned char expkey_secret[MBEDTLS_MD_MAX_SIZE];
+ #endif
+ unsigned char expkey_randbytes[MBEDTLS_EXPKEY_RAND_LEN*2];
+
+ int read_alerts, write_alerts, failed;
+
+ #ifdef TLS_MBEDTLS_SESSION_TICKETS
+ tls_session_ticket_cb session_ticket_cb;
+ void *session_ticket_cb_ctx;
+ unsigned char *clienthello_session_ticket;
+ size_t clienthello_session_ticket_len;
+ #endif
+ char *peer_subject; /* peer subject info for authenticated peer */
+ struct wpabuf *success_data;
+};
+
+
+#ifndef __has_attribute
+#define __has_attribute(x) 0
+#endif
+
+#ifndef __GNUC_PREREQ
+#define __GNUC_PREREQ(maj,min) 0
+#endif
+
+#ifndef __attribute_cold__
+#if __has_attribute(cold) \
+ || __GNUC_PREREQ(4,3)
+#define __attribute_cold__ __attribute__((__cold__))
+#else
+#define __attribute_cold__
+#endif
+#endif
+
+#ifndef __attribute_noinline__
+#if __has_attribute(noinline) \
+ || __GNUC_PREREQ(3,1)
+#define __attribute_noinline__ __attribute__((__noinline__))
+#else
+#define __attribute_noinline__
+#endif
+#endif
+
+
+__attribute_cold__
+__attribute_noinline__
+static void emsg(int level, const char * const msg)
+{
+ wpa_printf(level, "MTLS: %s", msg);
+}
+
+
+__attribute_cold__
+__attribute_noinline__
+static void emsgrc(int level, const char * const msg, int rc)
+{
+ #ifdef MBEDTLS_ERROR_C
+ /* error logging convenience function that decodes mbedtls result codes */
+ char buf[256];
+ mbedtls_strerror(rc, buf, sizeof(buf));
+ wpa_printf(level, "MTLS: %s: %s (-0x%04x)", msg, buf, -rc);
+ #else
+ wpa_printf(level, "MTLS: %s: (-0x%04x)", msg, -rc);
+ #endif
+}
+
+
+#define elog(rc, msg) emsgrc(MSG_ERROR, (msg), (rc))
+#define ilog(rc, msg) emsgrc(MSG_INFO, (msg), (rc))
+
+
+struct tls_conf * tls_conf_init(void *tls_ctx)
+{
+ struct tls_conf *tls_conf = os_zalloc(sizeof(*tls_conf));
+ if (tls_conf == NULL)
+ return NULL;
+ tls_conf->refcnt = 1;
+
+ mbedtls_ssl_config_init(&tls_conf->conf);
+ mbedtls_ssl_conf_rng(&tls_conf->conf,
+ mbedtls_ctr_drbg_random, tls_ctx_global.ctr_drbg);
+ mbedtls_x509_crt_init(&tls_conf->ca_cert);
+ mbedtls_x509_crt_init(&tls_conf->client_cert);
+ mbedtls_pk_init(&tls_conf->private_key);
+
+ return tls_conf;
+}
+
+
+void tls_conf_deinit(struct tls_conf *tls_conf)
+{
+ if (tls_conf == NULL || --tls_conf->refcnt != 0)
+ return;
+
+ mbedtls_x509_crt_free(&tls_conf->ca_cert);
+ mbedtls_x509_crt_free(&tls_conf->client_cert);
+ if (tls_conf->crl) {
+ mbedtls_x509_crl_free(tls_conf->crl);
+ os_free(tls_conf->crl);
+ }
+ mbedtls_pk_free(&tls_conf->private_key);
+ mbedtls_ssl_config_free(&tls_conf->conf);
+ os_free(tls_conf->curves);
+ os_free(tls_conf->ciphersuites);
+ os_free(tls_conf->subject_match);
+ os_free(tls_conf->altsubject_match);
+ os_free(tls_conf->suffix_match);
+ os_free(tls_conf->domain_match);
+ os_free(tls_conf->check_cert_subject);
+ os_free(tls_conf);
+}
+
+
+mbedtls_ctr_drbg_context * crypto_mbedtls_ctr_drbg(void); /*(not in header)*/
+
+__attribute_cold__
+void * tls_init(const struct tls_config *conf)
+{
+ /* RFE: review struct tls_config *conf (different from tls_conf) */
+
+ if (++tls_ctx_global.refcnt > 1)
+ return &tls_ctx_global;
+
+ tls_ctx_global.ctr_drbg = crypto_mbedtls_ctr_drbg();
+ #ifdef MBEDTLS_SSL_SESSION_TICKETS
+ mbedtls_ssl_ticket_init(&tls_ctx_global.ticket_ctx);
+ mbedtls_ssl_ticket_setup(&tls_ctx_global.ticket_ctx,
+ mbedtls_ctr_drbg_random,
+ tls_ctx_global.ctr_drbg,
+ MBEDTLS_CIPHER_AES_256_GCM,
+ 43200); /* ticket timeout: 12 hours */
+ #endif
+ /* copy struct for future use */
+ tls_ctx_global.init_conf = *conf;
+ if (conf->openssl_ciphers)
+ tls_ctx_global.init_conf.openssl_ciphers =
+ os_strdup(conf->openssl_ciphers);
+
+ tls_ctx_global.crl_reload_interval = conf->crl_reload_interval;
+ os_get_reltime(&tls_ctx_global.crl_reload_previous);
+
+ return &tls_ctx_global;
+}
+
+
+__attribute_cold__
+void tls_deinit(void *tls_ctx)
+{
+ if (tls_ctx == NULL || --tls_ctx_global.refcnt != 0)
+ return;
+
+ tls_conf_deinit(tls_ctx_global.tls_conf);
+ os_free(tls_ctx_global.ca_cert_file);
+ os_free(tls_ctx_global.ocsp_stapling_response);
+ char *openssl_ciphers; /*(allocated in tls_init())*/
+ *(const char **)&openssl_ciphers =
+ tls_ctx_global.init_conf.openssl_ciphers;
+ os_free(openssl_ciphers);
+ #ifdef MBEDTLS_SSL_SESSION_TICKETS
+ mbedtls_ssl_ticket_free(&tls_ctx_global.ticket_ctx);
+ #endif
+ os_memset(&tls_ctx_global, 0, sizeof(tls_ctx_global));
+}
+
+
+int tls_get_errors(void *tls_ctx)
+{
+ return 0;
+}
+
+
+static void tls_connection_deinit_expkey(struct tls_connection *conn)
+{
+ conn->tls_prf_type = 0; /* MBEDTLS_SSL_TLS_PRF_NONE; */
+ conn->expkey_keyblock_size = 0;
+ conn->expkey_secret_len = 0;
+ forced_memzero(conn->expkey_secret, sizeof(conn->expkey_secret));
+ forced_memzero(conn->expkey_randbytes, sizeof(conn->expkey_randbytes));
+}
+
+
+#ifdef TLS_MBEDTLS_SESSION_TICKETS
+void tls_connection_deinit_clienthello_session_ticket(struct tls_connection *conn)
+{
+ if (conn->clienthello_session_ticket) {
+ mbedtls_platform_zeroize(conn->clienthello_session_ticket,
+ conn->clienthello_session_ticket_len);
+ mbedtls_free(conn->clienthello_session_ticket);
+ conn->clienthello_session_ticket = NULL;
+ conn->clienthello_session_ticket_len = 0;
+ }
+}
+#endif
+
+
+void tls_connection_deinit(void *tls_ctx, struct tls_connection *conn)
+{
+ if (conn == NULL)
+ return;
+
+ #if 0 /*(good intention, but never sent since we destroy self below)*/
+ if (conn->established)
+ mbedtls_ssl_close_notify(&conn->ssl);
+ #endif
+
+ if (conn->tls_prf_type)
+ tls_connection_deinit_expkey(conn);
+
+ #ifdef TLS_MBEDTLS_SESSION_TICKETS
+ if (conn->clienthello_session_ticket)
+ tls_connection_deinit_clienthello_session_ticket(conn);
+ #endif
+
+ os_free(conn->peer_subject);
+ wpabuf_free(conn->success_data);
+ wpabuf_free(conn->push_buf);
+ wpabuf_free(conn->pull_buf);
+ mbedtls_ssl_free(&conn->ssl);
+ tls_conf_deinit(conn->tls_conf);
+ os_free(conn);
+}
+
+
+static void tls_mbedtls_refresh_crl(void);
+static int tls_mbedtls_ssl_setup(struct tls_connection *conn);
+
+struct tls_connection * tls_connection_init(void *tls_ctx)
+{
+ struct tls_connection *conn = os_zalloc(sizeof(*conn));
+ if (conn == NULL)
+ return NULL;
+
+ mbedtls_ssl_init(&conn->ssl);
+
+ conn->tls_conf = tls_ctx_global.tls_conf; /*(inherit global conf, if set)*/
+ if (conn->tls_conf) {
+ ++conn->tls_conf->refcnt;
+ /* check for CRL refresh if inheriting from global config */
+ tls_mbedtls_refresh_crl();
+
+ conn->verify_peer = conn->tls_conf->verify_peer;
+ if (tls_mbedtls_ssl_setup(conn) != 0) {
+ tls_connection_deinit(&tls_ctx_global, conn);
+ return NULL;
+ }
+ }
+
+ return conn;
+}
+
+
+int tls_connection_established(void *tls_ctx, struct tls_connection *conn)
+{
+ return conn ? conn->established : 0;
+}
+
+
+__attribute_noinline__
+char * tls_mbedtls_peer_serial_num(const mbedtls_x509_crt *crt, char *serial_num, size_t len)
+{
+ /* mbedtls_x509_serial_gets() inefficiently formats to hex separated by
+ * colons, so generate the hex serial number here. The func
+ * wpa_snprintf_hex_uppercase() is similarly inefficient. */
+ size_t i = 0; /* skip leading 0's per Distinguished Encoding Rules (DER) */
+ while (i < crt->serial.len && crt->serial.p[i] == 0) ++i;
+ if (i == crt->serial.len) --i;
+
+ const unsigned char *s = crt->serial.p + i;
+ const size_t e = (crt->serial.len - i) * 2;
+ if (e >= len)
+ return NULL;
+ #if 0
+ wpa_snprintf_hex_uppercase(serial_num, len, s, crt->serial.len-i);
+ #else
+ for (i = 0; i < e; i+=2, ++s) {
+ serial_num[i+0] = "0123456789ABCDEF"[(*s >> 4)];
+ serial_num[i+1] = "0123456789ABCDEF"[(*s & 0xF)];
+ }
+ serial_num[e] = '\0';
+ #endif
+ return serial_num;
+}
+
+
+char * tls_connection_peer_serial_num(void *tls_ctx,
+ struct tls_connection *conn)
+{
+ const mbedtls_x509_crt *crt = mbedtls_ssl_get_peer_cert(&conn->ssl);
+ if (crt == NULL)
+ return NULL;
+ size_t len = crt->serial.len * 2 + 1;
+ char *serial_num = os_malloc(len);
+ if (!serial_num)
+ return NULL;
+ return tls_mbedtls_peer_serial_num(crt, serial_num, len);
+}
+
+
+static void tls_pull_buf_reset(struct tls_connection *conn);
+
+int tls_connection_shutdown(void *tls_ctx, struct tls_connection *conn)
+{
+ /* Note: this function called from eap_peer_tls_reauth_init()
+ * for session resumption, not for connection shutdown */
+
+ if (conn == NULL)
+ return -1;
+
+ tls_pull_buf_reset(conn);
+ wpabuf_free(conn->push_buf);
+ conn->push_buf = NULL;
+ conn->established = 0;
+ conn->resumed = 0;
+ if (conn->tls_prf_type)
+ tls_connection_deinit_expkey(conn);
+
+ /* RFE: prepare for session resumption? (see doc in crypto/tls.h) */
+
+ return mbedtls_ssl_session_reset(&conn->ssl);
+}
+
+
+static int tls_wpabuf_resize_put_data(struct wpabuf **buf,
+ const unsigned char *data, size_t dlen)
+{
+ if (wpabuf_resize(buf, dlen) < 0)
+ return 0;
+ wpabuf_put_data(*buf, data, dlen);
+ return 1;
+}
+
+
+static int tls_pull_buf_append(struct tls_connection *conn,
+ const struct wpabuf *in_data)
+{
+ /*(interface does not lend itself to move semantics)*/
+ return tls_wpabuf_resize_put_data(&conn->pull_buf,
+ wpabuf_head(in_data),
+ wpabuf_len(in_data));
+}
+
+
+static void tls_pull_buf_reset(struct tls_connection *conn)
+{
+ /*(future: might consider reusing conn->pull_buf)*/
+ wpabuf_free(conn->pull_buf);
+ conn->pull_buf = NULL;
+ conn->pull_buf_offset = 0;
+}
+
+
+__attribute_cold__
+static void tls_pull_buf_discard(struct tls_connection *conn, const char *func)
+{
+ size_t discard = wpabuf_len(conn->pull_buf) - conn->pull_buf_offset;
+ if (discard)
+ wpa_printf(MSG_DEBUG,
+ "%s - %zu bytes remaining in pull_buf; discarding",
+ func, discard);
+ tls_pull_buf_reset(conn);
+}
+
+
+static int tls_pull_func(void *ptr, unsigned char *buf, size_t len)
+{
+ struct tls_connection *conn = (struct tls_connection *) ptr;
+ if (conn->pull_buf == NULL)
+ return MBEDTLS_ERR_SSL_WANT_READ;
+ const size_t dlen = wpabuf_len(conn->pull_buf) - conn->pull_buf_offset;
+ if (dlen == 0)
+ return MBEDTLS_ERR_SSL_WANT_READ;
+
+ if (len > dlen)
+ len = dlen;
+ os_memcpy(buf, wpabuf_head(conn->pull_buf)+conn->pull_buf_offset, len);
+
+ if (len == dlen) {
+ tls_pull_buf_reset(conn);
+ /*wpa_printf(MSG_DEBUG, "%s - emptied pull_buf", __func__);*/
+ }
+ else {
+ conn->pull_buf_offset += len;
+ /*wpa_printf(MSG_DEBUG, "%s - %zu bytes remaining in pull_buf",
+ __func__, dlen - len);*/
+ }
+ return (int)len;
+}
+
+
+static int tls_push_func(void *ptr, const unsigned char *buf, size_t len)
+{
+ struct tls_connection *conn = (struct tls_connection *) ptr;
+ return tls_wpabuf_resize_put_data(&conn->push_buf, buf, len)
+ ? (int)len
+ : MBEDTLS_ERR_SSL_ALLOC_FAILED;
+}
+
+
+static int
+tls_mbedtls_verify_cb (void *arg, mbedtls_x509_crt *crt, int depth, uint32_t *flags);
+
+
+static int tls_mbedtls_ssl_setup(struct tls_connection *conn)
+{
+ #if 0
+ /* mbedtls_ssl_setup() must be called only once */
+ /* If this func might be called multiple times (e.g. via set_params),
+ * then we should set a flag in conn that ssl was initialized */
+ if (conn->ssl_is_init) {
+ mbedtls_ssl_free(&conn->ssl);
+ mbedtls_ssl_init(&conn->ssl);
+ }
+ #endif
+
+ int ret = mbedtls_ssl_setup(&conn->ssl, &conn->tls_conf->conf);
+ if (ret != 0) {
+ elog(ret, "mbedtls_ssl_setup");
+ return -1;
+ }
+
+ mbedtls_ssl_set_bio(&conn->ssl, conn, tls_push_func, tls_pull_func, NULL);
+ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
+ mbedtls_ssl_set_export_keys_cb(
+ &conn->ssl, tls_connection_export_keys_cb, conn);
+ #elif MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */
+ mbedtls_ssl_conf_export_keys_ext_cb(
+ &conn->tls_conf->conf, tls_connection_export_keys_cb, conn);
+ #endif
+ if (conn->verify_peer)
+ mbedtls_ssl_set_verify(&conn->ssl, tls_mbedtls_verify_cb, conn);
+
+ return 0;
+}
+
+
+static int tls_mbedtls_data_is_pem(const u8 *data)
+{
+ return (NULL != os_strstr((char *)data, "-----"));
+}
+
+
+static void tls_mbedtls_set_allowed_tls_vers(struct tls_conf *tls_conf,
+ mbedtls_ssl_config *conf)
+{
+ #if !defined(MBEDTLS_SSL_PROTO_TLS1_3)
+ tls_conf->flags |= TLS_CONN_DISABLE_TLSv1_3;
+ #endif
+
+ /* unconditionally require TLSv1.2+ for TLS_CONN_SUITEB */
+ if (tls_conf->flags & TLS_CONN_SUITEB) {
+ tls_conf->flags |= TLS_CONN_DISABLE_TLSv1_0;
+ tls_conf->flags |= TLS_CONN_DISABLE_TLSv1_1;
+ }
+
+ const unsigned int flags = tls_conf->flags;
+
+ /* attempt to map flags to min and max TLS protocol version */
+
+ int min = (flags & TLS_CONN_DISABLE_TLSv1_0)
+ ? (flags & TLS_CONN_DISABLE_TLSv1_1)
+ ? (flags & TLS_CONN_DISABLE_TLSv1_2)
+ ? (flags & TLS_CONN_DISABLE_TLSv1_3)
+ ? 4
+ : 3
+ : 2
+ : 1
+ : 0;
+
+ int max = (flags & TLS_CONN_DISABLE_TLSv1_3)
+ ? (flags & TLS_CONN_DISABLE_TLSv1_2)
+ ? (flags & TLS_CONN_DISABLE_TLSv1_1)
+ ? (flags & TLS_CONN_DISABLE_TLSv1_0)
+ ? -1
+ : 0
+ : 1
+ : 2
+ : 3;
+
+ if ((flags & TLS_CONN_ENABLE_TLSv1_2) && min > 2) min = 2;
+ if ((flags & TLS_CONN_ENABLE_TLSv1_1) && min > 1) min = 1;
+ if ((flags & TLS_CONN_ENABLE_TLSv1_0) && min > 0) min = 0;
+ if (max < min) {
+ emsg(MSG_ERROR, "invalid tls_disable_tlsv* params; ignoring");
+ return;
+ }
+ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
+ /* mbed TLS 3.0.0 removes support for protocols < TLSv1.2 */
+ if (min < 2 || max < 2) {
+ emsg(MSG_ERROR, "invalid tls_disable_tlsv* params; ignoring");
+ if (min < 2) min = 2;
+ if (max < 2) max = 2;
+ }
+ #endif
+
+ #if MBEDTLS_VERSION_NUMBER >= 0x03020000 /* mbedtls 3.2.0 */
+ /* MBEDTLS_SSL_VERSION_TLS1_2 = 0x0303 *//*!< (D)TLS 1.2 */
+ /* MBEDTLS_SSL_VERSION_TLS1_3 = 0x0304 *//*!< (D)TLS 1.3 */
+ min = (min == 2) ? MBEDTLS_SSL_VERSION_TLS1_2 : MBEDTLS_SSL_VERSION_TLS1_3;
+ max = (max == 2) ? MBEDTLS_SSL_VERSION_TLS1_2 : MBEDTLS_SSL_VERSION_TLS1_3;
+ mbedtls_ssl_conf_min_tls_version(conf, min);
+ mbedtls_ssl_conf_max_tls_version(conf, max);
+ #else
+ #ifndef MBEDTLS_SSL_MINOR_VERSION_4
+ if (min == 3) min = 2;
+ if (max == 3) max = 2;
+ #endif
+ /* MBEDTLS_SSL_MINOR_VERSION_0 0 *//*!< SSL v3.0 */
+ /* MBEDTLS_SSL_MINOR_VERSION_1 1 *//*!< TLS v1.0 */
+ /* MBEDTLS_SSL_MINOR_VERSION_2 2 *//*!< TLS v1.1 */
+ /* MBEDTLS_SSL_MINOR_VERSION_3 3 *//*!< TLS v1.2 */
+ /* MBEDTLS_SSL_MINOR_VERSION_4 4 *//*!< TLS v1.3 */
+ mbedtls_ssl_conf_min_version(conf, MBEDTLS_SSL_MAJOR_VERSION_3, min+1);
+ mbedtls_ssl_conf_max_version(conf, MBEDTLS_SSL_MAJOR_VERSION_3, max+1);
+ #endif
+}
+
+
+__attribute_noinline__
+static int tls_mbedtls_readfile(const char *path, u8 **buf, size_t *n);
+
+
+static int
+tls_mbedtls_set_dhparams(struct tls_conf *tls_conf, const char *dh_file)
+{
+ size_t len;
+ u8 *data;
+ if (tls_mbedtls_readfile(dh_file, &data, &len))
+ return 0;
+
+ /* parse only if DH parameters if in PEM format */
+ if (tls_mbedtls_data_is_pem(data)
+ && NULL == os_strstr((char *)data, "-----BEGIN DH PARAMETERS-----")) {
+ if (os_strstr((char *)data, "-----BEGIN DSA PARAMETERS-----"))
+ wpa_printf(MSG_WARNING, "DSA parameters not handled (%s)", dh_file);
+ else
+ wpa_printf(MSG_WARNING, "unexpected DH param content (%s)",dh_file);
+ forced_memzero(data, len);
+ os_free(data);
+ return 0;
+ }
+
+ /* mbedtls_dhm_parse_dhm() expects "-----BEGIN DH PARAMETERS-----" if PEM */
+ mbedtls_dhm_context dhm;
+ mbedtls_dhm_init(&dhm);
+ int rc = mbedtls_dhm_parse_dhm(&dhm, data, len);
+ if (0 == rc)
+ rc = mbedtls_ssl_conf_dh_param_ctx(&tls_conf->conf, &dhm);
+ if (0 != rc)
+ elog(rc, dh_file);
+ mbedtls_dhm_free(&dhm);
+
+ forced_memzero(data, len);
+ os_free(data);
+ return (0 == rc);
+}
+
+
+/* reference: lighttpd src/mod_mbedtls.c:mod_mbedtls_ssl_append_curve()
+ * (same author: gstrauss@gluelogic.com; same license: BSD-3-Clause) */
+#if MBEDTLS_VERSION_NUMBER < 0x03010000 /* mbedtls 3.1.0 */
+static int
+tls_mbedtls_append_curve (mbedtls_ecp_group_id *ids, int nids, int idsz, const mbedtls_ecp_group_id id)
+{
+ if (1 >= idsz - (nids + 1)) {
+ emsg(MSG_ERROR, "error: too many curves during list expand");
+ return -1;
+ }
+ ids[++nids] = id;
+ return nids;
+}
+
+
+static int
+tls_mbedtls_set_curves(struct tls_conf *tls_conf, const char *curvelist)
+{
+ mbedtls_ecp_group_id ids[512];
+ int nids = -1;
+ const int idsz = (int)(sizeof(ids)/sizeof(*ids)-1);
+ const mbedtls_ecp_curve_info * const curve_info = mbedtls_ecp_curve_list();
+
+ for (const char *e = curvelist-1; e; ) {
+ const char * const n = e+1;
+ e = os_strchr(n, ':');
+ size_t len = e ? (size_t)(e - n) : os_strlen(n);
+ mbedtls_ecp_group_id grp_id = MBEDTLS_ECP_DP_NONE;
+ switch (len) {
+ case 5:
+ if (0 == os_memcmp("P-521", n, 5))
+ grp_id = MBEDTLS_ECP_DP_SECP521R1;
+ else if (0 == os_memcmp("P-384", n, 5))
+ grp_id = MBEDTLS_ECP_DP_SECP384R1;
+ else if (0 == os_memcmp("P-256", n, 5))
+ grp_id = MBEDTLS_ECP_DP_SECP256R1;
+ break;
+ case 6:
+ if (0 == os_memcmp("BP-521", n, 6))
+ grp_id = MBEDTLS_ECP_DP_BP512R1;
+ else if (0 == os_memcmp("BP-384", n, 6))
+ grp_id = MBEDTLS_ECP_DP_BP384R1;
+ else if (0 == os_memcmp("BP-256", n, 6))
+ grp_id = MBEDTLS_ECP_DP_BP256R1;
+ break;
+ default:
+ break;
+ }
+ if (grp_id != MBEDTLS_ECP_DP_NONE) {
+ nids = tls_mbedtls_append_curve(ids, nids, idsz, grp_id);
+ if (-1 == nids) return 0;
+ continue;
+ }
+ /* similar to mbedtls_ecp_curve_info_from_name() */
+ const mbedtls_ecp_curve_info *info;
+ for (info = curve_info; info->grp_id != MBEDTLS_ECP_DP_NONE; ++info) {
+ if (0 == os_strncmp(info->name, n, len) && info->name[len] == '\0')
+ break;
+ }
+ if (info->grp_id == MBEDTLS_ECP_DP_NONE) {
+ wpa_printf(MSG_ERROR, "MTLS: unrecognized curve: %.*s",(int)len,n);
+ return 0;
+ }
+
+ nids = tls_mbedtls_append_curve(ids, nids, idsz, info->grp_id);
+ if (-1 == nids) return 0;
+ }
+
+ /* mod_openssl configures "prime256v1" if curve list not specified,
+ * but mbedtls provides a list of supported curves if not explicitly set */
+ if (-1 == nids) return 1; /* empty list; no-op */
+
+ ids[++nids] = MBEDTLS_ECP_DP_NONE; /* terminate list */
+ ++nids;
+
+ /* curves list must be persistent for lifetime of mbedtls_ssl_config */
+ tls_conf->curves = os_malloc(nids * sizeof(mbedtls_ecp_group_id));
+ if (tls_conf->curves == NULL)
+ return 0;
+ os_memcpy(tls_conf->curves, ids, nids * sizeof(mbedtls_ecp_group_id));
+
+ mbedtls_ssl_conf_curves(&tls_conf->conf, tls_conf->curves);
+ return 1;
+}
+#else
+static int
+tls_mbedtls_append_curve (uint16_t *ids, int nids, int idsz, const uint16_t id)
+{
+ if (1 >= idsz - (nids + 1)) {
+ emsg(MSG_ERROR, "error: too many curves during list expand");
+ return -1;
+ }
+ ids[++nids] = id;
+ return nids;
+}
+
+
+static int
+tls_mbedtls_set_curves(struct tls_conf *tls_conf, const char *curvelist)
+{
+ /* TLS Supported Groups (renamed from "EC Named Curve Registry")
+ * https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8
+ */
+ uint16_t ids[512];
+ int nids = -1;
+ const int idsz = (int)(sizeof(ids)/sizeof(*ids)-1);
+ const mbedtls_ecp_curve_info * const curve_info = mbedtls_ecp_curve_list();
+
+ for (const char *e = curvelist-1; e; ) {
+ const char * const n = e+1;
+ e = os_strchr(n, ':');
+ size_t len = e ? (size_t)(e - n) : os_strlen(n);
+ uint16_t tls_id = 0;
+ switch (len) {
+ case 5:
+ if (0 == os_memcmp("P-521", n, 5))
+ tls_id = 25; /* mbedtls_ecp_group_id MBEDTLS_ECP_DP_SECP521R1 */
+ else if (0 == os_memcmp("P-384", n, 5))
+ tls_id = 24; /* mbedtls_ecp_group_id MBEDTLS_ECP_DP_SECP384R1 */
+ else if (0 == os_memcmp("P-256", n, 5))
+ tls_id = 23; /* mbedtls_ecp_group_id MBEDTLS_ECP_DP_SECP256R1 */
+ break;
+ case 6:
+ if (0 == os_memcmp("BP-521", n, 6))
+ tls_id = 28; /* mbedtls_ecp_group_id MBEDTLS_ECP_DP_BP512R1 */
+ else if (0 == os_memcmp("BP-384", n, 6))
+ tls_id = 27; /* mbedtls_ecp_group_id MBEDTLS_ECP_DP_BP384R1 */
+ else if (0 == os_memcmp("BP-256", n, 6))
+ tls_id = 26; /* mbedtls_ecp_group_id MBEDTLS_ECP_DP_BP256R1 */
+ break;
+ default:
+ break;
+ }
+ if (tls_id != 0) {
+ nids = tls_mbedtls_append_curve(ids, nids, idsz, tls_id);
+ if (-1 == nids) return 0;
+ continue;
+ }
+ /* similar to mbedtls_ecp_curve_info_from_name() */
+ const mbedtls_ecp_curve_info *info;
+ for (info = curve_info; info->tls_id != 0; ++info) {
+ if (0 == os_strncmp(info->name, n, len) && info->name[len] == '\0')
+ break;
+ }
+ if (info->tls_id == 0) {
+ wpa_printf(MSG_ERROR, "MTLS: unrecognized curve: %.*s",(int)len,n);
+ return 0;
+ }
+
+ nids = tls_mbedtls_append_curve(ids, nids, idsz, info->tls_id);
+ if (-1 == nids) return 0;
+ }
+
+ /* mod_openssl configures "prime256v1" if curve list not specified,
+ * but mbedtls provides a list of supported curves if not explicitly set */
+ if (-1 == nids) return 1; /* empty list; no-op */
+
+ ids[++nids] = 0; /* terminate list */
+ ++nids;
+
+ /* curves list must be persistent for lifetime of mbedtls_ssl_config */
+ tls_conf->curves = os_malloc(nids * sizeof(uint16_t));
+ if (tls_conf->curves == NULL)
+ return 0;
+ os_memcpy(tls_conf->curves, ids, nids * sizeof(uint16_t));
+
+ mbedtls_ssl_conf_groups(&tls_conf->conf, tls_conf->curves);
+ return 1;
+}
+#endif /* MBEDTLS_VERSION_NUMBER >= 0x03010000 */ /* mbedtls 3.1.0 */
+
+
+/* data copied from lighttpd src/mod_mbedtls.c (BSD-3-Clause) */
+static const int suite_AES_256_ephemeral[] = {
+ /* All AES-256 ephemeral suites */
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CCM,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CCM,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CCM_8
+};
+
+/* data copied from lighttpd src/mod_mbedtls.c (BSD-3-Clause) */
+static const int suite_AES_128_ephemeral[] = {
+ /* All AES-128 ephemeral suites */
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CCM,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CCM,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CCM_8
+};
+
+/* data copied from lighttpd src/mod_mbedtls.c (BSD-3-Clause) */
+/* HIGH cipher list (mapped from openssl list to mbedtls) */
+static const int suite_HIGH[] = {
+ MBEDTLS_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+ MBEDTLS_TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CCM,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CCM,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CCM_8,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384,
+ MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256,
+ MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384,
+ MBEDTLS_TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CCM,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CCM,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8,
+ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CCM_8,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+ MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+ MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256,
+ MBEDTLS_TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256,
+ MBEDTLS_TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256,
+ MBEDTLS_TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256,
+ MBEDTLS_TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256,
+ MBEDTLS_TLS_DHE_PSK_WITH_AES_256_GCM_SHA384,
+ MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CCM,
+ MBEDTLS_TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
+ MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CBC_SHA384,
+ MBEDTLS_TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA,
+ MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CBC_SHA,
+ MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+ MBEDTLS_TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+ MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CCM_8,
+ MBEDTLS_TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384,
+ MBEDTLS_TLS_DHE_PSK_WITH_AES_128_GCM_SHA256,
+ MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CCM,
+ MBEDTLS_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
+ MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CBC_SHA256,
+ MBEDTLS_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA,
+ MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CBC_SHA,
+ MBEDTLS_TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+ MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+ MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CCM_8,
+ MBEDTLS_TLS_DHE_PSK_WITH_ARIA_128_GCM_SHA256,
+ MBEDTLS_TLS_RSA_WITH_AES_256_GCM_SHA384,
+ MBEDTLS_TLS_RSA_WITH_AES_256_CCM,
+ MBEDTLS_TLS_RSA_WITH_AES_256_CBC_SHA256,
+ MBEDTLS_TLS_RSA_WITH_AES_256_CBC_SHA,
+ MBEDTLS_TLS_RSA_WITH_AES_256_CCM_8,
+ MBEDTLS_TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256,
+ MBEDTLS_TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,
+ MBEDTLS_TLS_RSA_WITH_ARIA_256_GCM_SHA384,
+ MBEDTLS_TLS_RSA_WITH_AES_128_GCM_SHA256,
+ MBEDTLS_TLS_RSA_WITH_AES_128_CCM,
+ MBEDTLS_TLS_RSA_WITH_AES_128_CBC_SHA256,
+ MBEDTLS_TLS_RSA_WITH_AES_128_CBC_SHA,
+ MBEDTLS_TLS_RSA_WITH_AES_128_CCM_8,
+ MBEDTLS_TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+ MBEDTLS_TLS_RSA_WITH_CAMELLIA_128_CBC_SHA,
+ MBEDTLS_TLS_RSA_WITH_ARIA_128_GCM_SHA256,
+ MBEDTLS_TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256,
+ MBEDTLS_TLS_RSA_PSK_WITH_AES_256_GCM_SHA384,
+ MBEDTLS_TLS_RSA_PSK_WITH_AES_256_CBC_SHA384,
+ MBEDTLS_TLS_RSA_PSK_WITH_AES_256_CBC_SHA,
+ MBEDTLS_TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+ MBEDTLS_TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384,
+ MBEDTLS_TLS_RSA_PSK_WITH_AES_128_GCM_SHA256,
+ MBEDTLS_TLS_RSA_PSK_WITH_AES_128_CBC_SHA256,
+ MBEDTLS_TLS_RSA_PSK_WITH_AES_128_CBC_SHA,
+ MBEDTLS_TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+ MBEDTLS_TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256,
+ MBEDTLS_TLS_PSK_WITH_CHACHA20_POLY1305_SHA256,
+ MBEDTLS_TLS_PSK_WITH_AES_256_GCM_SHA384,
+ MBEDTLS_TLS_PSK_WITH_AES_256_CCM,
+ MBEDTLS_TLS_PSK_WITH_AES_256_CBC_SHA384,
+ MBEDTLS_TLS_PSK_WITH_AES_256_CBC_SHA,
+ MBEDTLS_TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+ MBEDTLS_TLS_PSK_WITH_AES_256_CCM_8,
+ MBEDTLS_TLS_PSK_WITH_ARIA_256_GCM_SHA384,
+ MBEDTLS_TLS_PSK_WITH_AES_128_GCM_SHA256,
+ MBEDTLS_TLS_PSK_WITH_AES_128_CCM,
+ MBEDTLS_TLS_PSK_WITH_AES_128_CBC_SHA256,
+ MBEDTLS_TLS_PSK_WITH_AES_128_CBC_SHA,
+ MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+ MBEDTLS_TLS_PSK_WITH_AES_128_CCM_8,
+ MBEDTLS_TLS_PSK_WITH_ARIA_128_GCM_SHA256
+};
+
+
+__attribute_noinline__
+static int
+tls_mbedtls_append_ciphersuite (int *ids, int nids, int idsz, const int *x, int xsz)
+{
+ if (xsz >= idsz - (nids + 1)) {
+ emsg(MSG_ERROR, "error: too many ciphers during list expand");
+ return -1;
+ }
+
+ for (int i = 0; i < xsz; ++i)
+ ids[++nids] = x[i];
+
+ return nids;
+}
+
+
+static int
+tls_mbedtls_translate_ciphername(int id, char *buf, size_t buflen)
+{
+ const mbedtls_ssl_ciphersuite_t *info =
+ mbedtls_ssl_ciphersuite_from_id(id);
+ if (info == NULL)
+ return 0;
+ const char *name = mbedtls_ssl_ciphersuite_get_name(info);
+ const size_t len = os_strlen(name);
+ if (len == 7 && 0 == os_memcmp(name, "unknown", 7))
+ return 0;
+ if (len >= buflen)
+ return 0;
+ os_strlcpy(buf, name, buflen);
+
+ /* attempt to translate mbedtls string to openssl string
+ * (some heuristics; incomplete) */
+ size_t i = 0, j = 0;
+ if (buf[0] == 'T') {
+ if (os_strncmp(buf, "TLS1-3-", 7) == 0) {
+ buf[3] = '-';
+ j = 4; /* remove "1-3" from "TLS1-3-" prefix */
+ i = 7;
+ }
+ else if (os_strncmp(buf, "TLS-", 4) == 0)
+ i = 4; /* remove "TLS-" prefix */
+ }
+ for (; buf[i]; ++i) {
+ if (buf[i] == '-') {
+ if (i >= 3) {
+ if (0 == os_memcmp(buf+i-3, "AES", 3))
+ continue; /* "AES-" -> "AES" */
+ }
+ if (i >= 4) {
+ if (0 == os_memcmp(buf+i-4, "WITH", 4)) {
+ j -= 4; /* remove "WITH-" */
+ continue;
+ }
+ }
+ }
+ buf[j++] = buf[i];
+ }
+ buf[j] = '\0';
+
+ return j;
+}
+
+
+__attribute_noinline__
+static int
+tls_mbedtls_set_ciphersuites(struct tls_conf *tls_conf, int *ids, int nids)
+{
+ /* ciphersuites list must be persistent for lifetime of mbedtls_ssl_config*/
+ os_free(tls_conf->ciphersuites);
+ tls_conf->ciphersuites = os_malloc(nids * sizeof(int));
+ if (tls_conf->ciphersuites == NULL)
+ return 0;
+ os_memcpy(tls_conf->ciphersuites, ids, nids * sizeof(int));
+ mbedtls_ssl_conf_ciphersuites(&tls_conf->conf, tls_conf->ciphersuites);
+ return 1;
+}
+
+
+static int
+tls_mbedtls_set_ciphers(struct tls_conf *tls_conf, const char *ciphers)
+{
+ char buf[64];
+ int ids[512];
+ int nids = -1;
+ const int idsz = (int)(sizeof(ids)/sizeof(*ids)-1);
+ const char *next;
+ size_t blen, clen;
+ do {
+ next = os_strchr(ciphers, ':');
+ clen = next ? (size_t)(next - ciphers) : os_strlen(ciphers);
+ if (!clen)
+ continue;
+
+ /* special-case a select set of openssl group names for hwsim tests */
+ /* (review; remove excess code if tests are not run for non-OpenSSL?) */
+ if (clen == 9 && os_memcmp(ciphers, "SUITEB192", 9) == 0) {
+ static int ssl_preset_suiteb192_ciphersuites[] = {
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+ 0
+ };
+ return tls_mbedtls_set_ciphersuites(tls_conf,
+ ssl_preset_suiteb192_ciphersuites,
+ 2);
+ }
+ if (clen == 9 && os_memcmp(ciphers, "SUITEB128", 9) == 0) {
+ static int ssl_preset_suiteb128_ciphersuites[] = {
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+ 0
+ };
+ return tls_mbedtls_set_ciphersuites(tls_conf,
+ ssl_preset_suiteb128_ciphersuites,
+ 2);
+ }
+ if (clen == 7 && os_memcmp(ciphers, "DEFAULT", 7) == 0)
+ continue;
+ if (clen == 6 && os_memcmp(ciphers, "AES128", 6) == 0) {
+ nids = tls_mbedtls_append_ciphersuite(ids, nids, idsz,
+ suite_AES_128_ephemeral,
+ (int)ARRAY_SIZE(suite_AES_128_ephemeral));
+ if (nids == -1)
+ return 0;
+ continue;
+ }
+ if (clen == 6 && os_memcmp(ciphers, "AES256", 6) == 0) {
+ nids = tls_mbedtls_append_ciphersuite(ids, nids, idsz,
+ suite_AES_256_ephemeral,
+ (int)ARRAY_SIZE(suite_AES_256_ephemeral));
+ if (nids == -1)
+ return 0;
+ continue;
+ }
+ if (clen == 4 && os_memcmp(ciphers, "HIGH", 4) == 0) {
+ nids = tls_mbedtls_append_ciphersuite(ids, nids, idsz, suite_HIGH,
+ (int)ARRAY_SIZE(suite_HIGH));
+ if (nids == -1)
+ return 0;
+ continue;
+ }
+ /* ignore anonymous cipher group names (?not supported by mbedtls?) */
+ if (clen == 4 && os_memcmp(ciphers, "!ADH", 4) == 0)
+ continue;
+ if (clen == 6 && os_memcmp(ciphers, "-aECDH", 6) == 0)
+ continue;
+ if (clen == 7 && os_memcmp(ciphers, "-aECDSA", 7) == 0)
+ continue;
+
+ /* attempt to match mbedtls cipher names
+ * nb: does not support openssl group names or list manipulation syntax
+ * (alt: could copy almost 1200 lines (!!!) of lighttpd mod_mbedtls.c
+ * mod_mbedtls_ssl_conf_ciphersuites() to translate strings)
+ * note: not efficient to rewrite list for each ciphers entry,
+ * but this code is expected to run only at startup
+ */
+ const int *list = mbedtls_ssl_list_ciphersuites();
+ for (; *list; ++list) {
+ blen = tls_mbedtls_translate_ciphername(*list,buf,sizeof(buf));
+ if (!blen)
+ continue;
+
+ /* matching heuristics additional to translate_ciphername above */
+ if (blen == clen+4) {
+ char *cbc = os_strstr(buf, "CBC-");
+ if (cbc) {
+ os_memmove(cbc, cbc+4, blen-(cbc+4-buf)+1); /*(w/ '\0')*/
+ blen -= 4;
+ }
+ }
+ if (blen >= clen && os_memcmp(ciphers, buf, clen) == 0
+ && (blen == clen
+ || (blen == clen+7 && os_memcmp(buf+clen, "-SHA256", 7)))) {
+ if (1 >= idsz - (nids + 1)) {
+ emsg(MSG_ERROR,
+ "error: too many ciphers during list expand");
+ return 0;
+ }
+ ids[++nids] = *list;
+ break;
+ }
+ }
+ if (*list == 0) {
+ wpa_printf(MSG_ERROR,
+ "MTLS: unrecognized cipher: %.*s", (int)clen, ciphers);
+ return 0;
+ }
+ } while ((ciphers = next ? next+1 : NULL));
+
+ if (-1 == nids) return 1; /* empty list; no-op */
+
+ ids[++nids] = 0; /* terminate list */
+ ++nids;
+
+ return tls_mbedtls_set_ciphersuites(tls_conf, ids, nids);
+}
+
+
+__attribute_noinline__
+static int tls_mbedtls_set_item(char **config_item, const char *item)
+{
+ os_free(*config_item);
+ *config_item = NULL;
+ return item ? (*config_item = os_strdup(item)) != NULL : 1;
+}
+
+
+static int tls_connection_set_subject_match(struct tls_conf *tls_conf,
+ const struct tls_connection_params *params)
+{
+ int rc = 1;
+ rc &= tls_mbedtls_set_item(&tls_conf->subject_match,
+ params->subject_match);
+ rc &= tls_mbedtls_set_item(&tls_conf->altsubject_match,
+ params->altsubject_match);
+ rc &= tls_mbedtls_set_item(&tls_conf->suffix_match,
+ params->suffix_match);
+ rc &= tls_mbedtls_set_item(&tls_conf->domain_match,
+ params->domain_match);
+ rc &= tls_mbedtls_set_item(&tls_conf->check_cert_subject,
+ params->check_cert_subject);
+ return rc;
+}
+
+
+/* duplicated in crypto_mbedtls.c:crypto_mbedtls_readfile()*/
+__attribute_noinline__
+static int tls_mbedtls_readfile(const char *path, u8 **buf, size_t *n)
+{
+ #if 0 /* #ifdef MBEDTLS_FS_IO */
+ /*(includes +1 for '\0' needed by mbedtls PEM parsing funcs)*/
+ if (mbedtls_pk_load_file(path, (unsigned char **)buf, n) != 0) {
+ wpa_printf(MSG_ERROR, "error: mbedtls_pk_load_file %s", path);
+ return -1;
+ }
+ #else
+ /*(use os_readfile() so that we can use os_free()
+ *(if we use mbedtls_pk_load_file() above, macros prevent calling free()
+ * directly #if defined(OS_REJECT_C_LIB_FUNCTIONS) and calling os_free()
+ * on buf aborts in tests if buf not allocated via os_malloc())*/
+ *buf = (u8 *)os_readfile(path, n);
+ if (!*buf) {
+ wpa_printf(MSG_ERROR, "error: os_readfile %s", path);
+ return -1;
+ }
+ u8 *buf0 = os_realloc(*buf, *n+1);
+ if (!buf0) {
+ bin_clear_free(*buf, *n);
+ *buf = NULL;
+ return -1;
+ }
+ buf0[(*n)++] = '\0';
+ *buf = buf0;
+ #endif
+ return 0;
+}
+
+
+static int tls_mbedtls_set_crl(struct tls_conf *tls_conf, const u8 *data, size_t len)
+{
+ /* do not use mbedtls_x509_crl_parse() on PEM unless it contains CRL */
+ if (len && data[len-1] == '\0'
+ && NULL == os_strstr((const char *)data,"-----BEGIN X509 CRL-----")
+ && tls_mbedtls_data_is_pem(data))
+ return 0;
+
+ mbedtls_x509_crl crl;
+ mbedtls_x509_crl_init(&crl);
+ int rc = mbedtls_x509_crl_parse(&crl, data, len);
+ if (rc < 0) {
+ mbedtls_x509_crl_free(&crl);
+ return rc == MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT ? 0 : rc;
+ }
+
+ mbedtls_x509_crl *crl_new = os_malloc(sizeof(crl));
+ if (crl_new == NULL) {
+ mbedtls_x509_crl_free(&crl);
+ return MBEDTLS_ERR_X509_ALLOC_FAILED;
+ }
+ os_memcpy(crl_new, &crl, sizeof(crl));
+
+ mbedtls_x509_crl *crl_old = tls_conf->crl;
+ tls_conf->crl = crl_new;
+ if (crl_old) {
+ mbedtls_x509_crl_free(crl_old);
+ os_free(crl_old);
+ }
+ return 0;
+}
+
+
+static int tls_mbedtls_set_ca(struct tls_conf *tls_conf, u8 *data, size_t len)
+{
+ /* load crt struct onto stack and then copy into tls_conf in
+ * order to preserve existing tls_conf value if error occurs
+ *
+ * hostapd is not threaded, or else should allocate memory and swap in
+ * pointer reduce race condition. (If threaded, would also need to
+ * keep reference count of use to avoid freeing while still in use.) */
+
+ mbedtls_x509_crt crt;
+ mbedtls_x509_crt_init(&crt);
+ int rc = mbedtls_x509_crt_parse(&crt, data, len);
+ if (rc < 0) {
+ mbedtls_x509_crt_free(&crt);
+ return rc;
+ }
+
+ mbedtls_x509_crt_free(&tls_conf->ca_cert);
+ os_memcpy(&tls_conf->ca_cert, &crt, sizeof(crt));
+ return 0;
+}
+
+
+static int tls_mbedtls_set_ca_and_crl(struct tls_conf *tls_conf, const char *ca_cert_file)
+{
+ size_t len;
+ u8 *data;
+ if (tls_mbedtls_readfile(ca_cert_file, &data, &len))
+ return -1;
+
+ int rc;
+ if (0 == (rc = tls_mbedtls_set_ca(tls_conf, data, len))
+ && (!tls_mbedtls_data_is_pem(data) /*skip parse for CRL if not PEM*/
+ || 0 == (rc = tls_mbedtls_set_crl(tls_conf, data, len)))) {
+ mbedtls_ssl_conf_ca_chain(&tls_conf->conf,
+ &tls_conf->ca_cert,
+ tls_conf->crl);
+ }
+ else {
+ elog(rc, __func__);
+ emsg(MSG_ERROR, ca_cert_file);
+ }
+
+ forced_memzero(data, len);
+ os_free(data);
+ return rc;
+}
+
+
+static void tls_mbedtls_refresh_crl(void)
+{
+ /* check for CRL refresh
+ * continue even if error occurs; continue with previous cert, CRL */
+ unsigned int crl_reload_interval = tls_ctx_global.crl_reload_interval;
+ const char *ca_cert_file = tls_ctx_global.ca_cert_file;
+ if (!crl_reload_interval || !ca_cert_file)
+ return;
+
+ struct os_reltime *previous = &tls_ctx_global.crl_reload_previous;
+ struct os_reltime now;
+ if (os_get_reltime(&now) != 0
+ || !os_reltime_expired(&now, previous, crl_reload_interval))
+ return;
+
+ /* Note: modifying global state is not thread-safe
+ * if in use by existing connections
+ *
+ * src/utils/os.h does not provide a portable stat()
+ * or else it would be a good idea to check mtime and size,
+ * and avoid reloading if file has not changed */
+
+ if (tls_mbedtls_set_ca_and_crl(tls_ctx_global.tls_conf, ca_cert_file) == 0)
+ *previous = now;
+}
+
+
+static int tls_mbedtls_set_ca_cert(struct tls_conf *tls_conf,
+ const struct tls_connection_params *params)
+{
+ if (params->ca_cert) {
+ if (os_strncmp(params->ca_cert, "probe://", 8) == 0) {
+ tls_conf->ca_cert_probe = 1;
+ tls_conf->has_ca_cert = 1;
+ return 0;
+ }
+
+ if (os_strncmp(params->ca_cert, "hash://", 7) == 0) {
+ const char *pos = params->ca_cert + 7;
+ if (os_strncmp(pos, "server/sha256/", 14) != 0) {
+ emsg(MSG_ERROR, "unsupported ca_cert hash value");
+ return -1;
+ }
+ pos += 14;
+ if (os_strlen(pos) != SHA256_DIGEST_LENGTH*2) {
+ emsg(MSG_ERROR, "unexpected ca_cert hash length");
+ return -1;
+ }
+ if (hexstr2bin(pos, tls_conf->ca_cert_hash,
+ SHA256_DIGEST_LENGTH) < 0) {
+ emsg(MSG_ERROR, "invalid ca_cert hash value");
+ return -1;
+ }
+ emsg(MSG_DEBUG, "checking only server certificate match");
+ tls_conf->verify_depth0_only = 1;
+ tls_conf->has_ca_cert = 1;
+ return 0;
+ }
+
+ if (tls_mbedtls_set_ca_and_crl(tls_conf, params->ca_cert) != 0)
+ return -1;
+ }
+ if (params->ca_cert_blob) {
+ size_t len = params->ca_cert_blob_len;
+ int is_pem = tls_mbedtls_data_is_pem(params->ca_cert_blob);
+ if (len && params->ca_cert_blob[len-1] != '\0' && is_pem)
+ ++len; /*(include '\0' in len for PEM)*/
+ int ret = mbedtls_x509_crt_parse(&tls_conf->ca_cert,
+ params->ca_cert_blob, len);
+ if (ret != 0) {
+ elog(ret, "mbedtls_x509_crt_parse");
+ return -1;
+ }
+ if (is_pem) { /*(ca_cert_blob in DER format contains ca cert only)*/
+ ret = tls_mbedtls_set_crl(tls_conf, params->ca_cert_blob, len);
+ if (ret != 0) {
+ elog(ret, "mbedtls_x509_crl_parse");
+ return -1;
+ }
+ }
+ }
+
+ if (mbedtls_x509_time_is_future(&tls_conf->ca_cert.valid_from)
+ || mbedtls_x509_time_is_past(&tls_conf->ca_cert.valid_to)) {
+ emsg(MSG_WARNING, "ca_cert expired or not yet valid");
+ if (params->ca_cert)
+ emsg(MSG_WARNING, params->ca_cert);
+ }
+
+ tls_conf->has_ca_cert = 1;
+ return 0;
+}
+
+
+static int tls_mbedtls_set_certs(struct tls_conf *tls_conf,
+ const struct tls_connection_params *params)
+{
+ int ret;
+
+ if (params->ca_cert || params->ca_cert_blob) {
+ if (tls_mbedtls_set_ca_cert(tls_conf, params) != 0)
+ return -1;
+ }
+ else if (params->ca_path) {
+ emsg(MSG_INFO, "ca_path support not implemented");
+ return -1;
+ }
+
+ if (!tls_conf->has_ca_cert)
+ mbedtls_ssl_conf_authmode(&tls_conf->conf, MBEDTLS_SSL_VERIFY_NONE);
+ else {
+ /* Initial setting: REQUIRED for client, OPTIONAL for server
+ * (see also tls_connection_set_verify()) */
+ tls_conf->verify_peer = (tls_ctx_global.tls_conf == NULL);
+ int authmode = tls_conf->verify_peer
+ ? MBEDTLS_SSL_VERIFY_REQUIRED
+ : MBEDTLS_SSL_VERIFY_OPTIONAL;
+ mbedtls_ssl_conf_authmode(&tls_conf->conf, authmode);
+ mbedtls_ssl_conf_ca_chain(&tls_conf->conf,
+ &tls_conf->ca_cert,
+ tls_conf->crl);
+
+ if (!tls_connection_set_subject_match(tls_conf, params))
+ return -1;
+ }
+
+ if (params->client_cert2) /*(yes, server_cert2 in msg below)*/
+ emsg(MSG_INFO, "server_cert2 support not implemented");
+
+ if (params->client_cert) {
+ size_t len;
+ u8 *data;
+ if (tls_mbedtls_readfile(params->client_cert, &data, &len))
+ return -1;
+ ret = mbedtls_x509_crt_parse(&tls_conf->client_cert, data, len);
+ forced_memzero(data, len);
+ os_free(data);
+ }
+ if (params->client_cert_blob) {
+ size_t len = params->client_cert_blob_len;
+ if (len && params->client_cert_blob[len-1] != '\0'
+ && tls_mbedtls_data_is_pem(params->client_cert_blob))
+ ++len; /*(include '\0' in len for PEM)*/
+ ret = mbedtls_x509_crt_parse(&tls_conf->client_cert,
+ params->client_cert_blob, len);
+ }
+ if (params->client_cert || params->client_cert_blob) {
+ if (ret < 0) {
+ elog(ret, "mbedtls_x509_crt_parse");
+ if (params->client_cert)
+ emsg(MSG_ERROR, params->client_cert);
+ return -1;
+ }
+ if (mbedtls_x509_time_is_future(&tls_conf->client_cert.valid_from)
+ || mbedtls_x509_time_is_past(&tls_conf->client_cert.valid_to)) {
+ emsg(MSG_WARNING, "cert expired or not yet valid");
+ if (params->client_cert)
+ emsg(MSG_WARNING, params->client_cert);
+ }
+ tls_conf->has_client_cert = 1;
+ }
+
+ if (params->private_key || params->private_key_blob) {
+ size_t len = params->private_key_blob_len;
+ u8 *data;
+ *(const u8 **)&data = params->private_key_blob;
+ if (len && data[len-1] != '\0' && tls_mbedtls_data_is_pem(data))
+ ++len; /*(include '\0' in len for PEM)*/
+ if (params->private_key
+ && tls_mbedtls_readfile(params->private_key, &data, &len)) {
+ return -1;
+ }
+ const char *pwd = params->private_key_passwd;
+ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
+ ret = mbedtls_pk_parse_key(&tls_conf->private_key,
+ data, len,
+ (const unsigned char *)pwd,
+ pwd ? os_strlen(pwd) : 0,
+ mbedtls_ctr_drbg_random,
+ tls_ctx_global.ctr_drbg);
+ #else
+ ret = mbedtls_pk_parse_key(&tls_conf->private_key,
+ data, len,
+ (const unsigned char *)pwd,
+ pwd ? os_strlen(pwd) : 0);
+ #endif
+ if (params->private_key) {
+ forced_memzero(data, len);
+ os_free(data);
+ }
+ if (ret < 0) {
+ elog(ret, "mbedtls_pk_parse_key");
+ return -1;
+ }
+ tls_conf->has_private_key = 1;
+ }
+
+ if (tls_conf->has_client_cert && tls_conf->has_private_key) {
+ ret = mbedtls_ssl_conf_own_cert(
+ &tls_conf->conf, &tls_conf->client_cert, &tls_conf->private_key);
+ if (ret < 0) {
+ elog(ret, "mbedtls_ssl_conf_own_cert");
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+
+/* mbedtls_x509_crt_profile_suiteb plus rsa_min_bitlen 2048 */
+/* (reference: see also mbedtls_x509_crt_profile_next) */
+/* ??? should permit SHA-512, too, and additional curves ??? */
+static const mbedtls_x509_crt_profile tls_mbedtls_crt_profile_suiteb128 =
+{
+ /* Only SHA-256 and 384 */
+ MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA256 ) |
+ MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA384 ),
+ /* Only ECDSA */
+ MBEDTLS_X509_ID_FLAG( MBEDTLS_PK_ECDSA ) |
+ MBEDTLS_X509_ID_FLAG( MBEDTLS_PK_ECKEY ),
+#if defined(MBEDTLS_ECP_C)
+ /* Only NIST P-256 and P-384 */
+ MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP256R1 ) |
+ MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP384R1 ),
+#else
+ 0,
+#endif
+ 2048,
+};
+
+
+/* stricter than mbedtls_x509_crt_profile_suiteb */
+/* (reference: see also mbedtls_x509_crt_profile_next) */
+/* ??? should permit SHA-512, too, and additional curves ??? */
+static const mbedtls_x509_crt_profile tls_mbedtls_crt_profile_suiteb192 =
+{
+ /* Only SHA-384 */
+ MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA384 ),
+ /* Only ECDSA */
+ MBEDTLS_X509_ID_FLAG( MBEDTLS_PK_ECDSA ) |
+ MBEDTLS_X509_ID_FLAG( MBEDTLS_PK_ECKEY ),
+#if defined(MBEDTLS_ECP_C)
+ /* Only NIST P-384 */
+ MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP384R1 ),
+#else
+ 0,
+#endif
+ 3072,
+};
+
+
+/* stricter than mbedtls_x509_crt_profile_suiteb except allow any PK alg */
+/* (reference: see also mbedtls_x509_crt_profile_next) */
+/* ??? should permit SHA-512, too, and additional curves ??? */
+static const mbedtls_x509_crt_profile tls_mbedtls_crt_profile_suiteb192_anypk =
+{
+ /* Only SHA-384 */
+ MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA384 ),
+ 0xFFFFFFF, /* Any PK alg */
+#if defined(MBEDTLS_ECP_C)
+ /* Only NIST P-384 */
+ MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP384R1 ),
+#else
+ 0,
+#endif
+ 3072,
+};
+
+
+static int tls_mbedtls_set_params(struct tls_conf *tls_conf,
+ const struct tls_connection_params *params)
+{
+ tls_conf->flags = params->flags;
+
+ if (tls_conf->flags & TLS_CONN_REQUIRE_OCSP_ALL) {
+ emsg(MSG_INFO, "ocsp=3 not supported");
+ return -1;
+ }
+
+ if (tls_conf->flags & TLS_CONN_REQUIRE_OCSP) {
+ emsg(MSG_INFO, "ocsp not supported");
+ return -1;
+ }
+
+ int suiteb128 = 0;
+ int suiteb192 = 0;
+ if (params->openssl_ciphers) {
+ if (os_strcmp(params->openssl_ciphers, "SUITEB192") == 0) {
+ suiteb192 = 1;
+ tls_conf->flags |= TLS_CONN_SUITEB;
+ }
+ if (os_strcmp(params->openssl_ciphers, "SUITEB128") == 0) {
+ suiteb128 = 1;
+ tls_conf->flags |= TLS_CONN_SUITEB;
+ }
+ }
+
+ int ret = mbedtls_ssl_config_defaults(
+ &tls_conf->conf, tls_ctx_global.tls_conf ? MBEDTLS_SSL_IS_SERVER
+ : MBEDTLS_SSL_IS_CLIENT,
+ MBEDTLS_SSL_TRANSPORT_STREAM,
+ (tls_conf->flags & TLS_CONN_SUITEB) ? MBEDTLS_SSL_PRESET_SUITEB
+ : MBEDTLS_SSL_PRESET_DEFAULT);
+ if (ret != 0) {
+ elog(ret, "mbedtls_ssl_config_defaults");
+ return -1;
+ }
+
+ if (suiteb128) {
+ mbedtls_ssl_conf_cert_profile(&tls_conf->conf,
+ &tls_mbedtls_crt_profile_suiteb128);
+ mbedtls_ssl_conf_dhm_min_bitlen(&tls_conf->conf, 2048);
+ }
+ else if (suiteb192) {
+ mbedtls_ssl_conf_cert_profile(&tls_conf->conf,
+ &tls_mbedtls_crt_profile_suiteb192);
+ mbedtls_ssl_conf_dhm_min_bitlen(&tls_conf->conf, 3072);
+ }
+ else if (tls_conf->flags & TLS_CONN_SUITEB) {
+ /* treat as suiteb192 while allowing any PK algorithm */
+ mbedtls_ssl_conf_cert_profile(&tls_conf->conf,
+ &tls_mbedtls_crt_profile_suiteb192_anypk);
+ mbedtls_ssl_conf_dhm_min_bitlen(&tls_conf->conf, 3072);
+ }
+
+ tls_mbedtls_set_allowed_tls_vers(tls_conf, &tls_conf->conf);
+ ret = tls_mbedtls_set_certs(tls_conf, params);
+ if (ret != 0)
+ return -1;
+
+ if (params->dh_file
+ && !tls_mbedtls_set_dhparams(tls_conf, params->dh_file)) {
+ return -1;
+ }
+
+ if (params->openssl_ecdh_curves
+ && !tls_mbedtls_set_curves(tls_conf, params->openssl_ecdh_curves)) {
+ return -1;
+ }
+
+ if (params->openssl_ciphers) {
+ if (!tls_mbedtls_set_ciphers(tls_conf, params->openssl_ciphers))
+ return -1;
+ }
+ else if (tls_conf->flags & TLS_CONN_SUITEB) {
+ /* special-case a select set of ciphers for hwsim tests */
+ if (!tls_mbedtls_set_ciphers(tls_conf,
+ (tls_conf->flags & TLS_CONN_SUITEB_NO_ECDH)
+ ? "DHE-RSA-AES256-GCM-SHA384"
+ : "ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384"))
+ return -1;
+ }
+
+ return 0;
+}
+
+
+int tls_connection_set_params(void *tls_ctx, struct tls_connection *conn,
+ const struct tls_connection_params *params)
+{
+ if (conn == NULL || params == NULL)
+ return -1;
+
+ tls_conf_deinit(conn->tls_conf);
+ struct tls_conf *tls_conf = conn->tls_conf = tls_conf_init(tls_ctx);
+ if (tls_conf == NULL)
+ return -1;
+
+ if (tls_ctx_global.tls_conf) {
+ tls_conf->check_crl = tls_ctx_global.tls_conf->check_crl;
+ tls_conf->check_crl_strict = tls_ctx_global.tls_conf->check_crl_strict;
+ /*(tls_openssl.c inherits check_cert_subject from global conf)*/
+ if (tls_ctx_global.tls_conf->check_cert_subject) {
+ tls_conf->check_cert_subject =
+ os_strdup(tls_ctx_global.tls_conf->check_cert_subject);
+ if (tls_conf->check_cert_subject == NULL)
+ return -1;
+ }
+ }
+
+ if (tls_mbedtls_set_params(tls_conf, params) != 0)
+ return -1;
+ conn->verify_peer = tls_conf->verify_peer;
+
+ return tls_mbedtls_ssl_setup(conn);
+}
+
+
+#ifdef TLS_MBEDTLS_SESSION_TICKETS
+
+static int tls_mbedtls_clienthello_session_ticket_prep (struct tls_connection *conn,
+ const u8 *data, size_t len)
+{
+ if (conn->tls_conf->flags & TLS_CONN_DISABLE_SESSION_TICKET)
+ return -1;
+ if (conn->clienthello_session_ticket)
+ tls_connection_deinit_clienthello_session_ticket(conn);
+ if (len) {
+ conn->clienthello_session_ticket = mbedtls_calloc(1, len);
+ if (conn->clienthello_session_ticket == NULL)
+ return -1;
+ conn->clienthello_session_ticket_len = len;
+ os_memcpy(conn->clienthello_session_ticket, data, len);
+ }
+ return 0;
+}
+
+
+static void tls_mbedtls_clienthello_session_ticket_set (struct tls_connection *conn)
+{
+ mbedtls_ssl_session *sess = conn->ssl.MBEDTLS_PRIVATE(session_negotiate);
+ if (sess->MBEDTLS_PRIVATE(ticket)) {
+ mbedtls_platform_zeroize(sess->MBEDTLS_PRIVATE(ticket),
+ sess->MBEDTLS_PRIVATE(ticket_len));
+ mbedtls_free(sess->MBEDTLS_PRIVATE(ticket));
+ }
+ sess->MBEDTLS_PRIVATE(ticket) = conn->clienthello_session_ticket;
+ sess->MBEDTLS_PRIVATE(ticket_len) = conn->clienthello_session_ticket_len;
+ sess->MBEDTLS_PRIVATE(ticket_lifetime) = 86400;/* XXX: can hint be 0? */
+
+ conn->clienthello_session_ticket = NULL;
+ conn->clienthello_session_ticket_len = 0;
+}
+
+
+static int tls_mbedtls_ssl_ticket_write(void *p_ticket,
+ const mbedtls_ssl_session *session,
+ unsigned char *start,
+ const unsigned char *end,
+ size_t *tlen,
+ uint32_t *lifetime)
+{
+ struct tls_connection *conn = p_ticket;
+ if (conn && conn->session_ticket_cb) {
+ /* see tls_mbedtls_clienthello_session_ticket_prep() */
+ /* see tls_mbedtls_clienthello_session_ticket_set() */
+ return 0;
+ }
+
+ return mbedtls_ssl_ticket_write(&tls_ctx_global.ticket_ctx,
+ session, start, end, tlen, lifetime);
+}
+
+
+static int tls_mbedtls_ssl_ticket_parse(void *p_ticket,
+ mbedtls_ssl_session *session,
+ unsigned char *buf,
+ size_t len)
+{
+ /* XXX: TODO: not implemented in client;
+ * mbedtls_ssl_conf_session_tickets_cb() callbacks only for TLS server*/
+
+ if (len == 0)
+ return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
+
+ struct tls_connection *conn = p_ticket;
+ if (conn && conn->session_ticket_cb) {
+ /* XXX: have random and secret been initialized yet?
+ * or must keys first be exported?
+ * EAP-FAST uses all args, EAP-TEAP only uses secret */
+ struct tls_random data;
+ if (tls_connection_get_random(NULL, conn, &data) != 0)
+ return MBEDTLS_ERR_SSL_INTERNAL_ERROR;
+ int ret =
+ conn->session_ticket_cb(conn->session_ticket_cb_ctx,
+ buf, len,
+ data.client_random,
+ data.server_random,
+ conn->expkey_secret);
+ if (ret == 1) {
+ conn->resumed = 1;
+ return 0;
+ }
+ emsg(MSG_ERROR, "EAP session ticket ext not implemented");
+ return MBEDTLS_ERR_SSL_INVALID_MAC;
+ /*(non-zero return used for mbedtls debug logging)*/
+ }
+
+ /* XXX: TODO always use tls_mbedtls_ssl_ticket_parse() for callback? */
+ int rc = mbedtls_ssl_ticket_parse(&tls_ctx_global.ticket_ctx,
+ session, buf, len);
+ if (conn)
+ conn->resumed = (rc == 0);
+ return rc;
+}
+
+#endif /* TLS_MBEDTLS_SESSION_TICKETS */
+
+
+__attribute_cold__
+int tls_global_set_params(void *tls_ctx,
+ const struct tls_connection_params *params)
+{
+ /* XXX: why might global_set_params be called more than once? */
+ if (tls_ctx_global.tls_conf)
+ tls_conf_deinit(tls_ctx_global.tls_conf);
+ tls_ctx_global.tls_conf = tls_conf_init(tls_ctx);
+ if (tls_ctx_global.tls_conf == NULL)
+ return -1;
+
+ #ifdef MBEDTLS_SSL_SESSION_TICKETS
+ #ifdef MBEDTLS_SSL_TICKET_C
+ if (!(params->flags & TLS_CONN_DISABLE_SESSION_TICKET))
+ #ifdef TLS_MBEDTLS_SESSION_TICKETS
+ mbedtls_ssl_conf_session_tickets_cb(&tls_ctx_global.tls_conf->conf,
+ tls_mbedtls_ssl_ticket_write,
+ tls_mbedtls_ssl_ticket_parse,
+ NULL);
+ #else
+ mbedtls_ssl_conf_session_tickets_cb(&tls_ctx_global.tls_conf->conf,
+ mbedtls_ssl_ticket_write,
+ mbedtls_ssl_ticket_parse,
+ &tls_ctx_global.ticket_ctx);
+ #endif
+ #endif
+ #endif
+
+ os_free(tls_ctx_global.ocsp_stapling_response);
+ tls_ctx_global.ocsp_stapling_response = NULL;
+ if (params->ocsp_stapling_response)
+ tls_ctx_global.ocsp_stapling_response =
+ os_strdup(params->ocsp_stapling_response);
+
+ os_free(tls_ctx_global.ca_cert_file);
+ tls_ctx_global.ca_cert_file = NULL;
+ if (params->ca_cert)
+ tls_ctx_global.ca_cert_file = os_strdup(params->ca_cert);
+ return tls_mbedtls_set_params(tls_ctx_global.tls_conf, params);
+}
+
+
+int tls_global_set_verify(void *tls_ctx, int check_crl, int strict)
+{
+ tls_ctx_global.tls_conf->check_crl = check_crl;
+ tls_ctx_global.tls_conf->check_crl_strict = strict; /*(time checks)*/
+ return 0;
+}
+
+
+int tls_connection_set_verify(void *tls_ctx, struct tls_connection *conn,
+ int verify_peer, unsigned int flags,
+ const u8 *session_ctx, size_t session_ctx_len)
+{
+ /*(EAP server-side calls this from eap_server_tls_ssl_init())*/
+ if (conn == NULL)
+ return -1;
+
+ conn->tls_conf->flags |= flags;/* TODO: reprocess flags, if necessary */
+
+ int authmode;
+ switch (verify_peer) {
+ case 2: authmode = MBEDTLS_SSL_VERIFY_OPTIONAL; break;/*(eap_teap_init())*/
+ case 1: authmode = MBEDTLS_SSL_VERIFY_REQUIRED; break;
+ default: authmode = MBEDTLS_SSL_VERIFY_NONE; break;
+ }
+ mbedtls_ssl_set_hs_authmode(&conn->ssl, authmode);
+
+ if ((conn->verify_peer = (authmode != MBEDTLS_SSL_VERIFY_NONE)))
+ mbedtls_ssl_set_verify(&conn->ssl, tls_mbedtls_verify_cb, conn);
+ else
+ mbedtls_ssl_set_verify(&conn->ssl, NULL, NULL);
+
+ return 0;
+}
+
+
+#if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
+static void tls_connection_export_keys_cb(
+ void *p_expkey, mbedtls_ssl_key_export_type secret_type,
+ const unsigned char *secret, size_t secret_len,
+ const unsigned char client_random[MBEDTLS_EXPKEY_RAND_LEN],
+ const unsigned char server_random[MBEDTLS_EXPKEY_RAND_LEN],
+ mbedtls_tls_prf_types tls_prf_type)
+{
+ struct tls_connection *conn = p_expkey;
+ conn->tls_prf_type = tls_prf_type;
+ if (!tls_prf_type)
+ return;
+ if (secret_len > sizeof(conn->expkey_secret)) {
+ emsg(MSG_ERROR, "tls_connection_export_keys_cb secret too long");
+ conn->tls_prf_type = MBEDTLS_SSL_TLS_PRF_NONE; /* 0 */
+ return;
+ }
+ conn->expkey_secret_len = secret_len;
+ os_memcpy(conn->expkey_secret, secret, secret_len);
+ os_memcpy(conn->expkey_randbytes,
+ client_random, MBEDTLS_EXPKEY_RAND_LEN);
+ os_memcpy(conn->expkey_randbytes + MBEDTLS_EXPKEY_RAND_LEN,
+ server_random, MBEDTLS_EXPKEY_RAND_LEN);
+}
+#elif MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */
+static int tls_connection_export_keys_cb(
+ void *p_expkey,
+ const unsigned char *ms,
+ const unsigned char *kb,
+ size_t maclen,
+ size_t keylen,
+ size_t ivlen,
+ const unsigned char client_random[MBEDTLS_EXPKEY_RAND_LEN],
+ const unsigned char server_random[MBEDTLS_EXPKEY_RAND_LEN],
+ mbedtls_tls_prf_types tls_prf_type )
+{
+ struct tls_connection *conn = p_expkey;
+ conn->tls_prf_type = tls_prf_type;
+ if (!tls_prf_type)
+ return -1; /*(return value ignored by mbedtls)*/
+ conn->expkey_keyblock_size = maclen + keylen + ivlen;
+ conn->expkey_secret_len = MBEDTLS_EXPKEY_FIXED_SECRET_LEN;
+ os_memcpy(conn->expkey_secret, ms, MBEDTLS_EXPKEY_FIXED_SECRET_LEN);
+ os_memcpy(conn->expkey_randbytes,
+ client_random, MBEDTLS_EXPKEY_RAND_LEN);
+ os_memcpy(conn->expkey_randbytes + MBEDTLS_EXPKEY_RAND_LEN,
+ server_random, MBEDTLS_EXPKEY_RAND_LEN);
+ return 0;
+}
+#endif
+
+
+int tls_connection_get_random(void *tls_ctx, struct tls_connection *conn,
+ struct tls_random *data)
+{
+ if (!conn || !conn->tls_prf_type)
+ return -1;
+ data->client_random = conn->expkey_randbytes;
+ data->client_random_len = MBEDTLS_EXPKEY_RAND_LEN;
+ data->server_random = conn->expkey_randbytes + MBEDTLS_EXPKEY_RAND_LEN;
+ data->server_random_len = MBEDTLS_EXPKEY_RAND_LEN;
+ return 0;
+}
+
+
+int tls_connection_export_key(void *tls_ctx, struct tls_connection *conn,
+ const char *label, const u8 *context,
+ size_t context_len, u8 *out, size_t out_len)
+{
+ /* (EAP-PEAP EAP-TLS EAP-TTLS) */
+ #if MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */
+ return (conn && conn->established && conn->tls_prf_type)
+ ? mbedtls_ssl_tls_prf(conn->tls_prf_type,
+ conn->expkey_secret, conn->expkey_secret_len, label,
+ conn->expkey_randbytes,
+ sizeof(conn->expkey_randbytes), out, out_len)
+ : -1;
+ #else
+ /* not implemented here for mbedtls < 2.18.0 */
+ return -1;
+ #endif
+}
+
+
+#ifdef TLS_MBEDTLS_EAP_FAST
+
+#if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
+/* keyblock size info is not exposed in mbed TLS 3.0.0 */
+/* extracted from mbedtls library/ssl_tls.c:ssl_tls12_populate_transform() */
+#include <mbedtls/ssl_ciphersuites.h>
+#include <mbedtls/cipher.h>
+static size_t tls_mbedtls_ssl_keyblock_size (mbedtls_ssl_context *ssl)
+{
+ #if !defined(MBEDTLS_USE_PSA_CRYPTO) /* XXX: (not extracted for PSA crypto) */
+ #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
+ if (mbedtls_ssl_get_version_number(ssl) == MBEDTLS_SSL_VERSION_TLS1_3)
+ return 0; /* (calculation not extracted) */
+ #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
+
+ int ciphersuite = mbedtls_ssl_get_ciphersuite_id_from_ssl(ssl);
+ const mbedtls_ssl_ciphersuite_t *ciphersuite_info =
+ mbedtls_ssl_ciphersuite_from_id(ciphersuite);
+ if (ciphersuite_info == NULL)
+ return 0;
+
+ const mbedtls_cipher_info_t *cipher_info =
+ mbedtls_cipher_info_from_type(ciphersuite_info->MBEDTLS_PRIVATE(cipher));
+ if (cipher_info == NULL)
+ return 0;
+
+ #if MBEDTLS_VERSION_NUMBER >= 0x03010000 /* mbedtls 3.1.0 */
+ size_t keylen = mbedtls_cipher_info_get_key_bitlen(cipher_info) / 8;
+ mbedtls_cipher_mode_t mode = mbedtls_cipher_info_get_mode(cipher_info);
+ #else
+ size_t keylen = cipher_info->MBEDTLS_PRIVATE(key_bitlen) / 8;
+ mbedtls_cipher_mode_t mode = cipher_info->MBEDTLS_PRIVATE(mode);
+ #endif
+ #if defined(MBEDTLS_GCM_C) || \
+ defined(MBEDTLS_CCM_C) || \
+ defined(MBEDTLS_CHACHAPOLY_C)
+ if (mode == MBEDTLS_MODE_GCM || mode == MBEDTLS_MODE_CCM)
+ return keylen + 4;
+ else if (mode == MBEDTLS_MODE_CHACHAPOLY)
+ return keylen + 12;
+ else
+ #endif /* MBEDTLS_GCM_C || MBEDTLS_CCM_C || MBEDTLS_CHACHAPOLY_C */
+ #if defined(MBEDTLS_SSL_SOME_SUITES_USE_MAC)
+ {
+ const mbedtls_md_info_t *md_info =
+ mbedtls_md_info_from_type(ciphersuite_info->MBEDTLS_PRIVATE(mac));
+ if (md_info == NULL)
+ return 0;
+ size_t mac_key_len = mbedtls_md_get_size(md_info);
+ size_t ivlen = mbedtls_cipher_info_get_iv_size(cipher_info);
+ return keylen + mac_key_len + ivlen;
+ }
+ #endif /* MBEDTLS_SSL_SOME_SUITES_USE_MAC */
+ #endif /* !MBEDTLS_USE_PSA_CRYPTO *//* (not extracted for PSA crypto) */
+ return 0;
+}
+#endif /* MBEDTLS_VERSION_NUMBER >= 0x03000000 *//* mbedtls 3.0.0 */
+
+
+int tls_connection_get_eap_fast_key(void *tls_ctx, struct tls_connection *conn,
+ u8 *out, size_t out_len)
+{
+ /* XXX: has export keys callback been run? */
+ if (!conn || !conn->tls_prf_type)
+ return -1;
+
+ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
+ conn->expkey_keyblock_size = tls_mbedtls_ssl_keyblock_size(&conn->ssl);
+ if (conn->expkey_keyblock_size == 0)
+ return -1;
+ #endif
+ size_t skip = conn->expkey_keyblock_size * 2;
+ unsigned char *tmp_out = os_malloc(skip + out_len);
+ if (!tmp_out)
+ return -1;
+
+ /* server_random and then client_random */
+ unsigned char seed[MBEDTLS_EXPKEY_RAND_LEN*2];
+ os_memcpy(seed, conn->expkey_randbytes + MBEDTLS_EXPKEY_RAND_LEN,
+ MBEDTLS_EXPKEY_RAND_LEN);
+ os_memcpy(seed + MBEDTLS_EXPKEY_RAND_LEN, conn->expkey_randbytes,
+ MBEDTLS_EXPKEY_RAND_LEN);
+
+ #if MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */
+ int ret = mbedtls_ssl_tls_prf(conn->tls_prf_type,
+ conn->expkey_secret, conn->expkey_secret_len,
+ "key expansion", seed, sizeof(seed),
+ tmp_out, skip + out_len);
+ if (ret == 0)
+ os_memcpy(out, tmp_out + skip, out_len);
+ #else
+ int ret = -1; /*(not reached if not impl; return -1 at top of func)*/
+ #endif
+
+ bin_clear_free(tmp_out, skip + out_len);
+ forced_memzero(seed, sizeof(seed));
+ return ret;
+}
+
+#endif /* TLS_MBEDTLS_EAP_FAST */
+
+
+__attribute_cold__
+static void tls_mbedtls_suiteb_handshake_alert (struct tls_connection *conn)
+{
+ /* tests/hwsim/test_suite_b.py test_suite_b_192_rsa_insufficient_dh */
+ if (!(conn->tls_conf->flags & TLS_CONN_SUITEB))
+ return;
+ if (tls_ctx_global.tls_conf) /*(is server; want issue event on client)*/
+ return;
+ #if 0
+ /*(info not available on client;
+ * mbed TLS library enforces dhm min bitlen in ServerKeyExchange)*/
+ if (MBEDTLS_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 ==
+ #if MBEDTLS_VERSION_NUMBER < 0x03020000 /* mbedtls 3.2.0 */
+ mbedtls_ssl_get_ciphersuite_id_from_ssl(&conn->ssl)
+ #else
+ mbedtls_ssl_get_ciphersuite_id(
+ mbedtls_ssl_get_ciphersuite(&conn->ssl))
+ #endif
+ && mbedtls_mpi_size(&conn->tls_conf->conf.MBEDTLS_PRIVATE(dhm_P))
+ < 384 /*(3072/8)*/)
+ #endif
+ {
+ struct tls_config *init_conf = &tls_ctx_global.init_conf;
+ if (init_conf->event_cb) {
+ union tls_event_data ev;
+ os_memset(&ev, 0, sizeof(ev));
+ ev.alert.is_local = 1;
+ ev.alert.type = "fatal";
+ /*"internal error" string for tests/hwsim/test_suiteb.py */
+ ev.alert.description = "internal error: handshake failure";
+ /*ev.alert.description = "insufficient security";*/
+ init_conf->event_cb(init_conf->cb_ctx, TLS_ALERT, &ev);
+ }
+ }
+}
+
+
+struct wpabuf * tls_connection_handshake(void *tls_ctx,
+ struct tls_connection *conn,
+ const struct wpabuf *in_data,
+ struct wpabuf **appl_data)
+{
+ if (appl_data)
+ *appl_data = NULL;
+
+ if (in_data && wpabuf_len(in_data)) {
+ /*(unsure why tls_gnutls.c discards buffer contents; skip here)*/
+ if (conn->pull_buf && 0) /* disable; appears unwise */
+ tls_pull_buf_discard(conn, __func__);
+ if (!tls_pull_buf_append(conn, in_data))
+ return NULL;
+ }
+
+ if (conn->tls_conf == NULL) {
+ struct tls_connection_params params;
+ os_memset(&params, 0, sizeof(params));
+ params.openssl_ciphers =
+ tls_ctx_global.init_conf.openssl_ciphers;
+ params.flags = tls_ctx_global.tls_conf->flags;
+ if (tls_connection_set_params(tls_ctx, conn, &params) != 0)
+ return NULL;
+ }
+
+ if (conn->verify_peer) /*(call here might be redundant; nbd)*/
+ mbedtls_ssl_set_verify(&conn->ssl, tls_mbedtls_verify_cb, conn);
+
+ #ifdef TLS_MBEDTLS_SESSION_TICKETS
+ if (conn->clienthello_session_ticket)
+ /*(starting handshake for EAP-FAST and EAP-TEAP)*/
+ tls_mbedtls_clienthello_session_ticket_set(conn);
+
+ /* (not thread-safe due to need to set userdata 'conn' for callback) */
+ /* (unable to use mbedtls_ssl_set_user_data_p() with mbedtls 3.2.0+
+ * since ticket write and parse callbacks take (mbedtls_ssl_session *)
+ * param instead of (mbedtls_ssl_context *) param) */
+ if (conn->tls_conf->flags & TLS_CONN_DISABLE_SESSION_TICKET)
+ mbedtls_ssl_conf_session_tickets_cb(&conn->tls_conf->conf,
+ NULL, NULL, NULL);
+ else
+ mbedtls_ssl_conf_session_tickets_cb(&conn->tls_conf->conf,
+ tls_mbedtls_ssl_ticket_write,
+ tls_mbedtls_ssl_ticket_parse,
+ conn);
+ #endif
+
+ #if MBEDTLS_VERSION_NUMBER >= 0x03020000 /* mbedtls 3.2.0 */
+ int ret = mbedtls_ssl_handshake(&conn->ssl);
+ #else
+ int ret = 0;
+ while (conn->ssl.MBEDTLS_PRIVATE(state) != MBEDTLS_SSL_HANDSHAKE_OVER) {
+ ret = mbedtls_ssl_handshake_step(&conn->ssl);
+ if (ret != 0)
+ break;
+ }
+ #endif
+
+ #ifdef TLS_MBEDTLS_SESSION_TICKETS
+ mbedtls_ssl_conf_session_tickets_cb(&conn->tls_conf->conf,
+ tls_mbedtls_ssl_ticket_write,
+ tls_mbedtls_ssl_ticket_parse,
+ NULL);
+ #endif
+
+ switch (ret) {
+ case 0:
+ conn->established = 1;
+ if (conn->push_buf == NULL)
+ /* Need to return something to get final TLS ACK. */
+ conn->push_buf = wpabuf_alloc(0);
+
+ if (appl_data /*&& conn->pull_buf && wpabuf_len(conn->pull_buf)*/)
+ *appl_data = NULL; /* RFE: check for application data */
+ break;
+ case MBEDTLS_ERR_SSL_WANT_WRITE:
+ case MBEDTLS_ERR_SSL_WANT_READ:
+ case MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS:
+ case MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS:
+ if (tls_ctx_global.tls_conf /*(is server)*/
+ && conn->established && conn->push_buf == NULL)
+ /* Need to return something to trigger completion of EAP-TLS. */
+ conn->push_buf = wpabuf_alloc(0);
+ break;
+ default:
+ ++conn->failed;
+ switch (ret) {
+ case MBEDTLS_ERR_SSL_CLIENT_RECONNECT:
+ case MBEDTLS_ERR_NET_CONN_RESET:
+ case MBEDTLS_ERR_NET_SEND_FAILED:
+ ++conn->write_alerts;
+ break;
+ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
+ case MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE:
+ #else
+ case MBEDTLS_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE:
+ #endif
+ tls_mbedtls_suiteb_handshake_alert(conn);
+ /* fall through */
+ case MBEDTLS_ERR_NET_RECV_FAILED:
+ case MBEDTLS_ERR_SSL_CONN_EOF:
+ case MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY:
+ case MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE:
+ ++conn->read_alerts;
+ break;
+ default:
+ break;
+ }
+
+ ilog(ret, "mbedtls_ssl_handshake");
+ break;
+ }
+
+ struct wpabuf *out_data = conn->push_buf;
+ conn->push_buf = NULL;
+ return out_data;
+}
+
+
+struct wpabuf * tls_connection_server_handshake(void *tls_ctx,
+ struct tls_connection *conn,
+ const struct wpabuf *in_data,
+ struct wpabuf **appl_data)
+{
+ conn->is_server = 1;
+ return tls_connection_handshake(tls_ctx, conn, in_data, appl_data);
+}
+
+
+struct wpabuf * tls_connection_encrypt(void *tls_ctx,
+ struct tls_connection *conn,
+ const struct wpabuf *in_data)
+{
+ int res = mbedtls_ssl_write(&conn->ssl,
+ wpabuf_head_u8(in_data), wpabuf_len(in_data));
+ if (res < 0) {
+ elog(res, "mbedtls_ssl_write");
+ return NULL;
+ }
+
+ struct wpabuf *buf = conn->push_buf;
+ conn->push_buf = NULL;
+ return buf;
+}
+
+
+struct wpabuf * tls_connection_decrypt(void *tls_ctx,
+ struct tls_connection *conn,
+ const struct wpabuf *in_data)
+{
+ int res;
+ struct wpabuf *out;
+
+ /*assert(in_data != NULL);*/
+ if (!tls_pull_buf_append(conn, in_data))
+ return NULL;
+
+ #if defined(MBEDTLS_ZLIB_SUPPORT) /* removed in mbedtls 3.x */
+ /* Add extra buffer space to handle the possibility of decrypted
+ * data being longer than input data due to TLS compression. */
+ out = wpabuf_alloc((wpabuf_len(in_data) + 500) * 3);
+ #else /* TLS compression is disabled in mbedtls 3.x */
+ out = wpabuf_alloc(wpabuf_len(in_data));
+ #endif
+ if (out == NULL)
+ return NULL;
+
+ res = mbedtls_ssl_read(&conn->ssl, wpabuf_mhead(out), wpabuf_size(out));
+ if (res < 0) {
+ #if 1 /*(seems like a different error if wpabuf_len(in_data) == 0)*/
+ if (res == MBEDTLS_ERR_SSL_WANT_READ)
+ return out;
+ #endif
+ elog(res, "mbedtls_ssl_read");
+ wpabuf_free(out);
+ return NULL;
+ }
+ wpabuf_put(out, res);
+
+ return out;
+}
+
+
+int tls_connection_resumed(void *tls_ctx, struct tls_connection *conn)
+{
+ /* XXX: might need to detect if session resumed from TLS session ticket
+ * even if not special session ticket handling for EAP-FAST, EAP-TEAP */
+ /* (?ssl->handshake->resume during session ticket validation?) */
+ return conn && conn->resumed;
+}
+
+
+#ifdef TLS_MBEDTLS_EAP_FAST
+int tls_connection_set_cipher_list(void *tls_ctx, struct tls_connection *conn,
+ u8 *ciphers)
+{
+ /* ciphers is list of TLS_CIPHER_* from hostap/src/crypto/tls.h */
+ int ids[7];
+ const int idsz = (int)sizeof(ids);
+ int nids = -1, id;
+ for ( ; *ciphers != TLS_CIPHER_NONE; ++ciphers) {
+ switch (*ciphers) {
+ case TLS_CIPHER_RC4_SHA:
+ #ifdef MBEDTLS_TLS_RSA_WITH_RC4_128_SHA
+ id = MBEDTLS_TLS_RSA_WITH_RC4_128_SHA;
+ break;
+ #else
+ continue; /*(not supported in mbedtls 3.x; ignore)*/
+ #endif
+ case TLS_CIPHER_AES128_SHA:
+ id = MBEDTLS_TLS_RSA_WITH_AES_128_CBC_SHA;
+ break;
+ case TLS_CIPHER_RSA_DHE_AES128_SHA:
+ id = MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CBC_SHA;
+ break;
+ case TLS_CIPHER_ANON_DH_AES128_SHA:
+ continue; /*(not supported in mbedtls; ignore)*/
+ case TLS_CIPHER_RSA_DHE_AES256_SHA:
+ id = MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA;
+ break;
+ case TLS_CIPHER_AES256_SHA:
+ id = MBEDTLS_TLS_RSA_WITH_AES_256_CBC_SHA;
+ break;
+ default:
+ return -1; /* should not happen */
+ }
+ if (++nids == idsz)
+ return -1; /* should not happen */
+ ids[nids] = id;
+ }
+ if (nids < 0)
+ return 0; /* nothing to do */
+ if (++nids == idsz)
+ return -1; /* should not happen */
+ ids[nids] = 0; /* terminate list */
+ ++nids;
+
+ return tls_mbedtls_set_ciphersuites(conn->tls_conf, ids, nids) ? 0 : -1;
+}
+#endif
+
+
+int tls_get_version(void *ssl_ctx, struct tls_connection *conn,
+ char *buf, size_t buflen)
+{
+ if (conn == NULL)
+ return -1;
+ os_strlcpy(buf, mbedtls_ssl_get_version(&conn->ssl), buflen);
+ return buf[0] != 'u' ? 0 : -1; /*(-1 if "unknown")*/
+}
+
+
+#ifdef TLS_MBEDTLS_EAP_TEAP
+u16 tls_connection_get_cipher_suite(struct tls_connection *conn)
+{
+ if (conn == NULL)
+ return 0;
+ return (u16)mbedtls_ssl_get_ciphersuite_id_from_ssl(&conn->ssl);
+}
+#endif
+
+
+int tls_get_cipher(void *tls_ctx, struct tls_connection *conn,
+ char *buf, size_t buflen)
+{
+ if (conn == NULL)
+ return -1;
+ const int id = mbedtls_ssl_get_ciphersuite_id_from_ssl(&conn->ssl);
+ return tls_mbedtls_translate_ciphername(id, buf, buflen) ? 0 : -1;
+}
+
+
+#ifdef TLS_MBEDTLS_SESSION_TICKETS
+
+int tls_connection_enable_workaround(void *tls_ctx,
+ struct tls_connection *conn)
+{
+ /* (see comment in src/eap_peer/eap_fast.c:eap_fast_init()) */
+ /* XXX: is there a relevant setting for this in mbed TLS? */
+ /* (do we even care that much about older CBC ciphers?) */
+ return 0;
+}
+
+
+int tls_connection_client_hello_ext(void *tls_ctx, struct tls_connection *conn,
+ int ext_type, const u8 *data,
+ size_t data_len)
+{
+ /* (EAP-FAST and EAP-TEAP) */
+ if (ext_type == MBEDTLS_TLS_EXT_SESSION_TICKET) /*(ext_type == 35)*/
+ return tls_mbedtls_clienthello_session_ticket_prep(conn, data,
+ data_len);
+
+ return -1;
+}
+
+#endif /* TLS_MBEDTLS_SESSION_TICKETS */
+
+
+int tls_connection_get_failed(void *tls_ctx, struct tls_connection *conn)
+{
+ return conn ? conn->failed : -1;
+}
+
+
+int tls_connection_get_read_alerts(void *tls_ctx, struct tls_connection *conn)
+{
+ return conn ? conn->read_alerts : -1;
+}
+
+
+int tls_connection_get_write_alerts(void *tls_ctx,
+ struct tls_connection *conn)
+{
+ return conn ? conn->write_alerts : -1;
+}
+
+
+#ifdef TLS_MBEDTLS_SESSION_TICKETS
+int tls_connection_set_session_ticket_cb(
+ void *tls_ctx, struct tls_connection *conn,
+ tls_session_ticket_cb cb, void *ctx)
+{
+ if (!(conn->tls_conf->flags & TLS_CONN_DISABLE_SESSION_TICKET)) {
+ /* (EAP-FAST and EAP-TEAP) */
+ conn->session_ticket_cb = cb;
+ conn->session_ticket_cb_ctx = ctx;
+ return 0;
+ }
+ return -1;
+}
+#endif
+
+
+int tls_get_library_version(char *buf, size_t buf_len)
+{
+ #ifndef MBEDTLS_VERSION_C
+ const char * const ver = "n/a";
+ #else
+ char ver[9];
+ mbedtls_version_get_string(ver);
+ #endif
+ return os_snprintf(buf, buf_len,
+ "mbed TLS build=" MBEDTLS_VERSION_STRING " run=%s", ver);
+}
+
+
+void tls_connection_set_success_data(struct tls_connection *conn,
+ struct wpabuf *data)
+{
+ wpabuf_free(conn->success_data);
+ conn->success_data = data;
+}
+
+
+void tls_connection_set_success_data_resumed(struct tls_connection *conn)
+{
+}
+
+
+const struct wpabuf *
+tls_connection_get_success_data(struct tls_connection *conn)
+{
+ return conn->success_data;
+}
+
+
+void tls_connection_remove_session(struct tls_connection *conn)
+{
+}
+
+
+#ifdef TLS_MBEDTLS_EAP_TEAP
+int tls_get_tls_unique(struct tls_connection *conn, u8 *buf, size_t max_len)
+{
+ #if defined(MBEDTLS_SSL_RENEGOTIATION) /* XXX: renegotiation or resumption? */
+ /* data from TLS handshake Finished message */
+ size_t verify_len = conn->ssl.MBEDTLS_PRIVATE(verify_data_len);
+ char *verify_data = (conn->is_server ^ conn->resumed)
+ ? conn->ssl.MBEDTLS_PRIVATE(peer_verify_data)
+ : conn->ssl.MBEDTLS_PRIVATE(own_verify_data);
+ if (verify_len && verify_len <= max_len) {
+ os_memcpy(buf, verify_data, verify_len);
+ return (int)verify_len;
+ }
+ #endif
+ return -1;
+}
+#endif
+
+
+__attribute_noinline__
+static void tls_mbedtls_set_peer_subject(struct tls_connection *conn, const mbedtls_x509_crt *crt)
+{
+ if (conn->peer_subject)
+ return;
+ char buf[MBEDTLS_X509_MAX_DN_NAME_SIZE*2];
+ int buflen = mbedtls_x509_dn_gets(buf, sizeof(buf), &crt->subject);
+ if (buflen >= 0 && (conn->peer_subject = os_malloc((size_t)buflen+1)))
+ os_memcpy(conn->peer_subject, buf, (size_t)buflen+1);
+}
+
+
+#ifdef TLS_MBEDTLS_EAP_TEAP
+const char * tls_connection_get_peer_subject(struct tls_connection *conn)
+{
+ if (!conn)
+ return NULL;
+ if (!conn->peer_subject) { /*(if not set during cert verify)*/
+ const mbedtls_x509_crt *peer_cert =
+ mbedtls_ssl_get_peer_cert(&conn->ssl);
+ if (peer_cert)
+ tls_mbedtls_set_peer_subject(conn, peer_cert);
+ }
+ return conn->peer_subject;
+}
+#endif
+
+
+#ifdef TLS_MBEDTLS_EAP_TEAP
+bool tls_connection_get_own_cert_used(struct tls_connection *conn)
+{
+ /* XXX: availability of cert does not necessary mean that client
+ * received certificate request from server and then sent cert.
+ * ? step handshake in tls_connection_handshake() looking for
+ * MBEDTLS_SSL_CERTIFICATE_REQUEST ? */
+ const struct tls_conf * const tls_conf = conn->tls_conf;
+ return (tls_conf->has_client_cert && tls_conf->has_private_key);
+}
+#endif
+
+
+#if defined(CONFIG_FIPS)
+#define TLS_MBEDTLS_CONFIG_FIPS
+#endif
+
+#if defined(CONFIG_SHA256)
+#define TLS_MBEDTLS_TLS_PRF_SHA256
+#endif
+
+#if defined(CONFIG_SHA384)
+#define TLS_MBEDTLS_TLS_PRF_SHA384
+#endif
+
+
+#ifndef TLS_MBEDTLS_CONFIG_FIPS
+#if defined(CONFIG_MODULE_TESTS)
+/* unused with CONFIG_TLS=mbedtls except in crypto_module_tests.c */
+#if MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */ \
+ && MBEDTLS_VERSION_NUMBER < 0x03000000 /* mbedtls 3.0.0 */
+/* sha1-tlsprf.c */
+#include "sha1.h"
+int tls_prf_sha1_md5(const u8 *secret, size_t secret_len, const char *label,
+ const u8 *seed, size_t seed_len, u8 *out, size_t outlen)
+{
+ return mbedtls_ssl_tls_prf(MBEDTLS_SSL_TLS_PRF_TLS1,
+ secret, secret_len, label,
+ seed, seed_len, out, outlen) ? -1 : 0;
+}
+#else
+#include "sha1-tlsprf.c" /* pull in hostap local implementation */
+#endif
+#endif
+#endif
+
+#ifdef TLS_MBEDTLS_TLS_PRF_SHA256
+/* sha256-tlsprf.c */
+#if MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */
+#include "sha256.h"
+int tls_prf_sha256(const u8 *secret, size_t secret_len, const char *label,
+ const u8 *seed, size_t seed_len, u8 *out, size_t outlen)
+{
+ return mbedtls_ssl_tls_prf(MBEDTLS_SSL_TLS_PRF_SHA256,
+ secret, secret_len, label,
+ seed, seed_len, out, outlen) ? -1 : 0;
+}
+#else
+#include "sha256-tlsprf.c" /* pull in hostap local implementation */
+#endif
+#endif
+
+#ifdef TLS_MBEDTLS_TLS_PRF_SHA384
+/* sha384-tlsprf.c */
+#if MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */
+#include "sha384.h"
+int tls_prf_sha384(const u8 *secret, size_t secret_len, const char *label,
+ const u8 *seed, size_t seed_len, u8 *out, size_t outlen)
+{
+ return mbedtls_ssl_tls_prf(MBEDTLS_SSL_TLS_PRF_SHA384,
+ secret, secret_len, label,
+ seed, seed_len, out, outlen) ? -1 : 0;
+}
+#else
+#include "sha384-tlsprf.c" /* pull in hostap local implementation */
+#endif
+#endif
+
+
+#if MBEDTLS_VERSION_NUMBER < 0x03020000 /* mbedtls 3.2.0 */
+#define mbedtls_x509_crt_has_ext_type(crt, ext_type) \
+ ((crt)->MBEDTLS_PRIVATE(ext_types) & (ext_type))
+#endif
+
+struct mlist { const char *p; size_t n; };
+
+
+static int
+tls_mbedtls_match_altsubject(mbedtls_x509_crt *crt, const char *match)
+{
+ /* RFE: this could be pre-parsed into structured data at config time */
+ struct mlist list[256]; /*(much larger than expected)*/
+ int nlist = 0;
+ if ( os_strncmp(match, "EMAIL:", 6) != 0
+ && os_strncmp(match, "DNS:", 4) != 0
+ && os_strncmp(match, "URI:", 4) != 0 ) {
+ wpa_printf(MSG_INFO, "MTLS: Invalid altSubjectName match '%s'", match);
+ return 0;
+ }
+ for (const char *s = match, *tok; *s; s = tok ? tok+1 : "") {
+ do { } while ((tok = os_strchr(s, ';'))
+ && os_strncmp(tok+1, "EMAIL:", 6) != 0
+ && os_strncmp(tok+1, "DNS:", 4) != 0
+ && os_strncmp(tok+1, "URI:", 4) != 0);
+ list[nlist].p = s;
+ list[nlist].n = tok ? (size_t)(tok - s) : os_strlen(s);
+ if (list[nlist].n && ++nlist == sizeof(list)/sizeof(*list)) {
+ wpa_printf(MSG_INFO, "MTLS: excessive altSubjectName match '%s'",
+ match);
+ break; /* truncate huge list and continue */
+ }
+ }
+
+ if (!mbedtls_x509_crt_has_ext_type(crt, MBEDTLS_X509_EXT_SUBJECT_ALT_NAME))
+ return 0;
+
+ const mbedtls_x509_sequence *cur = &crt->subject_alt_names;
+ for (; cur != NULL; cur = cur->next) {
+ const unsigned char san_type = (unsigned char)cur->buf.tag
+ & MBEDTLS_ASN1_TAG_VALUE_MASK;
+ char t;
+ size_t step = 4;
+ switch (san_type) { /* "EMAIL:" or "DNS:" or "URI:" */
+ case MBEDTLS_X509_SAN_RFC822_NAME: step = 6; t = 'E'; break;
+ case MBEDTLS_X509_SAN_DNS_NAME: t = 'D'; break;
+ case MBEDTLS_X509_SAN_UNIFORM_RESOURCE_IDENTIFIER: t = 'U'; break;
+ default: continue;
+ }
+
+ for (int i = 0; i < nlist; ++i) {
+ /* step over "EMAIL:" or "DNS:" or "URI:" in list[i].p */
+ /* Note: v is not '\0'-terminated, but is a known length vlen,
+ * so okay to pass to os_strncasecmp() even though not z-string */
+ if (cur->buf.len == list[i].n - step && t == *list[i].p
+ && 0 == os_strncasecmp((char *)cur->buf.p,
+ list[i].p+step, cur->buf.len)) {
+ return 1; /* match */
+ }
+ }
+ }
+ return 0; /* no match */
+}
+
+
+static int
+tls_mbedtls_match_suffix(const char *v, size_t vlen,
+ const struct mlist *list, int nlist, int full)
+{
+ /* Note: v is not '\0'-terminated, but is a known length vlen,
+ * so okay to pass to os_strncasecmp() even though not z-string */
+ for (int i = 0; i < nlist; ++i) {
+ size_t n = list[i].n;
+ if ((n == vlen || (n < vlen && v[vlen-n-1] == '.' && !full))
+ && 0 == os_strncasecmp(v+vlen-n, list[i].p, n))
+ return 1; /* match */
+ }
+ return 0; /* no match */
+}
+
+
+static int
+tls_mbedtls_match_suffixes(mbedtls_x509_crt *crt, const char *match, int full)
+{
+ /* RFE: this could be pre-parsed into structured data at config time */
+ struct mlist list[256]; /*(much larger than expected)*/
+ int nlist = 0;
+ for (const char *s = match, *tok; *s; s = tok ? tok+1 : "") {
+ tok = os_strchr(s, ';');
+ list[nlist].p = s;
+ list[nlist].n = tok ? (size_t)(tok - s) : os_strlen(s);
+ if (list[nlist].n && ++nlist == sizeof(list)/sizeof(*list)) {
+ wpa_printf(MSG_INFO, "MTLS: excessive suffix match '%s'", match);
+ break; /* truncate huge list and continue */
+ }
+ }
+
+ /* check subjectAltNames */
+ if (mbedtls_x509_crt_has_ext_type(crt, MBEDTLS_X509_EXT_SUBJECT_ALT_NAME)) {
+ const mbedtls_x509_sequence *cur = &crt->subject_alt_names;
+ for (; cur != NULL; cur = cur->next) {
+ const unsigned char san_type = (unsigned char)cur->buf.tag
+ & MBEDTLS_ASN1_TAG_VALUE_MASK;
+ if (san_type == MBEDTLS_X509_SAN_DNS_NAME
+ && tls_mbedtls_match_suffix((char *)cur->buf.p,
+ cur->buf.len,
+ list, nlist, full)) {
+ return 1; /* match */
+ }
+ }
+ }
+
+ /* check subject CN */
+ const mbedtls_x509_name *name = &crt->subject;
+ for (; name != NULL; name = name->next) {
+ if (name->oid.p && MBEDTLS_OID_CMP(MBEDTLS_OID_AT_CN, &name->oid) == 0)
+ break;
+ }
+ if (name && tls_mbedtls_match_suffix((char *)name->val.p, name->val.len,
+ list, nlist, full)) {
+ return 1; /* match */
+ }
+
+ return 0; /* no match */
+}
+
+
+static int
+tls_mbedtls_match_dn_field(mbedtls_x509_crt *crt, const char *match)
+{
+ /* RFE: this could be pre-parsed into structured data at config time */
+ struct mlistoid { const char *p; size_t n;
+ const char *oid; size_t olen;
+ int prefix; };
+ struct mlistoid list[32]; /*(much larger than expected)*/
+ int nlist = 0;
+ for (const char *s = match, *tok, *e; *s; s = tok ? tok+1 : "") {
+ tok = os_strchr(s, '/');
+ list[nlist].oid = NULL;
+ list[nlist].olen = 0;
+ list[nlist].n = tok ? (size_t)(tok - s) : os_strlen(s);
+ e = memchr(s, '=', list[nlist].n);
+ if (e == NULL) {
+ if (list[nlist].n == 0)
+ continue; /* skip consecutive, repeated '/' */
+ if (list[nlist].n == 1 && *s == '*') {
+ /* special-case "*" to match any OID and value */
+ s = e = "=*";
+ list[nlist].n = 2;
+ list[nlist].oid = "";
+ }
+ else {
+ wpa_printf(MSG_INFO,
+ "MTLS: invalid check_cert_subject '%s' missing '='",
+ match);
+ return 0;
+ }
+ }
+ switch (e - s) {
+ case 1:
+ if (*s == 'C') {
+ list[nlist].oid = MBEDTLS_OID_AT_COUNTRY;
+ list[nlist].olen = sizeof(MBEDTLS_OID_AT_COUNTRY)-1;
+ }
+ else if (*s == 'L') {
+ list[nlist].oid = MBEDTLS_OID_AT_LOCALITY;
+ list[nlist].olen = sizeof(MBEDTLS_OID_AT_LOCALITY)-1;
+ }
+ else if (*s == 'O') {
+ list[nlist].oid = MBEDTLS_OID_AT_ORGANIZATION;
+ list[nlist].olen = sizeof(MBEDTLS_OID_AT_ORGANIZATION)-1;
+ }
+ break;
+ case 2:
+ if (s[0] == 'C' && s[1] == 'N') {
+ list[nlist].oid = MBEDTLS_OID_AT_CN;
+ list[nlist].olen = sizeof(MBEDTLS_OID_AT_CN)-1;
+ }
+ else if (s[0] == 'S' && s[1] == 'T') {
+ list[nlist].oid = MBEDTLS_OID_AT_STATE;
+ list[nlist].olen = sizeof(MBEDTLS_OID_AT_STATE)-1;
+ }
+ else if (s[0] == 'O' && s[1] == 'U') {
+ list[nlist].oid = MBEDTLS_OID_AT_ORG_UNIT;
+ list[nlist].olen = sizeof(MBEDTLS_OID_AT_ORG_UNIT)-1;
+ }
+ break;
+ case 12:
+ if (os_memcmp(s, "emailAddress", 12) == 0) {
+ list[nlist].oid = MBEDTLS_OID_PKCS9_EMAIL;
+ list[nlist].olen = sizeof(MBEDTLS_OID_PKCS9_EMAIL)-1;
+ }
+ break;
+ default:
+ break;
+ }
+ if (list[nlist].oid == NULL) {
+ wpa_printf(MSG_INFO,
+ "MTLS: Unknown field in check_cert_subject '%s'",
+ match);
+ return 0;
+ }
+ list[nlist].n -= (size_t)(++e - s);
+ list[nlist].p = e;
+ if (list[nlist].n && e[list[nlist].n-1] == '*') {
+ --list[nlist].n;
+ list[nlist].prefix = 1;
+ }
+ /*(could easily add support for suffix matches if value begins with '*',
+ * but suffix match is not currently supported by other TLS modules)*/
+
+ if (list[nlist].n && ++nlist == sizeof(list)/sizeof(*list)) {
+ wpa_printf(MSG_INFO,
+ "MTLS: excessive check_cert_subject match '%s'",
+ match);
+ break; /* truncate huge list and continue */
+ }
+ }
+
+ /* each component in match string must match cert Subject in order listed
+ * The behavior below preserves ordering but is slightly different than
+ * the grossly inefficient contortions implemented in tls_openssl.c */
+ const mbedtls_x509_name *name = &crt->subject;
+ for (int i = 0; i < nlist; ++i) {
+ int found = 0;
+ for (; name != NULL && !found; name = name->next) {
+ if (!name->oid.p)
+ continue;
+ /* special-case "*" to match any OID and value */
+ if (list[i].olen == 0) {
+ found = 1;
+ continue;
+ }
+ /* perform equalent of !MBEDTLS_OID_CMP() with oid ptr and len */
+ if (list[i].olen != name->oid.len
+ || os_memcmp(list[i].oid, name->oid.p, name->oid.len) != 0)
+ continue;
+ /* Note: v is not '\0'-terminated, but is a known length vlen,
+ * so okay to pass to os_strncasecmp() even though not z-string */
+ if ((list[i].prefix
+ ? list[i].n <= name->val.len /* prefix match */
+ : list[i].n == name->val.len) /* full match */
+ && 0 == os_strncasecmp((char *)name->val.p,
+ list[i].p, list[i].n)) {
+ found = 1;
+ continue;
+ }
+ }
+ if (!found)
+ return 0; /* no match */
+ }
+ return 1; /* match */
+}
+
+
+__attribute_cold__
+static void
+tls_mbedtls_verify_fail_event (mbedtls_x509_crt *crt, int depth,
+ const char *errmsg, enum tls_fail_reason reason)
+{
+ struct tls_config *init_conf = &tls_ctx_global.init_conf;
+ if (init_conf->event_cb == NULL)
+ return;
+
+ struct wpabuf *certbuf = wpabuf_alloc_copy(crt->raw.p, crt->raw.len);
+ char subject[MBEDTLS_X509_MAX_DN_NAME_SIZE*2];
+ if (mbedtls_x509_dn_gets(subject, sizeof(subject), &crt->subject) < 0)
+ subject[0] = '\0';
+ union tls_event_data ev;
+ os_memset(&ev, 0, sizeof(ev));
+ ev.cert_fail.reason = reason;
+ ev.cert_fail.depth = depth;
+ ev.cert_fail.subject = subject;
+ ev.cert_fail.reason_txt = errmsg;
+ ev.cert_fail.cert = certbuf;
+
+ init_conf->event_cb(init_conf->cb_ctx, TLS_CERT_CHAIN_FAILURE, &ev);
+
+ wpabuf_free(certbuf);
+}
+
+
+__attribute_noinline__
+static void
+tls_mbedtls_verify_cert_event (struct tls_connection *conn,
+ mbedtls_x509_crt *crt, int depth)
+{
+ struct tls_config *init_conf = &tls_ctx_global.init_conf;
+ if (init_conf->event_cb == NULL)
+ return;
+
+ struct wpabuf *certbuf = NULL;
+ union tls_event_data ev;
+ os_memset(&ev, 0, sizeof(ev));
+
+ #ifdef MBEDTLS_SHA256_C
+ u8 hash[SHA256_DIGEST_LENGTH];
+ const u8 *addr[] = { (u8 *)crt->raw.p };
+ if (sha256_vector(1, addr, &crt->raw.len, hash) == 0) {
+ ev.peer_cert.hash = hash;
+ ev.peer_cert.hash_len = sizeof(hash);
+ }
+ #endif
+ ev.peer_cert.depth = depth;
+ char subject[MBEDTLS_X509_MAX_DN_NAME_SIZE*2];
+ if (depth == 0)
+ ev.peer_cert.subject = conn->peer_subject;
+ if (ev.peer_cert.subject == NULL) {
+ ev.peer_cert.subject = subject;
+ if (mbedtls_x509_dn_gets(subject, sizeof(subject), &crt->subject) < 0)
+ subject[0] = '\0';
+ }
+
+ char serial_num[128+1];
+ ev.peer_cert.serial_num =
+ tls_mbedtls_peer_serial_num(crt, serial_num, sizeof(serial_num));
+
+ const mbedtls_x509_sequence *cur;
+
+ cur = NULL;
+ if (mbedtls_x509_crt_has_ext_type(crt, MBEDTLS_X509_EXT_SUBJECT_ALT_NAME))
+ cur = &crt->subject_alt_names;
+ for (; cur != NULL; cur = cur->next) {
+ const unsigned char san_type = (unsigned char)cur->buf.tag
+ & MBEDTLS_ASN1_TAG_VALUE_MASK;
+ size_t prelen = 4;
+ const char *pre;
+ switch (san_type) {
+ case MBEDTLS_X509_SAN_RFC822_NAME: prelen = 6; pre = "EMAIL:";break;
+ case MBEDTLS_X509_SAN_DNS_NAME: pre = "DNS:"; break;
+ case MBEDTLS_X509_SAN_UNIFORM_RESOURCE_IDENTIFIER: pre = "URI:"; break;
+ default: continue;
+ }
+
+ char *pos = os_malloc(prelen + cur->buf.len + 1);
+ if (pos == NULL)
+ break;
+ ev.peer_cert.altsubject[ev.peer_cert.num_altsubject] = pos;
+ os_memcpy(pos, pre, prelen);
+ /* data should be properly backslash-escaped if needed,
+ * so code below does not re-escape, but does replace CTLs */
+ /*os_memcpy(pos+prelen, cur->buf.p, cur->buf.len);*/
+ /*pos[prelen+cur->buf.len] = '\0';*/
+ pos += prelen;
+ for (size_t i = 0; i < cur->buf.len; ++i) {
+ unsigned char c = cur->buf.p[i];
+ *pos++ = (c >= 32 && c != 127) ? c : '?';
+ }
+ *pos = '\0';
+
+ if (++ev.peer_cert.num_altsubject == TLS_MAX_ALT_SUBJECT)
+ break;
+ }
+
+ cur = NULL;
+ if (mbedtls_x509_crt_has_ext_type(crt, MBEDTLS_X509_EXT_CERTIFICATE_POLICIES))
+ cur = &crt->certificate_policies;
+ for (; cur != NULL; cur = cur->next) {
+ if (cur->buf.len != 11) /* len of OID_TOD_STRICT or OID_TOD_TOFU */
+ continue;
+ /* TOD-STRICT "1.3.6.1.4.1.40808.1.3.1" */
+ /* TOD-TOFU "1.3.6.1.4.1.40808.1.3.2" */
+ #define OID_TOD_STRICT "\x2b\x06\x01\x04\x01\x82\xbe\x68\x01\x03\x01"
+ #define OID_TOD_TOFU "\x2b\x06\x01\x04\x01\x82\xbe\x68\x01\x03\x02"
+ if (os_memcmp(cur->buf.p,
+ OID_TOD_STRICT, sizeof(OID_TOD_STRICT)-1) == 0) {
+ ev.peer_cert.tod = 1; /* TOD-STRICT */
+ break;
+ }
+ if (os_memcmp(cur->buf.p,
+ OID_TOD_TOFU, sizeof(OID_TOD_TOFU)-1) == 0) {
+ ev.peer_cert.tod = 2; /* TOD-TOFU */
+ break;
+ }
+ }
+
+ struct tls_conf *tls_conf = conn->tls_conf;
+ if (tls_conf->ca_cert_probe || (tls_conf->flags & TLS_CONN_EXT_CERT_CHECK)
+ || init_conf->cert_in_cb) {
+ certbuf = wpabuf_alloc_copy(crt->raw.p, crt->raw.len);
+ ev.peer_cert.cert = certbuf;
+ }
+
+ init_conf->event_cb(init_conf->cb_ctx, TLS_PEER_CERTIFICATE, &ev);
+
+ wpabuf_free(certbuf);
+ char **altsubject;
+ *(const char ***)&altsubject = ev.peer_cert.altsubject;
+ for (size_t i = 0; i < ev.peer_cert.num_altsubject; ++i)
+ os_free(altsubject[i]);
+}
+
+
+static int
+tls_mbedtls_verify_cb (void *arg, mbedtls_x509_crt *crt, int depth, uint32_t *flags)
+{
+ /* XXX: N.B. verify code not carefully tested besides hwsim tests
+ *
+ * RFE: mbedtls_x509_crt_verify_info() and enhance log trace messages
+ * RFE: review and add support for additional TLS_CONN_* flags
+ * not handling OCSP (not available in mbedtls)
+ * ... */
+
+ struct tls_connection *conn = (struct tls_connection *)arg;
+ struct tls_conf *tls_conf = conn->tls_conf;
+ uint32_t flags_in = *flags;
+
+ if (depth > 8) { /*(depth 8 picked as arbitrary limit)*/
+ emsg(MSG_WARNING, "client cert chain too long");
+ *flags |= MBEDTLS_X509_BADCERT_OTHER; /* cert chain too long */
+ tls_mbedtls_verify_fail_event(crt, depth,
+ "client cert chain too long",
+ TLS_FAIL_BAD_CERTIFICATE);
+ }
+ else if (tls_conf->verify_depth0_only) {
+ if (depth > 0)
+ *flags = 0;
+ else {
+ #ifdef MBEDTLS_SHA256_C
+ u8 hash[SHA256_DIGEST_LENGTH];
+ const u8 *addr[] = { (u8 *)crt->raw.p };
+ if (sha256_vector(1, addr, &crt->raw.len, hash) < 0
+ || os_memcmp(tls_conf->ca_cert_hash, hash, sizeof(hash)) != 0) {
+ *flags |= MBEDTLS_X509_BADCERT_NOT_TRUSTED;
+ tls_mbedtls_verify_fail_event(crt, depth,
+ "cert hash mismatch",
+ TLS_FAIL_UNTRUSTED);
+ }
+ else /* hash matches; ignore other issues *except* if revoked)*/
+ *flags &= MBEDTLS_X509_BADCERT_REVOKED;
+ #endif
+ }
+ }
+ else if (depth == 0) {
+ if (!conn->peer_subject)
+ tls_mbedtls_set_peer_subject(conn, crt);
+ /*(use same labels to tls_mbedtls_verify_fail_event() as used in
+ * other TLS modules so that hwsim tests find exact string match)*/
+ if (!conn->peer_subject) { /* error copying subject string */
+ *flags |= MBEDTLS_X509_BADCERT_OTHER;
+ tls_mbedtls_verify_fail_event(crt, depth,
+ "internal error",
+ TLS_FAIL_UNSPECIFIED);
+ }
+ /*(use os_strstr() for subject match as is done in tls_mbedtls.c
+ * to follow the same behavior, even though a suffix match would
+ * make more sense. Also, note that strstr match does not
+ * normalize whitespace (between components) for comparison)*/
+ else if (tls_conf->subject_match
+ && os_strstr(conn->peer_subject,
+ tls_conf->subject_match) == NULL) {
+ wpa_printf(MSG_WARNING,
+ "MTLS: Subject '%s' did not match with '%s'",
+ conn->peer_subject, tls_conf->subject_match);
+ *flags |= MBEDTLS_X509_BADCERT_CN_MISMATCH;
+ tls_mbedtls_verify_fail_event(crt, depth,
+ "Subject mismatch",
+ TLS_FAIL_SUBJECT_MISMATCH);
+ }
+ if (tls_conf->altsubject_match
+ && !tls_mbedtls_match_altsubject(crt, tls_conf->altsubject_match)) {
+ wpa_printf(MSG_WARNING,
+ "MTLS: altSubjectName match '%s' not found",
+ tls_conf->altsubject_match);
+ *flags |= MBEDTLS_X509_BADCERT_CN_MISMATCH;
+ tls_mbedtls_verify_fail_event(crt, depth,
+ "AltSubject mismatch",
+ TLS_FAIL_ALTSUBJECT_MISMATCH);
+ }
+ if (tls_conf->suffix_match
+ && !tls_mbedtls_match_suffixes(crt, tls_conf->suffix_match, 0)) {
+ wpa_printf(MSG_WARNING,
+ "MTLS: Domain suffix match '%s' not found",
+ tls_conf->suffix_match);
+ *flags |= MBEDTLS_X509_BADCERT_CN_MISMATCH;
+ tls_mbedtls_verify_fail_event(crt, depth,
+ "Domain suffix mismatch",
+ TLS_FAIL_DOMAIN_SUFFIX_MISMATCH);
+ }
+ if (tls_conf->domain_match
+ && !tls_mbedtls_match_suffixes(crt, tls_conf->domain_match, 1)) {
+ wpa_printf(MSG_WARNING,
+ "MTLS: Domain match '%s' not found",
+ tls_conf->domain_match);
+ *flags |= MBEDTLS_X509_BADCERT_CN_MISMATCH;
+ tls_mbedtls_verify_fail_event(crt, depth,
+ "Domain mismatch",
+ TLS_FAIL_DOMAIN_MISMATCH);
+ }
+ if (tls_conf->check_cert_subject
+ && !tls_mbedtls_match_dn_field(crt, tls_conf->check_cert_subject)) {
+ *flags |= MBEDTLS_X509_BADCERT_CN_MISMATCH;
+ tls_mbedtls_verify_fail_event(crt, depth,
+ "Distinguished Name",
+ TLS_FAIL_DN_MISMATCH);
+ }
+ if (tls_conf->flags & TLS_CONN_SUITEB) {
+ /* check RSA modulus size (public key bitlen) */
+ const mbedtls_pk_type_t pk_alg = mbedtls_pk_get_type(&crt->pk);
+ if ((pk_alg == MBEDTLS_PK_RSA || pk_alg == MBEDTLS_PK_RSASSA_PSS)
+ && mbedtls_pk_get_bitlen(&crt->pk) < 3072) {
+ /* hwsim suite_b RSA tests expect 3072
+ * suite_b_192_rsa_ecdhe_radius_rsa2048_client
+ * suite_b_192_rsa_dhe_radius_rsa2048_client */
+ *flags |= MBEDTLS_X509_BADCERT_BAD_KEY;
+ tls_mbedtls_verify_fail_event(crt, depth,
+ "Insufficient RSA modulus size",
+ TLS_FAIL_INSUFFICIENT_KEY_LEN);
+ }
+ }
+ if (tls_conf->check_crl && tls_conf->crl == NULL) {
+ /* see tests/hwsim test_ap_eap.py ap_wpa2_eap_tls_check_crl */
+ emsg(MSG_WARNING, "check_crl set but no CRL loaded; reject all?");
+ *flags |= MBEDTLS_X509_BADCERT_OTHER;
+ tls_mbedtls_verify_fail_event(crt, depth,
+ "check_crl set but no CRL loaded; "
+ "reject all?",
+ TLS_FAIL_BAD_CERTIFICATE);
+ }
+ }
+ else {
+ if (tls_conf->check_crl != 2) /* 2 == verify CRLs for all certs */
+ *flags &= ~MBEDTLS_X509_BADCERT_REVOKED;
+ }
+
+ if (!tls_conf->check_crl_strict) {
+ *flags &= ~MBEDTLS_X509_BADCRL_EXPIRED;
+ *flags &= ~MBEDTLS_X509_BADCRL_FUTURE;
+ }
+
+ if (tls_conf->flags & TLS_CONN_DISABLE_TIME_CHECKS) {
+ *flags &= ~MBEDTLS_X509_BADCERT_EXPIRED;
+ *flags &= ~MBEDTLS_X509_BADCERT_FUTURE;
+ }
+
+ tls_mbedtls_verify_cert_event(conn, crt, depth);
+
+ if (*flags) {
+ if (*flags & (MBEDTLS_X509_BADCERT_NOT_TRUSTED
+ |MBEDTLS_X509_BADCERT_CN_MISMATCH
+ |MBEDTLS_X509_BADCERT_REVOKED)) {
+ emsg(MSG_WARNING, "client cert not trusted");
+ }
+ /* report event if flags set but no additional flags set above */
+ /* (could translate flags to more detailed TLS_FAIL_* if needed) */
+ if (!(*flags & ~flags_in)) {
+ enum tls_fail_reason reason = TLS_FAIL_UNSPECIFIED;
+ const char *errmsg = "cert verify fail unspecified";
+ if (*flags & MBEDTLS_X509_BADCERT_NOT_TRUSTED) {
+ reason = TLS_FAIL_UNTRUSTED;
+ errmsg = "certificate not trusted";
+ }
+ if (*flags & MBEDTLS_X509_BADCERT_REVOKED) {
+ reason = TLS_FAIL_REVOKED;
+ errmsg = "certificate has been revoked";
+ }
+ if (*flags & MBEDTLS_X509_BADCERT_FUTURE) {
+ reason = TLS_FAIL_NOT_YET_VALID;
+ errmsg = "certificate not yet valid";
+ }
+ if (*flags & MBEDTLS_X509_BADCERT_EXPIRED) {
+ reason = TLS_FAIL_EXPIRED;
+ errmsg = "certificate has expired";
+ }
+ if (*flags & MBEDTLS_X509_BADCERT_BAD_MD) {
+ reason = TLS_FAIL_BAD_CERTIFICATE;
+ errmsg = "certificate uses insecure algorithm";
+ }
+ tls_mbedtls_verify_fail_event(crt, depth, errmsg, reason);
+ }
+ #if 0
+ /* ??? send (again) cert events for all certs in chain ???
+ * (should already have been called for greater depths) */
+ /* tls_openssl.c:tls_verify_cb() sends cert events for all certs
+ * in chain if certificate validation fails, but sends all events
+ * with depth set to 0 (might be a bug) */
+ if (depth > 0) {
+ int pdepth = depth + 1;
+ for (mbedtls_x509_crt *pcrt; (pcrt = crt->next); ++pdepth) {
+ tls_mbedtls_verify_cert_event(conn, pcrt, pdepth);
+ }
+ }
+ #endif
+ /*(do not preserve subject if verification failed but was optional)*/
+ if (depth == 0 && conn->peer_subject) {
+ os_free(conn->peer_subject);
+ conn->peer_subject = NULL;
+ }
+ }
+ else if (depth == 0) {
+ struct tls_config *init_conf = &tls_ctx_global.init_conf;
+ if (tls_conf->ca_cert_probe) {
+ /* reject server certificate on probe-only run */
+ *flags |= MBEDTLS_X509_BADCERT_OTHER;
+ tls_mbedtls_verify_fail_event(crt, depth,
+ "server chain probe",
+ TLS_FAIL_SERVER_CHAIN_PROBE);
+ }
+ else if (init_conf->event_cb) {
+ /* ??? send event as soon as depth == 0 is verified ???
+ * What about rest of chain?
+ * Follows tls_mbedtls.c behavior: */
+ init_conf->event_cb(init_conf->cb_ctx,
+ TLS_CERT_CHAIN_SUCCESS, NULL);
+ }
+ }
+
+ return 0;
+}
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 4331782d8..e1a447333 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -979,6 +979,9 @@ struct wpa_driver_associate_params {
* responsible for selecting with which BSS to associate. */
const u8 *bssid;
+ unsigned char rates[WLAN_SUPP_RATES_MAX];
+ int mcast_rate;
+
/**
* bssid_hint - BSSID of a proposed AP
*
@@ -1886,6 +1889,7 @@ struct wpa_driver_mesh_join_params {
#define WPA_DRIVER_MESH_FLAG_AMPE 0x00000008
unsigned int flags;
bool handle_dfs;
+ int mcast_rate;
};
struct wpa_driver_set_key_params {
@@ -2357,6 +2361,9 @@ struct wpa_driver_capa {
/** Maximum number of iterations in a single scan plan */
u32 max_sched_scan_plan_iterations;
+ /** Maximum number of extra IE bytes for scans */
+ u16 max_scan_ie_len;
+
/** Whether sched_scan (offloaded scanning) is supported */
int sched_scan_supported;
@@ -3887,6 +3894,25 @@ struct wpa_driver_ops {
int (*if_remove)(void *priv, enum wpa_driver_if_type type,
const char *ifname);
+ /**
+ * if_rename - Rename a virtual interface
+ * @priv: Private driver interface data
+ * @type: Interface type
+ * @ifname: Interface name of the virtual interface to be renamed
+ * (NULL when renaming the AP BSS interface)
+ * @new_name: New interface name of the virtual interface
+ * Returns: 0 on success, -1 on failure
+ */
+ int (*if_rename)(void *priv, enum wpa_driver_if_type type,
+ const char *ifname, const char *new_name);
+
+ /**
+ * set_first_bss - Make a virtual interface the first (primary) bss
+ * @priv: Private driver interface data
+ * Returns: 0 on success, -1 on failure
+ */
+ int (*set_first_bss)(void *priv);
+
/**
* set_sta_vlan - Bind a station into a specific interface (AP only)
* @priv: Private driver interface data
@@ -3989,7 +4015,7 @@ struct wpa_driver_ops {
* Returns: 0 on success, -1 on failure
*/
int (*set_wds_sta)(void *priv, const u8 *addr, int aid, int val,
- const char *bridge_ifname, char *ifname_wds);
+ const char *bridge_ifname, const char *ifname_wds);
/**
* send_action - Transmit an Action frame
@@ -4291,7 +4317,7 @@ struct wpa_driver_ops {
* Returns: 0 on success, negative (<0) on failure
*/
int (*br_set_net_param)(void *priv, enum drv_br_net_param param,
- unsigned int val);
+ const char *ifname, unsigned int val);
/**
* get_wowlan - Get wake-on-wireless status
@@ -6588,6 +6614,7 @@ union wpa_event_data {
/**
* struct ch_switch
+ * @count: Count until channel switch activates
* @freq: Frequency of new channel in MHz
* @ht_enabled: Whether this is an HT channel
* @ch_offset: Secondary channel offset
@@ -6598,6 +6625,7 @@ union wpa_event_data {
* @punct_bitmap: Puncturing bitmap
*/
struct ch_switch {
+ int count;
int freq;
int ht_enabled;
int ch_offset;
@@ -6846,8 +6874,8 @@ union wpa_event_data {
* Driver wrapper code should call this function whenever an event is received
* from the driver.
*/
-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
- union wpa_event_data *data);
+extern void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data);
/**
* wpa_supplicant_event_global - Report a driver event for wpa_supplicant
@@ -6859,7 +6887,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
* Same as wpa_supplicant_event(), but we search for the interface in
* wpa_global.
*/
-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
+extern void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
union wpa_event_data *data);
/*
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 39f58ff83..a70eaae38 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -75,6 +75,16 @@ enum nlmsgerr_attrs {
#endif /* ANDROID */
+static void handle_nl_debug_hook(struct nl_msg *msg, int tx)
+{
+ const struct nlmsghdr *nlh;
+
+ if (!wpa_netlink_hook)
+ return;
+
+ nlh = nlmsg_hdr(msg);
+ wpa_netlink_hook(tx, nlh, nlh->nlmsg_len);
+}
static struct nl_sock * nl_create_handle(struct nl_cb *cb, const char *dbg)
{
@@ -429,6 +439,11 @@ static int no_seq_check(struct nl_msg *msg, void *arg)
return NL_OK;
}
+static int debug_handler(struct nl_msg *msg, void *arg)
+{
+ handle_nl_debug_hook(msg, 0);
+ return NL_OK;
+}
static void nl80211_nlmsg_clear(struct nl_msg *msg)
{
@@ -502,6 +517,8 @@ int send_and_recv(struct nl80211_global *global,
if (!msg)
return -ENOMEM;
+ handle_nl_debug_hook(msg, 1);
+
err.err = -ENOMEM;
s_nl_cb = nl_socket_get_cb(nl_handle);
@@ -536,6 +553,7 @@ int send_and_recv(struct nl80211_global *global,
err.orig_msg = msg;
err.err_info = err_info;
+ nl_cb_set(cb, NL_CB_MSG_IN, NL_CB_CUSTOM, debug_handler, NULL);
nl_cb_err(cb, NL_CB_CUSTOM, error_handler, &err);
nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &err.err);
if (ack_handler_custom) {
@@ -939,6 +957,7 @@ nl80211_get_wiphy_data_ap(struct i802_bss *bss)
os_free(w);
return NULL;
}
+ nl_cb_set(w->nl_cb, NL_CB_MSG_IN, NL_CB_CUSTOM, debug_handler, NULL);
nl_cb_set(w->nl_cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM,
no_seq_check, NULL);
nl_cb_set(w->nl_cb, NL_CB_VALID, NL_CB_CUSTOM,
@@ -1353,7 +1372,7 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx,
}
wpa_printf(MSG_DEBUG, "nl80211: Interface down (%s/%s)",
namebuf, ifname);
- if (os_strcmp(drv->first_bss->ifname, ifname) != 0) {
+ if (drv->first_bss->ifindex != ifi->ifi_index) {
wpa_printf(MSG_DEBUG,
"nl80211: Not the main interface (%s) - do not indicate interface down",
drv->first_bss->ifname);
@@ -1389,7 +1408,7 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx,
}
wpa_printf(MSG_DEBUG, "nl80211: Interface up (%s/%s)",
namebuf, ifname);
- if (os_strcmp(drv->first_bss->ifname, ifname) != 0) {
+ if (drv->first_bss->ifindex != ifi->ifi_index) {
wpa_printf(MSG_DEBUG,
"nl80211: Not the main interface (%s) - do not indicate interface up",
drv->first_bss->ifname);
@@ -2035,6 +2054,7 @@ static int wpa_driver_nl80211_init_nl_global(struct nl80211_global *global)
genl_family_put(family);
nl_cache_free(cache);
+ nl_cb_set(global->nl_cb, NL_CB_MSG_IN, NL_CB_CUSTOM, debug_handler, NULL);
nl_cb_set(global->nl_cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM,
no_seq_check, NULL);
nl_cb_set(global->nl_cb, NL_CB_VALID, NL_CB_CUSTOM,
@@ -2205,6 +2225,7 @@ static int nl80211_init_bss(struct i802_bss *bss)
if (!bss->nl_cb)
return -1;
+ nl_cb_set(bss->nl_cb, NL_CB_MSG_IN, NL_CB_CUSTOM, debug_handler, NULL);
nl_cb_set(bss->nl_cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM,
no_seq_check, NULL);
nl_cb_set(bss->nl_cb, NL_CB_VALID, NL_CB_CUSTOM,
@@ -3083,7 +3104,7 @@ static int wpa_driver_nl80211_del_beacon(struct i802_bss *bss,
struct wpa_driver_nl80211_data *drv = bss->drv;
struct i802_link *link = nl80211_get_link(bss, link_id);
- if (!link->beacon_set)
+ if (!link || !link->beacon_set)
return 0;
wpa_printf(MSG_DEBUG, "nl80211: Remove beacon (ifindex=%d)",
@@ -5494,7 +5515,7 @@ static int nl80211_set_channel(struct i802_bss *bss,
freq->he_enabled, freq->eht_enabled, freq->bandwidth,
freq->center_freq1, freq->center_freq2);
- msg = nl80211_drv_msg(drv, 0, set_chan ? NL80211_CMD_SET_CHANNEL :
+ msg = nl80211_bss_msg(bss, 0, set_chan ? NL80211_CMD_SET_CHANNEL :
NL80211_CMD_SET_WIPHY);
if (!msg || nl80211_put_freq_params(msg, freq) < 0) {
nlmsg_free(msg);
@@ -6183,8 +6204,7 @@ static void nl80211_teardown_ap(struct i802_bss *bss)
nl80211_mgmt_unsubscribe(bss, "AP teardown");
nl80211_put_wiphy_data_ap(bss);
- if (bss->flink)
- bss->flink->beacon_set = 0;
+ wpa_driver_nl80211_del_beacon_all(bss);
}
@@ -8414,24 +8434,14 @@ static int have_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
static int i802_set_wds_sta(void *priv, const u8 *addr, int aid, int val,
- const char *bridge_ifname, char *ifname_wds)
+ const char *bridge_ifname, const char *ifname_wds)
{
struct i802_bss *bss = priv;
struct wpa_driver_nl80211_data *drv = bss->drv;
- char name[IFNAMSIZ + 1];
+ const char *name = ifname_wds; // Kept to reduce changes to the minimum
union wpa_event_data event;
int ret;
- ret = os_snprintf(name, sizeof(name), "%s.sta%d", bss->ifname, aid);
- if (ret >= (int) sizeof(name))
- wpa_printf(MSG_WARNING,
- "nl80211: WDS interface name was truncated");
- else if (ret < 0)
- return ret;
-
- if (ifname_wds)
- os_strlcpy(ifname_wds, name, IFNAMSIZ + 1);
-
wpa_printf(MSG_DEBUG, "nl80211: Set WDS STA addr=" MACSTR
" aid=%d val=%d name=%s", MAC2STR(addr), aid, val, name);
if (val) {
@@ -8574,6 +8584,7 @@ static void *i802_init(struct hostapd_data *hapd,
char master_ifname[IFNAMSIZ];
int ifindex, br_ifindex = 0;
int br_added = 0;
+ int err;
bss = wpa_driver_nl80211_drv_init(hapd, params->ifname,
params->global_priv, 1,
@@ -8633,21 +8644,17 @@ static void *i802_init(struct hostapd_data *hapd,
(params->num_bridge == 0 || !params->bridge[0]))
add_ifidx(drv, br_ifindex, drv->ifindex);
- if (bss->added_if_into_bridge || bss->already_in_bridge) {
- int err;
-
- drv->rtnl_sk = nl_socket_alloc();
- if (drv->rtnl_sk == NULL) {
- wpa_printf(MSG_ERROR, "nl80211: Failed to allocate nl_sock");
- goto failed;
- }
+ drv->rtnl_sk = nl_socket_alloc();
+ if (drv->rtnl_sk == NULL) {
+ wpa_printf(MSG_ERROR, "nl80211: Failed to allocate nl_sock");
+ goto failed;
+ }
- err = nl_connect(drv->rtnl_sk, NETLINK_ROUTE);
- if (err) {
- wpa_printf(MSG_ERROR, "nl80211: Failed to connect nl_sock to NETLINK_ROUTE: %s",
- nl_geterror(err));
- goto failed;
- }
+ err = nl_connect(drv->rtnl_sk, NETLINK_ROUTE);
+ if (err) {
+ wpa_printf(MSG_ERROR, "nl80211: Failed to connect nl_sock to NETLINK_ROUTE: %s",
+ nl_geterror(err));
+ goto failed;
}
if (drv->capa.flags2 & WPA_DRIVER_FLAGS2_CONTROL_PORT_RX) {
@@ -8998,8 +9005,6 @@ static int wpa_driver_nl80211_if_remove(struct i802_bss *bss,
wpa_printf(MSG_DEBUG, "nl80211: First BSS - reassign context");
nl80211_teardown_ap(bss);
nl80211_remove_links(bss);
- if (!bss->added_if && !drv->first_bss->next)
- wpa_driver_nl80211_del_beacon_all(bss);
nl80211_destroy_bss(bss);
if (!bss->added_if)
i802_set_iface_flags(bss, 0);
@@ -9016,6 +9021,50 @@ static int wpa_driver_nl80211_if_remove(struct i802_bss *bss,
return 0;
}
+static int wpa_driver_nl80211_if_rename(struct i802_bss *bss,
+ enum wpa_driver_if_type type,
+ const char *ifname, const char *new_name)
+{
+ struct wpa_driver_nl80211_data *drv = bss->drv;
+ struct ifinfomsg ifi = {
+ .ifi_family = AF_UNSPEC,
+ .ifi_index = bss->ifindex,
+ };
+ struct nl_msg *msg;
+ int res = -ENOMEM;
+
+ if (ifname)
+ ifi.ifi_index = if_nametoindex(ifname);
+
+ msg = nlmsg_alloc_simple(RTM_SETLINK, 0);
+ if (!msg)
+ return res;
+
+ if (nlmsg_append(msg, &ifi, sizeof(ifi), NLMSG_ALIGNTO) < 0)
+ goto out;
+
+ if (nla_put_string(msg, IFLA_IFNAME, new_name))
+ goto out;
+
+ res = nl_send_auto_complete(drv->rtnl_sk, msg);
+ if (res < 0)
+ goto out;
+
+ res = nl_wait_for_ack(drv->rtnl_sk);
+ if (res) {
+ wpa_printf(MSG_INFO,
+ "nl80211: Renaming device %s to %s failed: %s",
+ ifname ? ifname : bss->ifname, new_name, nl_geterror(res));
+ goto out;
+ }
+
+ if (type == WPA_IF_AP_BSS && !ifname)
+ os_strlcpy(bss->ifname, new_name, sizeof(bss->ifname));
+
+out:
+ nlmsg_free(msg);
+ return res;
+}
static int cookie_handler(struct nl_msg *msg, void *arg)
{
@@ -10807,6 +10856,37 @@ static bool nl80211_is_drv_shared(void *priv, void *bss_ctx)
#endif /* CONFIG_IEEE80211BE */
+static int driver_nl80211_if_rename(void *priv, enum wpa_driver_if_type type,
+ const char *ifname, const char *new_name)
+{
+ struct i802_bss *bss = priv;
+ return wpa_driver_nl80211_if_rename(bss, type, ifname, new_name);
+}
+
+
+static int driver_nl80211_set_first_bss(void *priv)
+{
+ struct i802_bss *bss = priv, *tbss;
+ struct wpa_driver_nl80211_data *drv = bss->drv;
+
+ if (drv->first_bss == bss)
+ return 0;
+
+ for (tbss = drv->first_bss; tbss; tbss = tbss->next) {
+ if (tbss->next != bss)
+ continue;
+
+ tbss->next = bss->next;
+ bss->next = drv->first_bss;
+ drv->first_bss = bss;
+ drv->ctx = bss->ctx;
+ return 0;
+ }
+
+ return -1;
+}
+
+
static int driver_nl80211_send_mlme(void *priv, const u8 *data,
size_t data_len, int noack,
unsigned int freq,
@@ -11309,6 +11389,10 @@ static int nl80211_switch_channel(void *priv, struct csa_settings *settings)
if (ret)
goto error;
+ if (drv->nlmode == NL80211_IFTYPE_MESH_POINT) {
+ nla_put_flag(msg, NL80211_ATTR_HANDLE_DFS);
+ }
+
/* beacon_csa params */
beacon_csa = nla_nest_start(msg, NL80211_ATTR_CSA_IES);
if (!beacon_csa)
@@ -11983,6 +12067,18 @@ static int nl80211_put_mesh_id(struct nl_msg *msg, const u8 *mesh_id,
}
+static int nl80211_put_mcast_rate(struct nl_msg *msg, int mcast_rate)
+{
+ if (mcast_rate > 0) {
+ wpa_printf(MSG_DEBUG, " * mcast_rate=%.1f",
+ (double)mcast_rate / 10);
+ return nla_put_u32(msg, NL80211_ATTR_MCAST_RATE, mcast_rate);
+ }
+
+ return 0;
+}
+
+
static int nl80211_put_mesh_config(struct nl_msg *msg,
struct wpa_driver_mesh_bss_params *params)
{
@@ -12044,6 +12140,7 @@ static int nl80211_join_mesh(struct i802_bss *bss,
nl80211_put_basic_rates(msg, params->basic_rates) ||
nl80211_put_mesh_id(msg, params->meshid, params->meshid_len) ||
nl80211_put_beacon_int(msg, params->beacon_int) ||
+ nl80211_put_mcast_rate(msg, params->mcast_rate) ||
nl80211_put_dtim_period(msg, params->dtim_period))
goto fail;
@@ -12397,7 +12494,7 @@ static const char * drv_br_net_param_str(enum drv_br_net_param param)
static int wpa_driver_br_set_net_param(void *priv, enum drv_br_net_param param,
- unsigned int val)
+ const char *ifname, unsigned int val)
{
struct i802_bss *bss = priv;
char path[128];
@@ -12423,8 +12520,11 @@ static int wpa_driver_br_set_net_param(void *priv, enum drv_br_net_param param,
return -EINVAL;
}
+ if (!ifname)
+ ifname = bss->brname;
+
os_snprintf(path, sizeof(path), "/proc/sys/net/ipv%d/conf/%s/%s",
- ip_version, bss->brname, param_txt);
+ ip_version, ifname, param_txt);
set_val:
if (linux_write_system_file(path, val))
@@ -14027,6 +14127,8 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
.set_acl = wpa_driver_nl80211_set_acl,
.if_add = wpa_driver_nl80211_if_add,
.if_remove = driver_nl80211_if_remove,
+ .if_rename = driver_nl80211_if_rename,
+ .set_first_bss = driver_nl80211_set_first_bss,
.send_mlme = driver_nl80211_send_mlme,
.get_hw_feature_data = nl80211_get_hw_feature_data,
.sta_add = wpa_driver_nl80211_sta_add,
diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
index 26c1f4140..d5ba66b10 100644
--- a/src/drivers/driver_nl80211_capa.c
+++ b/src/drivers/driver_nl80211_capa.c
@@ -976,6 +976,10 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
nla_get_u32(tb[NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS]);
}
+ if (tb[NL80211_ATTR_MAX_SCAN_IE_LEN])
+ capa->max_scan_ie_len =
+ nla_get_u16(tb[NL80211_ATTR_MAX_SCAN_IE_LEN]);
+
if (tb[NL80211_ATTR_MAX_MATCH_SETS])
capa->max_match_sets =
nla_get_u8(tb[NL80211_ATTR_MAX_MATCH_SETS]);
diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c
index aee815e97..768c72905 100644
--- a/src/drivers/driver_nl80211_event.c
+++ b/src/drivers/driver_nl80211_event.c
@@ -1196,6 +1196,7 @@ static void mlme_event_ch_switch(struct wpa_driver_nl80211_data *drv,
struct nlattr *bw, struct nlattr *cf1,
struct nlattr *cf2,
struct nlattr *punct_bitmap,
+ struct nlattr *count,
int finished)
{
struct i802_bss *bss;
@@ -1259,6 +1260,8 @@ static void mlme_event_ch_switch(struct wpa_driver_nl80211_data *drv,
data.ch_switch.cf1 = nla_get_u32(cf1);
if (cf2)
data.ch_switch.cf2 = nla_get_u32(cf2);
+ if (count)
+ data.ch_switch.count = nla_get_u32(count);
if (link)
data.ch_switch.link_id = nla_get_u8(link);
@@ -3999,6 +4002,7 @@ static void do_process_drv_event(struct i802_bss *bss, int cmd,
tb[NL80211_ATTR_CENTER_FREQ1],
tb[NL80211_ATTR_CENTER_FREQ2],
tb[NL80211_ATTR_PUNCT_BITMAP],
+ tb[NL80211_ATTR_CH_SWITCH_COUNT],
0);
break;
case NL80211_CMD_CH_SWITCH_NOTIFY:
@@ -4011,6 +4015,7 @@ static void do_process_drv_event(struct i802_bss *bss, int cmd,
tb[NL80211_ATTR_CENTER_FREQ1],
tb[NL80211_ATTR_CENTER_FREQ2],
tb[NL80211_ATTR_PUNCT_BITMAP],
+ NULL,
1);
break;
case NL80211_CMD_DISCONNECT:
diff --git a/src/drivers/driver_nl80211_scan.c b/src/drivers/driver_nl80211_scan.c
index b055e684a..a8ea8f2cf 100644
--- a/src/drivers/driver_nl80211_scan.c
+++ b/src/drivers/driver_nl80211_scan.c
@@ -221,7 +221,7 @@ nl80211_scan_common(struct i802_bss *bss, u8 cmd,
wpa_printf(MSG_DEBUG, "nl80211: Passive scan requested");
}
- if (params->extra_ies) {
+ if (params->extra_ies && drv->capa.max_scan_ie_len >= params->extra_ies_len) {
wpa_hexdump(MSG_MSGDUMP, "nl80211: Scan extra IEs",
params->extra_ies, params->extra_ies_len);
if (nla_put(msg, NL80211_ATTR_IE, params->extra_ies_len,
diff --git a/src/drivers/drivers.c b/src/drivers/drivers.c
index e95df6ddb..9071da3cf 100644
--- a/src/drivers/drivers.c
+++ b/src/drivers/drivers.c
@@ -10,6 +10,10 @@
#include "utils/common.h"
#include "driver.h"
+void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data);
+void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data);
const struct wpa_driver_ops *const wpa_drivers[] =
{
diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak
index a03d4a034..8da44d9f5 100644
--- a/src/drivers/drivers.mak
+++ b/src/drivers/drivers.mak
@@ -54,7 +54,6 @@ NEED_SME=y
NEED_AP_MLME=y
NEED_NETLINK=y
NEED_LINUX_IOCTL=y
-NEED_RFKILL=y
NEED_RADIOTAP=y
NEED_LIBNL=y
endif
@@ -111,7 +110,6 @@ DRV_WPA_CFLAGS += -DCONFIG_DRIVER_WEXT
CONFIG_WIRELESS_EXTENSION=y
NEED_NETLINK=y
NEED_LINUX_IOCTL=y
-NEED_RFKILL=y
endif
ifdef CONFIG_DRIVER_NDIS
@@ -137,7 +135,6 @@ endif
ifdef CONFIG_WIRELESS_EXTENSION
DRV_WPA_CFLAGS += -DCONFIG_WIRELESS_EXTENSION
DRV_WPA_OBJS += ../src/drivers/driver_wext.o
-NEED_RFKILL=y
endif
ifdef NEED_NETLINK
@@ -146,6 +143,7 @@ endif
ifdef NEED_RFKILL
DRV_OBJS += ../src/drivers/rfkill.o
+DRV_WPA_CFLAGS += -DCONFIG_RFKILL
endif
ifdef NEED_RADIOTAP
diff --git a/src/drivers/rfkill.h b/src/drivers/rfkill.h
index 0412ac330..e27565375 100644
--- a/src/drivers/rfkill.h
+++ b/src/drivers/rfkill.h
@@ -18,8 +18,24 @@ struct rfkill_config {
void (*unblocked_cb)(void *ctx);
};
+#ifdef CONFIG_RFKILL
struct rfkill_data * rfkill_init(struct rfkill_config *cfg);
void rfkill_deinit(struct rfkill_data *rfkill);
int rfkill_is_blocked(struct rfkill_data *rfkill);
+#else
+static inline struct rfkill_data * rfkill_init(struct rfkill_config *cfg)
+{
+ return (void *) 1;
+}
+
+static inline void rfkill_deinit(struct rfkill_data *rfkill)
+{
+}
+
+static inline int rfkill_is_blocked(struct rfkill_data *rfkill)
+{
+ return 0;
+}
+#endif
#endif /* RFKILL_H */
diff --git a/src/radius/radius_client.c b/src/radius/radius_client.c
index 2a7f36170..8e8903051 100644
--- a/src/radius/radius_client.c
+++ b/src/radius/radius_client.c
@@ -165,6 +165,8 @@ struct radius_client_data {
*/
void *ctx;
+ struct hostapd_ip_addr local_ip;
+
/**
* conf - RADIUS client configuration (list of RADIUS servers to use)
*/
@@ -818,6 +820,30 @@ static void radius_close_acct_socket(struct radius_client_data *radius)
}
+/**
+ * radius_client_send - Get local address for the RADIUS auth socket
+ * @radius: RADIUS client context from radius_client_init()
+ * @addr: pointer to store the address
+ *
+ * This function returns the local address for the connection to the RADIUS
+ * auth server. It also opens the socket if it's not available yet.
+ */
+int radius_client_get_local_addr(struct radius_client_data *radius,
+ struct hostapd_ip_addr *addr)
+{
+ struct hostapd_radius_servers *conf = radius->conf;
+
+ if (conf->auth_server && radius->auth_sock < 0)
+ radius_client_init_auth(radius);
+
+ if (radius->auth_sock < 0)
+ return -1;
+
+ memcpy(addr, &radius->local_ip, sizeof(*addr));
+
+ return 0;
+}
+
/**
* radius_client_send - Send a RADIUS request
* @radius: RADIUS client context from radius_client_init()
@@ -1711,6 +1737,10 @@ radius_change_server(struct radius_client_data *radius,
wpa_printf(MSG_DEBUG, "RADIUS local address: %s:%u",
inet_ntoa(claddr.sin_addr),
ntohs(claddr.sin_port));
+ if (auth) {
+ radius->local_ip.af = AF_INET;
+ radius->local_ip.u.v4 = claddr.sin_addr;
+ }
}
break;
#ifdef CONFIG_IPV6
@@ -1722,6 +1752,10 @@ radius_change_server(struct radius_client_data *radius,
inet_ntop(AF_INET6, &claddr6.sin6_addr,
abuf, sizeof(abuf)),
ntohs(claddr6.sin6_port));
+ if (auth) {
+ radius->local_ip.af = AF_INET6;
+ radius->local_ip.u.v6 = claddr6.sin6_addr;
+ }
}
break;
}
diff --git a/src/radius/radius_client.h b/src/radius/radius_client.h
index db40637ea..9a89b0382 100644
--- a/src/radius/radius_client.h
+++ b/src/radius/radius_client.h
@@ -274,6 +274,8 @@ int radius_client_register(struct radius_client_data *radius,
void radius_client_set_interim_error_cb(struct radius_client_data *radius,
void (*cb)(const u8 *addr, void *ctx),
void *ctx);
+int radius_client_get_local_addr(struct radius_client_data *radius,
+ struct hostapd_ip_addr * addr);
int radius_client_send(struct radius_client_data *radius,
struct radius_msg *msg,
RadiusType msg_type, const u8 *addr);
diff --git a/src/radius/radius_das.c b/src/radius/radius_das.c
index 8d7c9b4c4..01913b08f 100644
--- a/src/radius/radius_das.c
+++ b/src/radius/radius_das.c
@@ -12,13 +12,26 @@
#include "utils/common.h"
#include "utils/eloop.h"
#include "utils/ip_addr.h"
+#include "utils/list.h"
#include "radius.h"
#include "radius_das.h"
-struct radius_das_data {
+static struct dl_list das_ports = DL_LIST_HEAD_INIT(das_ports);
+
+struct radius_das_port {
+ struct dl_list list;
+ struct dl_list das_data;
+
+ int port;
int sock;
+};
+
+struct radius_das_data {
+ struct dl_list list;
+ struct radius_das_port *port;
u8 *shared_secret;
+ u8 *nas_identifier;
size_t shared_secret_len;
struct hostapd_ip_addr client_addr;
unsigned int time_window;
@@ -388,56 +401,17 @@ fail:
}
-static void radius_das_receive(int sock, void *eloop_ctx, void *sock_ctx)
+static void
+radius_das_receive_msg(struct radius_das_data *das, struct radius_msg *msg,
+ struct sockaddr *from, socklen_t fromlen,
+ char *abuf, int from_port)
{
- struct radius_das_data *das = eloop_ctx;
- u8 buf[1500];
- union {
- struct sockaddr_storage ss;
- struct sockaddr_in sin;
-#ifdef CONFIG_IPV6
- struct sockaddr_in6 sin6;
-#endif /* CONFIG_IPV6 */
- } from;
- char abuf[50];
- int from_port = 0;
- socklen_t fromlen;
- int len;
- struct radius_msg *msg, *reply = NULL;
+ struct radius_msg *reply = NULL;
struct radius_hdr *hdr;
struct wpabuf *rbuf;
+ struct os_time now;
u32 val;
int res;
- struct os_time now;
-
- fromlen = sizeof(from);
- len = recvfrom(sock, buf, sizeof(buf), 0,
- (struct sockaddr *) &from.ss, &fromlen);
- if (len < 0) {
- wpa_printf(MSG_ERROR, "DAS: recvfrom: %s", strerror(errno));
- return;
- }
-
- os_strlcpy(abuf, inet_ntoa(from.sin.sin_addr), sizeof(abuf));
- from_port = ntohs(from.sin.sin_port);
-
- wpa_printf(MSG_DEBUG, "DAS: Received %d bytes from %s:%d",
- len, abuf, from_port);
- if (das->client_addr.u.v4.s_addr &&
- das->client_addr.u.v4.s_addr != from.sin.sin_addr.s_addr) {
- wpa_printf(MSG_DEBUG, "DAS: Drop message from unknown client");
- return;
- }
-
- msg = radius_msg_parse(buf, len);
- if (msg == NULL) {
- wpa_printf(MSG_DEBUG, "DAS: Parsing incoming RADIUS packet "
- "from %s:%d failed", abuf, from_port);
- return;
- }
-
- if (wpa_debug_level <= MSG_MSGDUMP)
- radius_msg_dump(msg);
if (radius_msg_verify_das_req(msg, das->shared_secret,
das->shared_secret_len,
@@ -504,9 +478,8 @@ static void radius_das_receive(int sock, void *eloop_ctx, void *sock_ctx)
radius_msg_dump(reply);
rbuf = radius_msg_get_buf(reply);
- res = sendto(das->sock, wpabuf_head(rbuf),
- wpabuf_len(rbuf), 0,
- (struct sockaddr *) &from.ss, fromlen);
+ res = sendto(das->port->sock, wpabuf_head(rbuf),
+ wpabuf_len(rbuf), 0, from, fromlen);
if (res < 0) {
wpa_printf(MSG_ERROR, "DAS: sendto(to %s:%d): %s",
abuf, from_port, strerror(errno));
@@ -518,6 +491,72 @@ fail:
radius_msg_free(reply);
}
+static void radius_das_receive(int sock, void *eloop_ctx, void *sock_ctx)
+{
+ struct radius_das_port *p = eloop_ctx;
+ struct radius_das_data *das;
+ u8 buf[1500];
+ union {
+ struct sockaddr_storage ss;
+ struct sockaddr_in sin;
+#ifdef CONFIG_IPV6
+ struct sockaddr_in6 sin6;
+#endif /* CONFIG_IPV6 */
+ } from;
+ struct radius_msg *msg;
+ size_t nasid_len = 0;
+ u8 *nasid_buf = NULL;
+ char abuf[50];
+ int from_port = 0;
+ socklen_t fromlen;
+ int found = 0;
+ int len;
+
+ fromlen = sizeof(from);
+ len = recvfrom(sock, buf, sizeof(buf), 0,
+ (struct sockaddr *) &from.ss, &fromlen);
+ if (len < 0) {
+ wpa_printf(MSG_ERROR, "DAS: recvfrom: %s", strerror(errno));
+ return;
+ }
+
+ os_strlcpy(abuf, inet_ntoa(from.sin.sin_addr), sizeof(abuf));
+ from_port = ntohs(from.sin.sin_port);
+
+ msg = radius_msg_parse(buf, len);
+ if (msg == NULL) {
+ wpa_printf(MSG_DEBUG, "DAS: Parsing incoming RADIUS packet "
+ "from %s:%d failed", abuf, from_port);
+ return;
+ }
+
+ wpa_printf(MSG_DEBUG, "DAS: Received %d bytes from %s:%d",
+ len, abuf, from_port);
+
+ if (wpa_debug_level <= MSG_MSGDUMP)
+ radius_msg_dump(msg);
+
+ radius_msg_get_attr_ptr(msg, RADIUS_ATTR_NAS_IDENTIFIER,
+ &nasid_buf, &nasid_len, NULL);
+ dl_list_for_each(das, &p->das_data, struct radius_das_data, list) {
+ if (das->client_addr.u.v4.s_addr &&
+ das->client_addr.u.v4.s_addr != from.sin.sin_addr.s_addr)
+ continue;
+
+ if (das->nas_identifier && nasid_buf &&
+ (nasid_len != os_strlen(das->nas_identifier) ||
+ os_memcmp(das->nas_identifier, nasid_buf, nasid_len) != 0))
+ continue;
+
+ found = 1;
+ radius_das_receive_msg(das, msg, (struct sockaddr *)&from.ss,
+ fromlen, abuf, from_port);
+ }
+
+ if (!found)
+ wpa_printf(MSG_DEBUG, "DAS: Drop message from unknown client");
+}
+
static int radius_das_open_socket(int port)
{
@@ -543,6 +582,49 @@ static int radius_das_open_socket(int port)
}
+static struct radius_das_port *
+radius_das_open_port(int port)
+{
+ struct radius_das_port *p;
+
+ dl_list_for_each(p, &das_ports, struct radius_das_port, list) {
+ if (p->port == port)
+ return p;
+ }
+
+ p = os_zalloc(sizeof(*p));
+ if (p == NULL)
+ return NULL;
+
+ dl_list_init(&p->das_data);
+ p->port = port;
+ p->sock = radius_das_open_socket(port);
+ if (p->sock < 0)
+ goto free_port;
+
+ if (eloop_register_read_sock(p->sock, radius_das_receive, p, NULL))
+ goto close_port;
+
+ dl_list_add(&das_ports, &p->list);
+
+ return p;
+
+close_port:
+ close(p->sock);
+free_port:
+ os_free(p);
+
+ return NULL;
+}
+
+static void radius_das_close_port(struct radius_das_port *p)
+{
+ dl_list_del(&p->list);
+ eloop_unregister_read_sock(p->sock);
+ close(p->sock);
+ free(p);
+}
+
struct radius_das_data *
radius_das_init(struct radius_das_conf *conf)
{
@@ -563,6 +645,8 @@ radius_das_init(struct radius_das_conf *conf)
das->ctx = conf->ctx;
das->disconnect = conf->disconnect;
das->coa = conf->coa;
+ if (conf->nas_identifier)
+ das->nas_identifier = os_strdup(conf->nas_identifier);
os_memcpy(&das->client_addr, conf->client_addr,
sizeof(das->client_addr));
@@ -575,19 +659,15 @@ radius_das_init(struct radius_das_conf *conf)
}
das->shared_secret_len = conf->shared_secret_len;
- das->sock = radius_das_open_socket(conf->port);
- if (das->sock < 0) {
+ das->port = radius_das_open_port(conf->port);
+ if (!das->port) {
wpa_printf(MSG_ERROR, "Failed to open UDP socket for RADIUS "
"DAS");
radius_das_deinit(das);
return NULL;
}
- if (eloop_register_read_sock(das->sock, radius_das_receive, das, NULL))
- {
- radius_das_deinit(das);
- return NULL;
- }
+ dl_list_add(&das->port->das_data, &das->list);
return das;
}
@@ -598,11 +678,14 @@ void radius_das_deinit(struct radius_das_data *das)
if (das == NULL)
return;
- if (das->sock >= 0) {
- eloop_unregister_read_sock(das->sock);
- close(das->sock);
+ if (das->port) {
+ dl_list_del(&das->list);
+
+ if (dl_list_empty(&das->port->das_data))
+ radius_das_close_port(das->port);
}
+ os_free(das->nas_identifier);
os_free(das->shared_secret);
os_free(das);
}
diff --git a/src/radius/radius_das.h b/src/radius/radius_das.h
index 233d662f6..80dc13fc8 100644
--- a/src/radius/radius_das.h
+++ b/src/radius/radius_das.h
@@ -44,6 +44,7 @@ struct radius_das_attrs {
struct radius_das_conf {
int port;
const u8 *shared_secret;
+ const u8 *nas_identifier;
size_t shared_secret_len;
const struct hostapd_ip_addr *client_addr;
unsigned int time_window;
diff --git a/src/radius/radius_server.c b/src/radius/radius_server.c
index fa3691548..95a1cb994 100644
--- a/src/radius/radius_server.c
+++ b/src/radius/radius_server.c
@@ -63,6 +63,12 @@ struct radius_server_counters {
u32 unknown_acct_types;
};
+struct radius_accept_attr {
+ u8 type;
+ u16 len;
+ void *data;
+};
+
/**
* struct radius_session - Internal RADIUS server data for a session
*/
@@ -90,7 +96,7 @@ struct radius_session {
unsigned int macacl:1;
unsigned int t_c_filtering:1;
- struct hostapd_radius_attr *accept_attr;
+ struct radius_accept_attr *accept_attr;
u32 t_c_timestamp; /* Last read T&C timestamp from user DB */
};
@@ -394,6 +400,7 @@ static void radius_server_session_free(struct radius_server_data *data,
radius_msg_free(sess->last_reply);
os_free(sess->username);
os_free(sess->nas_ip);
+ os_free(sess->accept_attr);
os_free(sess);
data->num_sess--;
}
@@ -554,6 +561,36 @@ radius_server_erp_find_key(struct radius_server_data *data, const char *keyname)
}
#endif /* CONFIG_ERP */
+static struct radius_accept_attr *
+radius_server_copy_attr(const struct hostapd_radius_attr *data)
+{
+ const struct hostapd_radius_attr *attr;
+ struct radius_accept_attr *attr_new;
+ size_t data_size = 0;
+ void *data_buf;
+ int n_attr = 1;
+
+ for (attr = data; attr; attr = attr->next) {
+ n_attr++;
+ data_size += wpabuf_len(attr->val);
+ }
+
+ attr_new = os_zalloc(n_attr * sizeof(*attr) + data_size);
+ if (!attr_new)
+ return NULL;
+
+ data_buf = &attr_new[n_attr];
+ for (n_attr = 0, attr = data; attr; attr = attr->next) {
+ struct radius_accept_attr *cur = &attr_new[n_attr++];
+
+ cur->type = attr->type;
+ cur->len = wpabuf_len(attr->val);
+ cur->data = memcpy(data_buf, wpabuf_head(attr->val), cur->len);
+ data_buf += cur->len;
+ }
+
+ return attr_new;
+}
static struct radius_session *
radius_server_get_new_session(struct radius_server_data *data,
@@ -607,7 +644,7 @@ radius_server_get_new_session(struct radius_server_data *data,
eap_user_free(tmp);
return NULL;
}
- sess->accept_attr = tmp->accept_attr;
+ sess->accept_attr = radius_server_copy_attr(tmp->accept_attr);
sess->macacl = tmp->macacl;
eap_user_free(tmp);
@@ -1123,11 +1160,10 @@ radius_server_encapsulate_eap(struct radius_server_data *data,
}
if (code == RADIUS_CODE_ACCESS_ACCEPT) {
- struct hostapd_radius_attr *attr;
- for (attr = sess->accept_attr; attr; attr = attr->next) {
- if (!radius_msg_add_attr(msg, attr->type,
- wpabuf_head(attr->val),
- wpabuf_len(attr->val))) {
+ struct radius_accept_attr *attr;
+ for (attr = sess->accept_attr; attr->data; attr++) {
+ if (!radius_msg_add_attr(msg, attr->type, attr->data,
+ attr->len)) {
wpa_printf(MSG_ERROR, "Could not add RADIUS attribute");
radius_msg_free(msg);
return NULL;
@@ -1221,11 +1257,10 @@ radius_server_macacl(struct radius_server_data *data,
}
if (code == RADIUS_CODE_ACCESS_ACCEPT) {
- struct hostapd_radius_attr *attr;
- for (attr = sess->accept_attr; attr; attr = attr->next) {
- if (!radius_msg_add_attr(msg, attr->type,
- wpabuf_head(attr->val),
- wpabuf_len(attr->val))) {
+ struct radius_accept_attr *attr;
+ for (attr = sess->accept_attr; attr->data; attr++) {
+ if (!radius_msg_add_attr(msg, attr->type, attr->data,
+ attr->len)) {
wpa_printf(MSG_ERROR, "Could not add RADIUS attribute");
radius_msg_free(msg);
return NULL;
@@ -2527,7 +2562,7 @@ static int radius_server_get_eap_user(void *ctx, const u8 *identity,
ret = data->get_eap_user(data->conf_ctx, identity, identity_len,
phase2, user);
if (ret == 0 && user) {
- sess->accept_attr = user->accept_attr;
+ sess->accept_attr = radius_server_copy_attr(user->accept_attr);
sess->remediation = user->remediation;
sess->macacl = user->macacl;
sess->t_c_timestamp = user->t_c_timestamp;
diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
index 52a4c7442..ce1aa60a9 100644
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -4153,6 +4153,8 @@ static u32 wpa_key_mgmt_suite(struct wpa_sm *sm)
}
+#ifdef CONFIG_CTRL_IFACE_MIB
+
#define RSN_SUITE "%02x-%02x-%02x-%d"
#define RSN_SUITE_ARG(s) \
((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff
@@ -4234,6 +4236,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, char *buf, size_t buflen)
return (int) len;
}
+#endif
#endif /* CONFIG_CTRL_IFACE */
diff --git a/src/tls/Makefile b/src/tls/Makefile
index c84fbe859..e974a41f0 100644
--- a/src/tls/Makefile
+++ b/src/tls/Makefile
@@ -1,3 +1,10 @@
+LIB_OBJS= asn1.o
+
+ifneq ($(CONFIG_TLS),gnutls)
+ifneq ($(CONFIG_TLS),mbedtls)
+ifneq ($(CONFIG_TLS),openssl)
+ifneq ($(CONFIG_TLS),wolfssl)
+
CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
CFLAGS += -DCONFIG_CRYPTO_INTERNAL
CFLAGS += -DCONFIG_TLSV11
@@ -21,5 +28,9 @@ LIB_OBJS= \
tlsv1_server_read.o \
tlsv1_server_write.o \
x509v3.o
+endif
+endif
+endif
+endif
include ../lib.rules
diff --git a/src/utils/eloop.c b/src/utils/eloop.c
index 00b0beff0..50dd1beda 100644
--- a/src/utils/eloop.c
+++ b/src/utils/eloop.c
@@ -77,6 +77,9 @@ struct eloop_sock_table {
struct eloop_data {
int max_sock;
+ eloop_timeout_poll_handler timeout_poll_cb;
+ eloop_poll_handler poll_cb;
+
size_t count; /* sum of all table counts */
#ifdef CONFIG_ELOOP_POLL
size_t max_pollfd_map; /* number of pollfds_map currently allocated */
@@ -1121,6 +1124,12 @@ void eloop_run(void)
os_reltime_sub(&timeout->time, &now, &tv);
else
tv.sec = tv.usec = 0;
+ }
+
+ if (eloop.timeout_poll_cb && eloop.timeout_poll_cb(&tv, !!timeout))
+ timeout = (void *)1;
+
+ if (timeout) {
#if defined(CONFIG_ELOOP_POLL) || defined(CONFIG_ELOOP_EPOLL)
timeout_ms = tv.sec * 1000 + tv.usec / 1000;
#endif /* defined(CONFIG_ELOOP_POLL) || defined(CONFIG_ELOOP_EPOLL) */
@@ -1190,7 +1199,8 @@ void eloop_run(void)
eloop.exceptions.changed = 0;
eloop_process_pending_signals();
-
+ if (eloop.poll_cb)
+ eloop.poll_cb();
/* check if some registered timeouts have occurred */
timeout = dl_list_first(&eloop.timeout, struct eloop_timeout,
@@ -1252,6 +1262,14 @@ out:
return;
}
+int eloop_register_cb(eloop_poll_handler poll_cb,
+ eloop_timeout_poll_handler timeout_cb)
+{
+ eloop.poll_cb = poll_cb;
+ eloop.timeout_poll_cb = timeout_cb;
+
+ return 0;
+}
void eloop_terminate(void)
{
diff --git a/src/utils/eloop.h b/src/utils/eloop.h
index 04ee6d183..5452ea589 100644
--- a/src/utils/eloop.h
+++ b/src/utils/eloop.h
@@ -65,6 +65,9 @@ typedef void (*eloop_timeout_handler)(void *eloop_ctx, void *user_ctx);
*/
typedef void (*eloop_signal_handler)(int sig, void *signal_ctx);
+typedef bool (*eloop_timeout_poll_handler)(struct os_reltime *tv, bool tv_set);
+typedef void (*eloop_poll_handler)(void);
+
/**
* eloop_init() - Initialize global event loop data
* Returns: 0 on success, -1 on failure
@@ -73,6 +76,9 @@ typedef void (*eloop_signal_handler)(int sig, void *signal_ctx);
*/
int eloop_init(void);
+int eloop_register_cb(eloop_poll_handler poll_cb,
+ eloop_timeout_poll_handler timeout_cb);
+
/**
* eloop_register_read_sock - Register handler for read events
* @sock: File descriptor number for the socket
@@ -320,6 +326,8 @@ int eloop_register_signal_reconfig(eloop_signal_handler handler,
*/
int eloop_sock_requeue(void);
+void eloop_add_uloop(void);
+
/**
* eloop_run - Start the event loop
*
diff --git a/src/utils/uloop.c b/src/utils/uloop.c
new file mode 100644
index 000000000..c0d26db93
--- /dev/null
+++ b/src/utils/uloop.c
@@ -0,0 +1,64 @@
+#include <libubox/uloop.h>
+#include "includes.h"
+#include "common.h"
+#include "eloop.h"
+
+static void eloop_uloop_event_cb(int sock, void *eloop_ctx, void *sock_ctx)
+{
+}
+
+static void eloop_uloop_fd_cb(struct uloop_fd *fd, unsigned int events)
+{
+ unsigned int changed = events ^ fd->flags;
+
+ if (changed & ULOOP_READ) {
+ if (events & ULOOP_READ)
+ eloop_register_sock(fd->fd, EVENT_TYPE_READ, eloop_uloop_event_cb, fd, fd);
+ else
+ eloop_unregister_sock(fd->fd, EVENT_TYPE_READ);
+ }
+
+ if (changed & ULOOP_WRITE) {
+ if (events & ULOOP_WRITE)
+ eloop_register_sock(fd->fd, EVENT_TYPE_WRITE, eloop_uloop_event_cb, fd, fd);
+ else
+ eloop_unregister_sock(fd->fd, EVENT_TYPE_WRITE);
+ }
+}
+
+static bool uloop_timeout_poll_handler(struct os_reltime *tv, bool tv_set)
+{
+ struct os_reltime tv_uloop;
+ int timeout_ms = uloop_get_next_timeout();
+
+ if (timeout_ms < 0)
+ return false;
+
+ tv_uloop.sec = timeout_ms / 1000;
+ tv_uloop.usec = (timeout_ms % 1000) * 1000;
+
+ if (!tv_set || os_reltime_before(&tv_uloop, tv)) {
+ *tv = tv_uloop;
+ return true;
+ }
+
+ return false;
+}
+
+static void uloop_poll_handler(void)
+{
+ uloop_run_timeout(0);
+}
+
+void eloop_add_uloop(void)
+{
+ static bool init_done = false;
+
+ if (!init_done) {
+ uloop_init();
+ uloop_fd_set_cb = eloop_uloop_fd_cb;
+ init_done = true;
+ }
+
+ eloop_register_cb(uloop_poll_handler, uloop_timeout_poll_handler);
+}
diff --git a/src/utils/wpa_debug.c b/src/utils/wpa_debug.c
index 7f3dd185f..627575e39 100644
--- a/src/utils/wpa_debug.c
+++ b/src/utils/wpa_debug.c
@@ -26,6 +26,10 @@ static FILE *wpa_debug_tracing_file = NULL;
#define WPAS_TRACE_PFX "wpas <%d>: "
#endif /* CONFIG_DEBUG_LINUX_TRACING */
+void (*wpa_printf_hook)(int level, const char *fmt, va_list ap);
+void (*wpa_hexdump_hook)(int level, const char *title, const void *buf,
+ size_t len);
+void (*wpa_netlink_hook)(int tx, const void *data, size_t len);
int wpa_debug_level = MSG_INFO;
int wpa_debug_show_keys = 0;
@@ -206,10 +210,16 @@ void wpa_debug_close_linux_tracing(void)
*
* Note: New line '\n' is added to the end of the text when printing to stdout.
*/
-void wpa_printf(int level, const char *fmt, ...)
+void _wpa_printf(int level, const char *fmt, ...)
{
va_list ap;
+ if (wpa_printf_hook) {
+ va_start(ap, fmt);
+ wpa_printf_hook(level, fmt, ap);
+ va_end(ap);
+ }
+
if (level >= wpa_debug_level) {
#ifdef CONFIG_ANDROID_LOG
va_start(ap, fmt);
@@ -255,11 +265,14 @@ void wpa_printf(int level, const char *fmt, ...)
}
-static void _wpa_hexdump(int level, const char *title, const u8 *buf,
+void _wpa_hexdump(int level, const char *title, const u8 *buf,
size_t len, int show, int only_syslog)
{
size_t i;
+ if (wpa_hexdump_hook)
+ wpa_hexdump_hook(level, title, buf, len);
+
#ifdef CONFIG_DEBUG_LINUX_TRACING
if (wpa_debug_tracing_file != NULL) {
fprintf(wpa_debug_tracing_file,
@@ -382,19 +395,7 @@ static void _wpa_hexdump(int level, const char *title, const u8 *buf,
#endif /* CONFIG_ANDROID_LOG */
}
-void wpa_hexdump(int level, const char *title, const void *buf, size_t len)
-{
- _wpa_hexdump(level, title, buf, len, 1, 0);
-}
-
-
-void wpa_hexdump_key(int level, const char *title, const void *buf, size_t len)
-{
- _wpa_hexdump(level, title, buf, len, wpa_debug_show_keys, 0);
-}
-
-
-static void _wpa_hexdump_ascii(int level, const char *title, const void *buf,
+void _wpa_hexdump_ascii(int level, const char *title, const void *buf,
size_t len, int show)
{
size_t i, llen;
@@ -507,20 +508,6 @@ file_done:
}
-void wpa_hexdump_ascii(int level, const char *title, const void *buf,
- size_t len)
-{
- _wpa_hexdump_ascii(level, title, buf, len, 1);
-}
-
-
-void wpa_hexdump_ascii_key(int level, const char *title, const void *buf,
- size_t len)
-{
- _wpa_hexdump_ascii(level, title, buf, len, wpa_debug_show_keys);
-}
-
-
#ifdef CONFIG_DEBUG_FILE
static char *last_path = NULL;
#endif /* CONFIG_DEBUG_FILE */
@@ -644,7 +631,7 @@ void wpa_msg_register_ifname_cb(wpa_msg_get_ifname_func func)
}
-void wpa_msg(void *ctx, int level, const char *fmt, ...)
+void _wpa_msg(void *ctx, int level, const char *fmt, ...)
{
va_list ap;
char *buf;
@@ -682,7 +669,7 @@ void wpa_msg(void *ctx, int level, const char *fmt, ...)
}
-void wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
+void _wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
{
va_list ap;
char *buf;
diff --git a/src/utils/wpa_debug.h b/src/utils/wpa_debug.h
index 4c02ad3c7..854520bfe 100644
--- a/src/utils/wpa_debug.h
+++ b/src/utils/wpa_debug.h
@@ -11,6 +11,10 @@
#include "wpabuf.h"
+extern void (*wpa_printf_hook)(int level, const char *fmt, va_list ap);
+extern void (*wpa_hexdump_hook)(int level, const char *title,
+ const void *buf, size_t len);
+extern void (*wpa_netlink_hook)(int tx, const void *data, size_t len);
extern int wpa_debug_level;
extern int wpa_debug_show_keys;
extern int wpa_debug_timestamp;
@@ -51,6 +55,17 @@ void wpa_debug_close_file(void);
void wpa_debug_setup_stdout(void);
void wpa_debug_stop_log(void);
+/* internal */
+void _wpa_hexdump(int level, const char *title, const u8 *buf,
+ size_t len, int show, int only_syslog);
+void _wpa_hexdump_ascii(int level, const char *title, const void *buf,
+ size_t len, int show);
+extern int wpa_debug_show_keys;
+
+#ifndef CONFIG_MSG_MIN_PRIORITY
+#define CONFIG_MSG_MIN_PRIORITY 0
+#endif
+
/**
* wpa_debug_printf_timestamp - Print timestamp for debug output
*
@@ -71,9 +86,15 @@ void wpa_debug_print_timestamp(void);
*
* Note: New line '\n' is added to the end of the text when printing to stdout.
*/
-void wpa_printf(int level, const char *fmt, ...)
+void _wpa_printf(int level, const char *fmt, ...)
PRINTF_FORMAT(2, 3);
+#define wpa_printf(level, ...) \
+ do { \
+ if (level >= CONFIG_MSG_MIN_PRIORITY) \
+ _wpa_printf(level, __VA_ARGS__); \
+ } while(0)
+
/**
* wpa_hexdump - conditional hex dump
* @level: priority level (MSG_*) of the message
@@ -85,7 +106,13 @@ PRINTF_FORMAT(2, 3);
* output may be directed to stdout, stderr, and/or syslog based on
* configuration. The contents of buf is printed out has hex dump.
*/
-void wpa_hexdump(int level, const char *title, const void *buf, size_t len);
+static inline void wpa_hexdump(int level, const char *title, const void *buf, size_t len)
+{
+ if (level < CONFIG_MSG_MIN_PRIORITY)
+ return;
+
+ _wpa_hexdump(level, title, buf, len, 1, 1);
+}
static inline void wpa_hexdump_buf(int level, const char *title,
const struct wpabuf *buf)
@@ -107,7 +134,13 @@ static inline void wpa_hexdump_buf(int level, const char *title,
* like wpa_hexdump(), but by default, does not include secret keys (passwords,
* etc.) in debug output.
*/
-void wpa_hexdump_key(int level, const char *title, const void *buf, size_t len);
+static inline void wpa_hexdump_key(int level, const char *title, const u8 *buf, size_t len)
+{
+ if (level < CONFIG_MSG_MIN_PRIORITY)
+ return;
+
+ _wpa_hexdump(level, title, buf, len, wpa_debug_show_keys, 1);
+}
static inline void wpa_hexdump_buf_key(int level, const char *title,
const struct wpabuf *buf)
@@ -129,8 +162,14 @@ static inline void wpa_hexdump_buf_key(int level, const char *title,
* the hex numbers and ASCII characters (for printable range) are shown. 16
* bytes per line will be shown.
*/
-void wpa_hexdump_ascii(int level, const char *title, const void *buf,
- size_t len);
+static inline void wpa_hexdump_ascii(int level, const char *title,
+ const u8 *buf, size_t len)
+{
+ if (level < CONFIG_MSG_MIN_PRIORITY)
+ return;
+
+ _wpa_hexdump_ascii(level, title, buf, len, 1);
+}
/**
* wpa_hexdump_ascii_key - conditional hex dump, hide keys
@@ -146,8 +185,14 @@ void wpa_hexdump_ascii(int level, const char *title, const void *buf,
* bytes per line will be shown. This works like wpa_hexdump_ascii(), but by
* default, does not include secret keys (passwords, etc.) in debug output.
*/
-void wpa_hexdump_ascii_key(int level, const char *title, const void *buf,
- size_t len);
+static inline void wpa_hexdump_ascii_key(int level, const char *title,
+ const u8 *buf, size_t len)
+{
+ if (level < CONFIG_MSG_MIN_PRIORITY)
+ return;
+
+ _wpa_hexdump_ascii(level, title, buf, len, wpa_debug_show_keys);
+}
/*
* wpa_dbg() behaves like wpa_msg(), but it can be removed from build to reduce
@@ -184,7 +229,12 @@ void wpa_hexdump_ascii_key(int level, const char *title, const void *buf,
*
* Note: New line '\n' is added to the end of the text when printing to stdout.
*/
-void wpa_msg(void *ctx, int level, const char *fmt, ...) PRINTF_FORMAT(3, 4);
+void _wpa_msg(void *ctx, int level, const char *fmt, ...) PRINTF_FORMAT(3, 4);
+#define wpa_msg(ctx, level, ...) \
+ do { \
+ if (level >= CONFIG_MSG_MIN_PRIORITY) \
+ _wpa_msg(ctx, level, __VA_ARGS__); \
+ } while(0)
/**
* wpa_msg_ctrl - Conditional printf for ctrl_iface monitors
@@ -198,8 +248,13 @@ void wpa_msg(void *ctx, int level, const char *fmt, ...) PRINTF_FORMAT(3, 4);
* attached ctrl_iface monitors. In other words, it can be used for frequent
* events that do not need to be sent to syslog.
*/
-void wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
+void _wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
PRINTF_FORMAT(3, 4);
+#define wpa_msg_ctrl(ctx, level, ...) \
+ do { \
+ if (level >= CONFIG_MSG_MIN_PRIORITY) \
+ _wpa_msg_ctrl(ctx, level, __VA_ARGS__); \
+ } while(0)
/**
* wpa_msg_global - Global printf for ctrl_iface monitors
diff --git a/tests/Makefile b/tests/Makefile
index 8ec154bb3..25fdf9e00 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,10 +1,12 @@
-ALL=test-base64 test-md4 test-milenage \
- test-rsa-sig-ver \
- test-sha1 \
- test-https test-https_server \
- test-sha256 test-aes test-x509v3 test-list test-rc4 \
+RUN_TESTS= \
+ test-list \
+ test-md4 test-rc4 test-sha1 test-sha256 \
+ test-milenage test-aes \
+ test-crypto_module \
test-bss
+ALL=$(RUN_TESTS) test-base64 test-https test-https_server
+
include ../src/build.rules
ifdef LIBFUZZER
@@ -25,13 +27,27 @@ CFLAGS += -DCONFIG_IEEE80211R_AP
CFLAGS += -DCONFIG_IEEE80211R
CFLAGS += -DCONFIG_TDLS
+# test-crypto_module
+CFLAGS += -DCONFIG_MODULE_TESTS
+CFLAGS += -DCONFIG_DPP
+#CFLAGS += -DCONFIG_DPP2
+#CFLAGS += -DCONFIG_DPP3
+CFLAGS += -DCONFIG_ECC
+CFLAGS += -DCONFIG_HMAC_SHA256_KDF
+CFLAGS += -DCONFIG_HMAC_SHA384_KDF
+CFLAGS += -DCONFIG_MESH
+CFLAGS += -DCONFIG_SHA256
+CFLAGS += -DCONFIG_SHA384
+CFLAGS += -DEAP_PSK
+CFLAGS += -DEAP_FAST
+
CFLAGS += -I../src
CFLAGS += -I../src/utils
SLIBS = ../src/utils/libutils.a
-DLIBS = ../src/crypto/libcrypto.a \
- ../src/tls/libtls.a
+DLIBS = ../src/tls/libtls.a \
+ ../src/crypto/libcrypto.a
_OBJS_VAR := LLIBS
include ../src/objs.mk
@@ -43,12 +59,43 @@ include ../src/objs.mk
LIBS = $(SLIBS) $(DLIBS)
LLIBS = -Wl,--start-group $(DLIBS) -Wl,--end-group $(SLIBS)
+ifeq ($(CONFIG_TLS),mbedtls)
+CFLAGS += -DCONFIG_TLS_MBEDTLS
+LLIBS += -lmbedtls -lmbedx509 -lmbedcrypto
+else
+ifeq ($(CONFIG_TLS),openssl)
+CFLAGS += -DCONFIG_TLS_OPENSSL
+LLIBS += -lssl -lcrypto
+else
+ifeq ($(CONFIG_TLS),gnutls)
+CFLAGS += -DCONFIG_TLS_GNUTLS
+LLIBS += -lgnutls -lgpg-error -lgcrypt
+else
+ifeq ($(CONFIG_TLS),wolfssl)
+CFLAGS += -DCONFIG_TLS_WOLFSSL
+LLIBS += -lwolfssl -lm
+else
+CFLAGS += -DCONFIG_TLS_INTERNAL
+CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
+ALL += test-rsa-sig-ver
+ALL += test-x509v3
+clean-config_tls_internal:
+ rm -f test_x509v3_nist.out.*
+ rm -f test_x509v3_nist2.out.*
+endif
+endif
+endif
+endif
+
# glibc < 2.17 needs -lrt for clock_gettime()
LLIBS += -lrt
test-aes: $(call BUILDOBJ,test-aes.o) $(LIBS)
$(LDO) $(LDFLAGS) -o $@ $^ $(LLIBS)
+test-crypto_module: $(call BUILDOBJ,test-crypto_module.o) $(LIBS)
+ $(LDO) $(LDFLAGS) -o $@ $< $(LLIBS)
+
test-base64: $(call BUILDOBJ,test-base64.o) $(LIBS)
$(LDO) $(LDFLAGS) -o $@ $^ $(LLIBS)
@@ -141,18 +188,11 @@ test-bss: $(call BUILDOBJ,test-bss.o) $(WPA_OBJS) $(LIBS)
$(LDO) $(LDFLAGS) -o $@ $< $(LLIBS) $(WPA_CFLAGS) $(WPA_OBJS) $(LIBS)
run-tests: $(ALL)
- ./test-aes
- ./test-list
- ./test-md4
- ./test-milenage
- ./test-rsa-sig-ver
- ./test-sha1
- ./test-sha256
- ./test-bss
+ @set -ex; for i in $(RUN_TESTS); do ./$$i; done
@echo
@echo All tests completed successfully.
-clean: common-clean
+clean: common-clean clean-config_tls_internal
rm -f *~
- rm -f test_x509v3_nist.out.*
- rm -f test_x509v3_nist2.out.*
+
+.PHONY: run-tests clean-config_tls_internal
diff --git a/tests/hwsim/example-hostapd.config b/tests/hwsim/example-hostapd.config
index 210b7fb86..5f326da07 100644
--- a/tests/hwsim/example-hostapd.config
+++ b/tests/hwsim/example-hostapd.config
@@ -4,6 +4,7 @@ CONFIG_DRIVER_NONE=y
CONFIG_DRIVER_NL80211=y
CONFIG_RSN_PREAUTH=y
+#CONFIG_TLS=mbedtls
#CONFIG_TLS=internal
#CONFIG_INTERNAL_LIBTOMMATH=y
#CONFIG_INTERNAL_LIBTOMMATH_FAST=y
@@ -33,12 +34,7 @@ CONFIG_EAP_TNC=y
CFLAGS += -DTNC_CONFIG_FILE=\"tnc/tnc_config\"
LIBS += -rdynamic
CONFIG_EAP_UNAUTH_TLS=y
-ifeq ($(CONFIG_TLS), openssl)
-CONFIG_EAP_PWD=y
-endif
-ifeq ($(CONFIG_TLS), wolfssl)
-CONFIG_EAP_PWD=y
-endif
+CONFIG_EAP_PWD=$(if $(filter openssl wolfssl mbedtls,$(CONFIG_TLS)),y,)
CONFIG_EAP_EKE=y
CONFIG_PKCS12=y
CONFIG_RADIUS_SERVER=y
diff --git a/tests/hwsim/example-wpa_supplicant.config b/tests/hwsim/example-wpa_supplicant.config
index 123f397e3..c69b1f9cd 100644
--- a/tests/hwsim/example-wpa_supplicant.config
+++ b/tests/hwsim/example-wpa_supplicant.config
@@ -2,6 +2,7 @@
CONFIG_TLS=openssl
#CONFIG_TLS=wolfssl
+#CONFIG_TLS=mbedtls
#CONFIG_TLS=internal
#CONFIG_INTERNAL_LIBTOMMATH=y
#CONFIG_INTERNAL_LIBTOMMATH_FAST=y
@@ -34,13 +35,7 @@ LIBS += -rdynamic
CONFIG_EAP_FAST=y
CONFIG_EAP_TEAP=y
CONFIG_EAP_IKEV2=y
-
-ifeq ($(CONFIG_TLS), openssl)
-CONFIG_EAP_PWD=y
-endif
-ifeq ($(CONFIG_TLS), wolfssl)
-CONFIG_EAP_PWD=y
-endif
+CONFIG_EAP_PWD=$(if $(filter openssl wolfssl mbedtls,$(CONFIG_TLS)),y,)
CONFIG_USIM_SIMULATOR=y
CONFIG_SIM_SIMULATOR=y
diff --git a/tests/hwsim/test_ap_eap.py b/tests/hwsim/test_ap_eap.py
index f8e75b5fb..48e4dedcc 100644
--- a/tests/hwsim/test_ap_eap.py
+++ b/tests/hwsim/test_ap_eap.py
@@ -42,20 +42,42 @@ def check_eap_capa(dev, method):
res = dev.get_capability("eap")
if method not in res:
raise HwsimSkip("EAP method %s not supported in the build" % method)
+ if method == "FAST" or method == "TEAP":
+ tls = dev.request("GET tls_library")
+ if tls.startswith("mbed TLS"):
+ raise HwsimSkip("EAP-%s not supported with this TLS library: " % method + tls)
def check_subject_match_support(dev):
tls = dev.request("GET tls_library")
- if not tls.startswith("OpenSSL") and not tls.startswith("wolfSSL"):
+ if tls.startswith("OpenSSL"):
+ return
+ elif tls.startswith("wolfSSL"):
+ return
+ elif tls.startswith("mbed TLS"):
+ return
+ else:
raise HwsimSkip("subject_match not supported with this TLS library: " + tls)
def check_check_cert_subject_support(dev):
tls = dev.request("GET tls_library")
- if not tls.startswith("OpenSSL") and not tls.startswith("wolfSSL"):
+ if tls.startswith("OpenSSL"):
+ return
+ elif tls.startswith("wolfSSL"):
+ return
+ elif tls.startswith("mbed TLS"):
+ return
+ else:
raise HwsimSkip("check_cert_subject not supported with this TLS library: " + tls)
def check_altsubject_match_support(dev):
tls = dev.request("GET tls_library")
- if not tls.startswith("OpenSSL") and not tls.startswith("wolfSSL"):
+ if tls.startswith("OpenSSL"):
+ return
+ elif tls.startswith("wolfSSL"):
+ return
+ elif tls.startswith("mbed TLS"):
+ return
+ else:
raise HwsimSkip("altsubject_match not supported with this TLS library: " + tls)
def check_domain_match(dev):
@@ -70,7 +92,13 @@ def check_domain_suffix_match(dev):
def check_domain_match_full(dev):
tls = dev.request("GET tls_library")
- if not tls.startswith("OpenSSL") and not tls.startswith("wolfSSL"):
+ if tls.startswith("OpenSSL"):
+ return
+ elif tls.startswith("wolfSSL"):
+ return
+ elif tls.startswith("mbed TLS"):
+ return
+ else:
raise HwsimSkip("domain_suffix_match requires full match with this TLS library: " + tls)
def check_cert_probe_support(dev):
@@ -79,8 +107,15 @@ def check_cert_probe_support(dev):
raise HwsimSkip("Certificate probing not supported with this TLS library: " + tls)
def check_ext_cert_check_support(dev):
+ if not openssl_imported:
+ raise HwsimSkip("OpenSSL python method not available")
+
tls = dev.request("GET tls_library")
- if not tls.startswith("OpenSSL"):
+ if tls.startswith("OpenSSL"):
+ return
+ elif tls.startswith("mbed TLS"):
+ return
+ else:
raise HwsimSkip("ext_cert_check not supported with this TLS library: " + tls)
def check_ocsp_support(dev):
@@ -91,14 +126,18 @@ def check_ocsp_support(dev):
# raise HwsimSkip("OCSP not supported with this TLS library: " + tls)
#if tls.startswith("wolfSSL"):
# raise HwsimSkip("OCSP not supported with this TLS library: " + tls)
+ if tls.startswith("mbed TLS"):
+ raise HwsimSkip("OCSP not supported with this TLS library: " + tls)
def check_pkcs5_v15_support(dev):
tls = dev.request("GET tls_library")
- if "BoringSSL" in tls or "GnuTLS" in tls:
+ if "BoringSSL" in tls or "GnuTLS" in tls or "mbed TLS" in tls:
raise HwsimSkip("PKCS#5 v1.5 not supported with this TLS library: " + tls)
def check_tls13_support(dev):
tls = dev.request("GET tls_library")
+ if tls.startswith("mbed TLS"):
+ raise HwsimSkip("TLS v1.3 not supported")
ok = ['run=OpenSSL 1.1.1', 'run=OpenSSL 3.0', 'run=OpenSSL 3.1',
'run=OpenSSL 3.2', 'run=OpenSSL 3.3', 'wolfSSL']
for s in ok:
@@ -122,11 +161,15 @@ def check_pkcs12_support(dev):
# raise HwsimSkip("PKCS#12 not supported with this TLS library: " + tls)
if tls.startswith("wolfSSL"):
raise HwsimSkip("PKCS#12 not supported with this TLS library: " + tls)
+ if tls.startswith("mbed TLS"):
+ raise HwsimSkip("PKCS#12 not supported with this TLS library: " + tls)
def check_dh_dsa_support(dev):
tls = dev.request("GET tls_library")
if tls.startswith("internal"):
raise HwsimSkip("DH DSA not supported with this TLS library: " + tls)
+ if tls.startswith("mbed TLS"):
+ raise HwsimSkip("DH DSA not supported with this TLS library: " + tls)
def check_ec_support(dev):
tls = dev.request("GET tls_library")
@@ -1741,7 +1784,7 @@ def test_ap_wpa2_eap_ttls_pap_subject_match(dev, apdev):
eap_connect(dev[0], hapd, "TTLS", "pap user",
anonymous_identity="ttls", password="password",
ca_cert="auth_serv/ca.pem", phase2="auth=PAP",
- subject_match="/C=FI/O=w1.fi/CN=server.w1.fi",
+ check_cert_subject="/C=FI/O=w1.fi/CN=server.w1.fi",
altsubject_match="EMAIL:noone@example.com;DNS:server.w1.fi;URI:http://example.com/")
eap_reauth(dev[0], "TTLS")
@@ -2976,6 +3019,7 @@ def test_ap_wpa2_eap_tls_neg_domain_match(dev, apdev):
def test_ap_wpa2_eap_tls_neg_subject_match(dev, apdev):
"""WPA2-Enterprise negative test - subject mismatch"""
+ check_subject_match_support(dev[0])
params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
hostapd.add_ap(apdev[0], params)
dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="TTLS",
@@ -3036,6 +3080,7 @@ def test_ap_wpa2_eap_tls_neg_subject_match(dev, apdev):
def test_ap_wpa2_eap_tls_neg_altsubject_match(dev, apdev):
"""WPA2-Enterprise negative test - altsubject mismatch"""
+ check_altsubject_match_support(dev[0])
params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
hostapd.add_ap(apdev[0], params)
@@ -3582,7 +3627,7 @@ def test_ap_wpa2_eap_ikev2_oom(dev, apdev):
dev[0].request("REMOVE_NETWORK all")
tls = dev[0].request("GET tls_library")
- if not tls.startswith("wolfSSL"):
+ if not tls.startswith("wolfSSL") and not tls.startswith("mbed TLS"):
tests = [(1, "os_get_random;dh_init")]
else:
tests = [(1, "crypto_dh_init;dh_init")]
@@ -4896,7 +4941,7 @@ def test_ap_wpa2_eap_tls_intermediate_ca(dev, apdev, params):
params["private_key"] = "auth_serv/iCA-server/server.key"
hostapd.add_ap(apdev[0], params)
tls = dev[0].request("GET tls_library")
- if "GnuTLS" in tls or "wolfSSL" in tls:
+ if "GnuTLS" in tls or "wolfSSL" in tls or "mbed TLS" in tls:
ca_cert = "auth_serv/iCA-user/ca-and-root.pem"
client_cert = "auth_serv/iCA-user/user_and_ica.pem"
else:
@@ -4962,6 +5007,7 @@ def test_ap_wpa2_eap_tls_intermediate_ca_ocsp_sha1(dev, apdev, params):
run_ap_wpa2_eap_tls_intermediate_ca_ocsp(dev, apdev, params, "-sha1")
def run_ap_wpa2_eap_tls_intermediate_ca_ocsp(dev, apdev, params, md):
+ check_ocsp_support(dev[0])
params = int_eap_server_params()
params["ca_cert"] = "auth_serv/iCA-server/ca-and-root.pem"
params["server_cert"] = "auth_serv/iCA-server/server.pem"
@@ -4971,7 +5017,7 @@ def run_ap_wpa2_eap_tls_intermediate_ca_ocsp(dev, apdev, params, md):
try:
hostapd.add_ap(apdev[0], params)
tls = dev[0].request("GET tls_library")
- if "GnuTLS" in tls or "wolfSSL" in tls:
+ if "GnuTLS" in tls or "wolfSSL" in tls or "mbed TLS" in tls:
ca_cert = "auth_serv/iCA-user/ca-and-root.pem"
client_cert = "auth_serv/iCA-user/user_and_ica.pem"
else:
@@ -5007,7 +5053,7 @@ def run_ap_wpa2_eap_tls_intermediate_ca_ocsp_revoked(dev, apdev, params, md):
try:
hostapd.add_ap(apdev[0], params)
tls = dev[0].request("GET tls_library")
- if "GnuTLS" in tls or "wolfSSL" in tls:
+ if "GnuTLS" in tls or "wolfSSL" in tls or "mbed TLS" in tls:
ca_cert = "auth_serv/iCA-user/ca-and-root.pem"
client_cert = "auth_serv/iCA-user/user_and_ica.pem"
else:
@@ -5057,7 +5103,7 @@ def test_ap_wpa2_eap_tls_intermediate_ca_ocsp_multi_missing_resp(dev, apdev, par
try:
hostapd.add_ap(apdev[0], params)
tls = dev[0].request("GET tls_library")
- if "GnuTLS" in tls or "wolfSSL" in tls:
+ if "GnuTLS" in tls or "wolfSSL" in tls or "mbed TLS" in tls:
ca_cert = "auth_serv/iCA-user/ca-and-root.pem"
client_cert = "auth_serv/iCA-user/user_and_ica.pem"
else:
@@ -5124,7 +5170,7 @@ def test_ap_wpa2_eap_tls_intermediate_ca_ocsp_multi(dev, apdev, params):
hostapd.add_ap(apdev[0], params)
tls = dev[0].request("GET tls_library")
- if "GnuTLS" in tls or "wolfSSL" in tls:
+ if "GnuTLS" in tls or "wolfSSL" in tls or "mbed TLS" in tls:
ca_cert = "auth_serv/iCA-user/ca-and-root.pem"
client_cert = "auth_serv/iCA-user/user_and_ica.pem"
else:
@@ -5382,6 +5428,7 @@ def test_ap_wpa2_eap_ttls_server_cert_eku_client_server(dev, apdev):
def test_ap_wpa2_eap_ttls_server_pkcs12(dev, apdev):
"""WPA2-Enterprise using EAP-TTLS and server PKCS#12 file"""
+ check_pkcs12_support(dev[0])
skip_with_fips(dev[0])
params = int_eap_server_params()
del params["server_cert"]
@@ -5394,6 +5441,7 @@ def test_ap_wpa2_eap_ttls_server_pkcs12(dev, apdev):
def test_ap_wpa2_eap_ttls_server_pkcs12_extra(dev, apdev):
"""EAP-TTLS and server PKCS#12 file with extra certs"""
+ check_pkcs12_support(dev[0])
skip_with_fips(dev[0])
params = int_eap_server_params()
del params["server_cert"]
@@ -5416,6 +5464,7 @@ def test_ap_wpa2_eap_ttls_dh_params_server(dev, apdev):
def test_ap_wpa2_eap_ttls_dh_params_dsa_server(dev, apdev):
"""WPA2-Enterprise using EAP-TTLS and alternative server dhparams (DSA)"""
+ check_dh_dsa_support(dev[0])
params = int_eap_server_params()
params["dh_file"] = "auth_serv/dsaparam.pem"
hapd = hostapd.add_ap(apdev[0], params)
@@ -5727,8 +5776,8 @@ def test_ap_wpa2_eap_non_ascii_identity2(dev, apdev):
def test_openssl_cipher_suite_config_wpas(dev, apdev):
"""OpenSSL cipher suite configuration on wpa_supplicant"""
tls = dev[0].request("GET tls_library")
- if not tls.startswith("OpenSSL"):
- raise HwsimSkip("TLS library is not OpenSSL: " + tls)
+ if not tls.startswith("OpenSSL") and not tls.startswith("mbed TLS"):
+ raise HwsimSkip("TLS library is not OpenSSL or mbed TLS: " + tls)
params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
hapd = hostapd.add_ap(apdev[0], params)
eap_connect(dev[0], hapd, "TTLS", "pap user",
@@ -5754,14 +5803,14 @@ def test_openssl_cipher_suite_config_wpas(dev, apdev):
def test_openssl_cipher_suite_config_hapd(dev, apdev):
"""OpenSSL cipher suite configuration on hostapd"""
tls = dev[0].request("GET tls_library")
- if not tls.startswith("OpenSSL"):
- raise HwsimSkip("wpa_supplicant TLS library is not OpenSSL: " + tls)
+ if not tls.startswith("OpenSSL") and not tls.startswith("mbed TLS"):
+ raise HwsimSkip("wpa_supplicant TLS library is not OpenSSL or mbed TLS: " + tls)
params = int_eap_server_params()
params['openssl_ciphers'] = "AES256"
hapd = hostapd.add_ap(apdev[0], params)
tls = hapd.request("GET tls_library")
- if not tls.startswith("OpenSSL"):
- raise HwsimSkip("hostapd TLS library is not OpenSSL: " + tls)
+ if not tls.startswith("OpenSSL") and not tls.startswith("mbed TLS"):
+ raise HwsimSkip("hostapd TLS library is not OpenSSL or mbed TLS: " + tls)
eap_connect(dev[0], hapd, "TTLS", "pap user",
anonymous_identity="ttls", password="password",
ca_cert="auth_serv/ca.pem", phase2="auth=PAP")
@@ -6207,13 +6256,17 @@ def test_ap_wpa2_eap_tls_versions(dev, apdev):
check_tls_ver(dev[0], hapd,
"tls_disable_tlsv1_0=1 tls_disable_tlsv1_1=1",
"TLSv1.2")
- elif tls.startswith("internal"):
+ elif tls.startswith("internal") or tls.startswith("mbed TLS"):
check_tls_ver(dev[0], hapd,
"tls_disable_tlsv1_0=1 tls_disable_tlsv1_1=1", "TLSv1.2")
- check_tls_ver(dev[1], hapd,
- "tls_disable_tlsv1_0=1 tls_disable_tlsv1_1=0 tls_disable_tlsv1_2=1", "TLSv1.1")
- check_tls_ver(dev[2], hapd,
- "tls_disable_tlsv1_0=0 tls_disable_tlsv1_1=1 tls_disable_tlsv1_2=1", "TLSv1")
+ if tls.startswith("mbed TLS"):
+ check_tls_ver(dev[2], hapd,
+ "tls_disable_tlsv1_0=0 tls_disable_tlsv1_1=1 tls_disable_tlsv1_2=1", "TLSv1.0")
+ else:
+ check_tls_ver(dev[1], hapd,
+ "tls_disable_tlsv1_0=1 tls_disable_tlsv1_1=0 tls_disable_tlsv1_2=1", "TLSv1.1")
+ check_tls_ver(dev[2], hapd,
+ "tls_disable_tlsv1_0=0 tls_disable_tlsv1_1=1 tls_disable_tlsv1_2=1", "TLSv1")
if "run=OpenSSL 1.1.1" in tls or "run=OpenSSL 3." in tls:
check_tls_ver(dev[0], hapd,
"tls_disable_tlsv1_0=1 tls_disable_tlsv1_1=1 tls_disable_tlsv1_2=1 tls_disable_tlsv1_3=0", "TLSv1.3")
@@ -6235,6 +6288,11 @@ def test_ap_wpa2_eap_tls_versions_server(dev, apdev):
tests = [("TLSv1", "[ENABLE-TLSv1.0][DISABLE-TLSv1.1][DISABLE-TLSv1.2][DISABLE-TLSv1.3]"),
("TLSv1.1", "[ENABLE-TLSv1.0][ENABLE-TLSv1.1][DISABLE-TLSv1.2][DISABLE-TLSv1.3]"),
("TLSv1.2", "[ENABLE-TLSv1.0][ENABLE-TLSv1.1][ENABLE-TLSv1.2][DISABLE-TLSv1.3]")]
+ tls = dev[0].request("GET tls_library")
+ if tls.startswith("mbed TLS"):
+ tests = [#("TLSv1.0", "[ENABLE-TLSv1.0][DISABLE-TLSv1.1][DISABLE-TLSv1.2][DISABLE-TLSv1.3]"),
+ #("TLSv1.1", "[ENABLE-TLSv1.0][ENABLE-TLSv1.1][DISABLE-TLSv1.2][DISABLE-TLSv1.3]"),
+ ("TLSv1.2", "[ENABLE-TLSv1.0][ENABLE-TLSv1.1][ENABLE-TLSv1.2][DISABLE-TLSv1.3]")]
for exp, flags in tests:
hapd.disable()
hapd.set("tls_flags", flags)
@@ -7305,6 +7363,7 @@ def test_ap_wpa2_eap_assoc_rsn(dev, apdev):
def test_eap_tls_ext_cert_check(dev, apdev):
"""EAP-TLS and external server certification validation"""
# With internal server certificate chain validation
+ check_ext_cert_check_support(dev[0])
id = dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="TLS",
identity="tls user",
ca_cert="auth_serv/ca.pem",
@@ -7317,6 +7376,7 @@ def test_eap_tls_ext_cert_check(dev, apdev):
def test_eap_ttls_ext_cert_check(dev, apdev):
"""EAP-TTLS and external server certification validation"""
# Without internal server certificate chain validation
+ check_ext_cert_check_support(dev[0])
id = dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="TTLS",
identity="pap user", anonymous_identity="ttls",
password="password", phase2="auth=PAP",
@@ -7327,6 +7387,7 @@ def test_eap_ttls_ext_cert_check(dev, apdev):
def test_eap_peap_ext_cert_check(dev, apdev):
"""EAP-PEAP and external server certification validation"""
# With internal server certificate chain validation
+ check_ext_cert_check_support(dev[0])
id = dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="PEAP",
identity="user", anonymous_identity="peap",
ca_cert="auth_serv/ca.pem",
@@ -7337,6 +7398,7 @@ def test_eap_peap_ext_cert_check(dev, apdev):
def test_eap_fast_ext_cert_check(dev, apdev):
"""EAP-FAST and external server certification validation"""
+ check_ext_cert_check_support(dev[0])
check_eap_capa(dev[0], "FAST")
# With internal server certificate chain validation
dev[0].request("SET blob fast_pac_auth_ext ")
@@ -7351,10 +7413,6 @@ def test_eap_fast_ext_cert_check(dev, apdev):
run_ext_cert_check(dev, apdev, id)
def run_ext_cert_check(dev, apdev, net_id):
- check_ext_cert_check_support(dev[0])
- if not openssl_imported:
- raise HwsimSkip("OpenSSL python method not available")
-
params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
hapd = hostapd.add_ap(apdev[0], params)
diff --git a/tests/hwsim/test_ap_ft.py b/tests/hwsim/test_ap_ft.py
index 13461f014..8ffb5042c 100644
--- a/tests/hwsim/test_ap_ft.py
+++ b/tests/hwsim/test_ap_ft.py
@@ -2494,11 +2494,11 @@ def test_ap_ft_ap_oom5(dev, apdev):
# This will fail to roam
dev[0].roam(bssid1, check_bssid=False)
- with fail_test(hapd1, 1, "sha256_prf_bits;wpa_pmk_r1_to_ptk;wpa_ft_process_auth_req"):
+ with fail_test(hapd1, 1, "sha256_prf;wpa_pmk_r1_to_ptk;wpa_ft_process_auth_req"):
# This will fail to roam
dev[0].roam(bssid1, check_bssid=False)
- with fail_test(hapd1, 3, "wpa_pmk_r1_to_ptk;wpa_ft_process_auth_req"):
+ with fail_test(hapd1, 2, "wpa_pmk_r1_to_ptk;wpa_ft_process_auth_req"):
# This will fail to roam
dev[0].roam(bssid1, check_bssid=False)
diff --git a/tests/hwsim/test_authsrv.py b/tests/hwsim/test_authsrv.py
index e0665bcb2..02ec301e5 100644
--- a/tests/hwsim/test_authsrv.py
+++ b/tests/hwsim/test_authsrv.py
@@ -156,9 +156,12 @@ def test_authsrv_oom(dev, apdev):
if "FAIL" not in authsrv.request("ENABLE"):
raise Exception("ENABLE succeeded during OOM")
- with alloc_fail(authsrv, 1, "tls_init;authsrv_init"):
- if "FAIL" not in authsrv.request("ENABLE"):
- raise Exception("ENABLE succeeded during OOM")
+ # tls_mbedtls.c:tls_init() does not alloc memory (no alloc fail trigger)
+ tls = dev[0].request("GET tls_library")
+ if not tls.startswith("mbed TLS"):
+ with alloc_fail(authsrv, 1, "tls_init;authsrv_init"):
+ if "FAIL" not in authsrv.request("ENABLE"):
+ raise Exception("ENABLE succeeded during OOM")
for count in range(1, 3):
with alloc_fail(authsrv, count, "eap_sim_db_init;authsrv_init"):
diff --git a/tests/hwsim/test_dpp.py b/tests/hwsim/test_dpp.py
index 518983bd0..077de58c9 100644
--- a/tests/hwsim/test_dpp.py
+++ b/tests/hwsim/test_dpp.py
@@ -39,7 +39,8 @@ def check_dpp_capab(dev, brainpool=False, min_ver=1):
raise HwsimSkip("DPP not supported")
if brainpool:
tls = dev.request("GET tls_library")
- if (not tls.startswith("OpenSSL") or "run=BoringSSL" in tls) and not tls.startswith("wolfSSL"):
+ if (not tls.startswith("OpenSSL") or "run=BoringSSL" in tls) and not tls.startswith("wolfSSL") \
+ and not tls.startswith("mbed TLS"):
raise HwsimSkip("Crypto library does not support Brainpool curves: " + tls)
capa = dev.request("GET_CAPABILITY dpp")
ver = 1
@@ -3902,6 +3903,9 @@ def test_dpp_proto_auth_req_no_i_proto_key(dev, apdev):
def test_dpp_proto_auth_req_invalid_i_proto_key(dev, apdev):
"""DPP protocol testing - invalid I-proto key in Auth Req"""
+ tls = dev[0].request("GET tls_library")
+ if tls.startswith("mbed TLS"):
+ raise HwsimSkip("mbed TLS crypto_ecdh_set_peerkey() properly detects invalid key; no response")
run_dpp_proto_auth_req_missing(dev, 66, "Invalid Initiator Protocol Key")
def test_dpp_proto_auth_req_no_i_nonce(dev, apdev):
@@ -3997,7 +4001,12 @@ def test_dpp_proto_auth_resp_no_r_proto_key(dev, apdev):
def test_dpp_proto_auth_resp_invalid_r_proto_key(dev, apdev):
"""DPP protocol testing - invalid R-Proto Key in Auth Resp"""
- run_dpp_proto_auth_resp_missing(dev, 67, "Invalid Responder Protocol Key")
+ tls = dev[0].request("GET tls_library")
+ if tls.startswith("mbed TLS"):
+ # mbed TLS crypto_ecdh_set_peerkey() properly detects invalid key
+ run_dpp_proto_auth_resp_missing(dev, 67, "Failed to derive ECDH shared secret")
+ else:
+ run_dpp_proto_auth_resp_missing(dev, 67, "Invalid Responder Protocol Key")
def test_dpp_proto_auth_resp_no_r_nonce(dev, apdev):
"""DPP protocol testing - no R-nonce in Auth Resp"""
@@ -4359,11 +4368,17 @@ def test_dpp_proto_pkex_exchange_resp_invalid_status(dev, apdev):
def test_dpp_proto_pkex_cr_req_invalid_bootstrap_key(dev, apdev):
"""DPP protocol testing - invalid Bootstrap Key in PKEX Commit-Reveal Request"""
+ tls = dev[0].request("GET tls_library")
+ if tls.startswith("mbed TLS"):
+ raise HwsimSkip("mbed TLS crypto_ecdh_set_peerkey() properly detects invalid key; no response")
run_dpp_proto_pkex_req_missing(dev, 47,
"Peer bootstrapping key is invalid")
def test_dpp_proto_pkex_cr_resp_invalid_bootstrap_key(dev, apdev):
"""DPP protocol testing - invalid Bootstrap Key in PKEX Commit-Reveal Response"""
+ tls = dev[0].request("GET tls_library")
+ if tls.startswith("mbed TLS"):
+ raise HwsimSkip("mbed TLS crypto_ecdh_set_peerkey() properly detects invalid key; no response")
run_dpp_proto_pkex_resp_missing(dev, 48,
"Peer bootstrapping key is invalid")
diff --git a/tests/hwsim/test_erp.py b/tests/hwsim/test_erp.py
index d083993e8..262e9f095 100644
--- a/tests/hwsim/test_erp.py
+++ b/tests/hwsim/test_erp.py
@@ -12,7 +12,7 @@ import time
import hostapd
from utils import *
-from test_ap_eap import int_eap_server_params, check_tls13_support
+from test_ap_eap import int_eap_server_params, check_tls13_support, check_eap_capa
from test_ap_psk import find_wpas_process, read_process_memory, verify_not_present, get_key_locations
def test_erp_initiate_reauth_start(dev, apdev):
@@ -276,6 +276,7 @@ def test_erp_radius_eap_methods(dev, apdev):
params['erp_domain'] = 'example.com'
params['disable_pmksa_caching'] = '1'
hapd = hostapd.add_ap(apdev[0], params)
+ tls = dev[0].request("GET tls_library")
erp_test(dev[0], hapd, eap="AKA", identity="0232010000000000@example.com",
password="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123")
@@ -289,7 +290,7 @@ def test_erp_radius_eap_methods(dev, apdev):
password="5122250214c33e723a5dd523fc145fc0:981d464c7c52eb6e5036234984ad0bcf:000000000123")
erp_test(dev[0], hapd, eap="EKE", identity="erp-eke@example.com",
password="hello")
- if "FAST" in eap_methods:
+ if "FAST" in eap_methods and check_eap_capa(dev[0], "FAST"):
erp_test(dev[0], hapd, eap="FAST", identity="erp-fast@example.com",
password="password", ca_cert="auth_serv/ca.pem",
phase2="auth=GTC",
@@ -301,13 +302,14 @@ def test_erp_radius_eap_methods(dev, apdev):
password="password")
erp_test(dev[0], hapd, eap="PAX", identity="erp-pax@example.com",
password_hex="0123456789abcdef0123456789abcdef")
- if "MSCHAPV2" in eap_methods:
+ if "MSCHAPV2" in eap_methods and check_eap_capa(dev[0], "MSCHAPV2"):
erp_test(dev[0], hapd, eap="PEAP", identity="erp-peap@example.com",
password="password", ca_cert="auth_serv/ca.pem",
phase2="auth=MSCHAPV2")
- erp_test(dev[0], hapd, eap="TEAP", identity="erp-teap@example.com",
- password="password", ca_cert="auth_serv/ca.pem",
- phase2="auth=MSCHAPV2", pac_file="blob://teap_pac")
+ if check_eap_capa(dev[0], "TEAP"):
+ erp_test(dev[0], hapd, eap="TEAP", identity="erp-teap@example.com",
+ password="password", ca_cert="auth_serv/ca.pem",
+ phase2="auth=MSCHAPV2", pac_file="blob://teap_pac")
erp_test(dev[0], hapd, eap="PSK", identity="erp-psk@example.com",
password_hex="0123456789abcdef0123456789abcdef")
if "PWD" in eap_methods:
@@ -640,7 +642,7 @@ def test_erp_local_errors(dev, apdev):
dev[0].request("REMOVE_NETWORK all")
dev[0].wait_disconnected()
- for count in range(1, 6):
+ for count in range(1, 4):
dev[0].request("ERP_FLUSH")
with fail_test(dev[0], count, "hmac_sha256_kdf;eap_peer_erp_init"):
dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="TTLS",
diff --git a/tests/hwsim/test_fils.py b/tests/hwsim/test_fils.py
index 6f857243a..de65c57a7 100644
--- a/tests/hwsim/test_fils.py
+++ b/tests/hwsim/test_fils.py
@@ -1477,6 +1477,10 @@ def check_ec_group(dev, group):
tls = dev.request("GET tls_library")
if tls.startswith("wolfSSL"):
return
+ elif tls.startswith("mbed TLS"):
+ if int(group) == 27:
+ raise HwsimSkip("Brainpool EC group 27 not supported by mbed TLS")
+ return
if int(group) in [25]:
if not (tls.startswith("OpenSSL") and ("build=OpenSSL 1.0.2" in tls or "build=OpenSSL 1.1" in tls or "build=OpenSSL 3." in tls) and ("run=OpenSSL 1.0.2" in tls or "run=OpenSSL 1.1" in tls or "run=OpenSSL 3." in tls)):
raise HwsimSkip("EC group not supported")
diff --git a/tests/hwsim/test_pmksa_cache.py b/tests/hwsim/test_pmksa_cache.py
index 4a3b444ff..4f7f7f760 100644
--- a/tests/hwsim/test_pmksa_cache.py
+++ b/tests/hwsim/test_pmksa_cache.py
@@ -958,7 +958,7 @@ def test_pmksa_cache_preauth_wpas_oom(dev, apdev):
eap_connect(dev[0], hapd, "PAX", "pax.user@example.com",
password_hex="0123456789abcdef0123456789abcdef",
bssid=apdev[0]['bssid'])
- for i in range(1, 11):
+ for i in range(1, 10):
with alloc_fail(dev[0], i, "rsn_preauth_init"):
res = dev[0].request("PREAUTH f2:11:22:33:44:55").strip()
logger.info("Iteration %d - PREAUTH command results: %s" % (i, res))
@@ -966,7 +966,7 @@ def test_pmksa_cache_preauth_wpas_oom(dev, apdev):
state = dev[0].request('GET_ALLOC_FAIL')
if state.startswith('0:'):
break
- time.sleep(0.05)
+ time.sleep(0.10)
def test_pmksa_cache_ctrl(dev, apdev):
"""PMKSA cache control interface operations"""
diff --git a/tests/hwsim/test_sae.py b/tests/hwsim/test_sae.py
index 679db0e2d..4ea9bd6a4 100644
--- a/tests/hwsim/test_sae.py
+++ b/tests/hwsim/test_sae.py
@@ -178,6 +178,11 @@ def test_sae_groups(dev, apdev):
if tls.startswith("OpenSSL") and "run=OpenSSL 1." in tls:
logger.info("Add Brainpool EC groups since OpenSSL is new enough")
sae_groups += [27, 28, 29, 30]
+ if tls.startswith("mbed TLS"):
+ # secp224k1 and secp224r1 (26) have prime p = 1 mod 4, and mbedtls
+ # does not have code to derive y from compressed format for those curves
+ sae_groups = [19, 25, 20, 21, 1, 2, 5, 14, 15, 16, 22, 23, 24]
+ sae_groups += [27, 28, 29, 30]
heavy_groups = [14, 15, 16]
suitable_groups = [15, 16, 17, 18, 19, 20, 21]
groups = [str(g) for g in sae_groups]
@@ -2232,6 +2237,8 @@ def run_sae_pwe_group(dev, apdev, group):
logger.info("Add Brainpool EC groups since OpenSSL is new enough")
elif tls.startswith("wolfSSL"):
logger.info("Make sure Brainpool EC groups were enabled when compiling wolfSSL")
+ elif tls.startswith("mbed TLS"):
+ logger.info("Make sure Brainpool EC groups were enabled when compiling mbed TLS")
else:
raise HwsimSkip("Brainpool curve not supported")
start_sae_pwe_ap(apdev[0], group, 2)
diff --git a/tests/hwsim/test_suite_b.py b/tests/hwsim/test_suite_b.py
index ddd1c2ee7..a44f32955 100644
--- a/tests/hwsim/test_suite_b.py
+++ b/tests/hwsim/test_suite_b.py
@@ -27,6 +27,8 @@ def check_suite_b_tls_lib(dev, dhe=False, level128=False):
return
if tls.startswith("wolfSSL"):
return
+ if tls.startswith("mbed TLS"):
+ return
if not tls.startswith("OpenSSL"):
raise HwsimSkip("TLS library not supported for Suite B: " + tls)
supported = False
@@ -520,6 +522,7 @@ def test_suite_b_192_rsa_insufficient_dh(dev, apdev):
dev[0].connect("test-suite-b", key_mgmt="WPA-EAP-SUITE-B-192",
ieee80211w="2",
+ openssl_ciphers="DHE-RSA-AES256-GCM-SHA384",
phase1="tls_suiteb=1",
eap="TLS", identity="tls user",
ca_cert="auth_serv/rsa3072-ca.pem",
diff --git a/tests/hwsim/test_wpas_ctrl.py b/tests/hwsim/test_wpas_ctrl.py
index cf6d3211e..cbf136eaf 100644
--- a/tests/hwsim/test_wpas_ctrl.py
+++ b/tests/hwsim/test_wpas_ctrl.py
@@ -1856,7 +1856,7 @@ def _test_wpas_ctrl_oom(dev):
tls = dev[0].request("GET tls_library")
if not tls.startswith("internal"):
tests.append(('NFC_GET_HANDOVER_SEL NDEF P2P-CR-TAG', 'FAIL',
- 4, 'wpas_ctrl_nfc_get_handover_sel_p2p'))
+ 3, 'wpas_ctrl_nfc_get_handover_sel_p2p'))
for cmd, exp, count, func in tests:
with alloc_fail(dev[0], count, func):
res = dev[0].request(cmd)
diff --git a/tests/hwsim/utils.py b/tests/hwsim/utils.py
index 7e3608284..b23c1ee0b 100644
--- a/tests/hwsim/utils.py
+++ b/tests/hwsim/utils.py
@@ -145,7 +145,13 @@ def check_imsi_privacy_support(dev):
def check_tls_tod(dev):
tls = dev.request("GET tls_library")
- if not tls.startswith("OpenSSL") and not tls.startswith("internal"):
+ if tls.startswith("OpenSSL"):
+ return
+ elif tls.startswith("internal"):
+ return
+ elif tls.startswith("mbed TLS"):
+ return
+ else:
raise HwsimSkip("TLS TOD-TOFU/STRICT not supported with this TLS library: " + tls)
def vht_supported():
diff --git a/tests/test-crypto_module.c b/tests/test-crypto_module.c
new file mode 100644
index 000000000..0f1156142
--- /dev/null
+++ b/tests/test-crypto_module.c
@@ -0,0 +1,16 @@
+/*
+ * crypto module tests - test program
+ * Copyright (c) 2022, Glenn Strauss <gstrauss@gluelogic.com>
+ *
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
+ */
+
+#include "utils/includes.h"
+#include "utils/module_tests.h"
+#include "crypto/crypto_module_tests.c"
+
+int main(int argc, char *argv[])
+{
+ return crypto_module_tests();
+}
diff --git a/tests/test-https.c b/tests/test-https.c
index a72e56f9d..e9df82f1d 100644
--- a/tests/test-https.c
+++ b/tests/test-https.c
@@ -75,7 +75,7 @@ static int https_client(int s, const char *path)
struct tls_connection *conn;
struct wpabuf *in, *out, *appl;
int res = -1;
- int need_more_data;
+ int need_more_data = 0;
os_memset(&conf, 0, sizeof(conf));
conf.event_cb = https_tls_event_cb;
@@ -93,8 +93,12 @@ static int https_client(int s, const char *path)
for (;;) {
appl = NULL;
+#ifdef CONFIG_TLS_INTERNAL_SERVER
out = tls_connection_handshake2(tls, conn, in, &appl,
&need_more_data);
+#else
+ out = tls_connection_handshake(tls, conn, in, &appl);
+#endif
wpabuf_free(in);
in = NULL;
if (out == NULL) {
@@ -152,11 +156,15 @@ static int https_client(int s, const char *path)
wpa_printf(MSG_INFO, "Reading HTTP response");
for (;;) {
- int need_more_data;
+ int need_more_data = 0;
in = https_recv(s);
if (in == NULL)
goto done;
+#ifdef CONFIG_TLS_INTERNAL_SERVER
out = tls_connection_decrypt2(tls, conn, in, &need_more_data);
+#else
+ out = tls_connection_decrypt(tls, conn, in);
+#endif
if (need_more_data)
wpa_printf(MSG_DEBUG, "HTTP: Need more data");
wpabuf_free(in);
diff --git a/tests/test-https_server.c b/tests/test-https_server.c
index 33b448682..9dcca5596 100644
--- a/tests/test-https_server.c
+++ b/tests/test-https_server.c
@@ -67,10 +67,12 @@ static struct wpabuf * https_recv(int s, int timeout_ms)
}
+#ifdef CONFIG_TLS_INTERNAL_SERVER
static void https_tls_log_cb(void *ctx, const char *msg)
{
wpa_printf(MSG_DEBUG, "TLS: %s", msg);
}
+#endif
static int https_server(int s)
@@ -79,7 +81,7 @@ static int https_server(int s)
void *tls;
struct tls_connection_params params;
struct tls_connection *conn;
- struct wpabuf *in, *out, *appl;
+ struct wpabuf *in = NULL, *out = NULL, *appl = NULL;
int res = -1;
os_memset(&conf, 0, sizeof(conf));
@@ -106,7 +108,9 @@ static int https_server(int s)
return -1;
}
+#ifdef CONFIG_TLS_INTERNAL_SERVER
tls_connection_set_log_cb(conn, https_tls_log_cb, NULL);
+#endif
for (;;) {
in = https_recv(s, 5000);
@@ -147,12 +151,16 @@ static int https_server(int s)
wpa_printf(MSG_INFO, "Reading HTTP request");
for (;;) {
- int need_more_data;
+ int need_more_data = 0;
in = https_recv(s, 5000);
if (!in)
goto done;
+#ifdef CONFIG_TLS_INTERNAL_SERVER
out = tls_connection_decrypt2(tls, conn, in, &need_more_data);
+#else
+ out = tls_connection_decrypt(tls, conn, in);
+#endif
wpabuf_free(in);
in = NULL;
if (need_more_data) {
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 743c8acd6..c40e8d70d 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -10,6 +10,7 @@ ALL += dbus/fi.w1.wpa_supplicant1.service
EXTRA_TARGETS=dynamic_eap_methods
CONFIG_FILE=.config
+-include $(if $(MULTICALL),../hostapd/.config)
include ../src/build.rules
ifdef CONFIG_BUILD_PASN_SO
@@ -190,6 +191,25 @@ ifdef CONFIG_EAPOL_TEST
CFLAGS += -Werror -DEAPOL_TEST
endif
+ifdef CONFIG_UBUS
+CFLAGS += -DUBUS_SUPPORT
+OBJS += ubus.o
+LIBS += -lubus
+NEED_ULOOP:=y
+endif
+
+ifdef CONFIG_UCODE
+CFLAGS += -DUCODE_SUPPORT
+OBJS += ../src/utils/ucode.o
+OBJS += ucode.o
+NEED_ULOOP:=y
+endif
+
+ifdef NEED_ULOOP
+OBJS += ../src/utils/uloop.o
+LIBS += -lubox
+endif
+
ifdef CONFIG_CODE_COVERAGE
CFLAGS += -O0 -fprofile-arcs -ftest-coverage -U_FORTIFY_SOURCE
LIBS += -lgcov
@@ -389,7 +409,9 @@ endif
ifdef CONFIG_IBSS_RSN
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_IBSS_RSN
+ifndef MULTICALL
CFLAGS += -DCONFIG_NO_VLAN
+endif
OBJS += ibss_rsn.o
endif
@@ -981,6 +1003,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
LIBS += -ldl -rdynamic
endif
+else
+ ifdef MULTICALL
+ OBJS += ../src/eap_common/eap_common.o
+ endif
endif
ifdef CONFIG_AP
@@ -988,9 +1014,11 @@ NEED_EAP_COMMON=y
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_AP
OBJS += ap.o
+ifndef MULTICALL
CFLAGS += -DCONFIG_NO_RADIUS
CFLAGS += -DCONFIG_NO_ACCOUNTING
CFLAGS += -DCONFIG_NO_VLAN
+endif
OBJS += ../src/ap/hostapd.o
OBJS += ../src/ap/wpa_auth_glue.o
OBJS += ../src/ap/utils.o
@@ -1030,7 +1058,16 @@ ifdef CONFIG_FILS
OBJS += ../src/ap/fils_hlp.o
endif
ifdef CONFIG_CTRL_IFACE
+ifdef CONFIG_CTRL_IFACE_MIB
+CFLAGS += -DCONFIG_CTRL_IFACE_MIB
+endif
OBJS += ../src/ap/ctrl_iface_ap.o
+ifdef CONFIG_UBUS
+OBJS += ../src/ap/ubus.o
+endif
+ifdef CONFIG_UCODE
+OBJS += ../src/ap/ucode.o
+endif
endif
CFLAGS += -DEAP_SERVER -DEAP_SERVER_IDENTITY
@@ -1081,6 +1118,12 @@ endif
ifdef CONFIG_HS20
OBJS += ../src/ap/hs20.o
endif
+else
+ ifdef MULTICALL
+ OBJS += ../src/eap_server/eap_server.o
+ OBJS += ../src/eap_server/eap_server_identity.o
+ OBJS += ../src/eap_server/eap_server_methods.o
+ endif
endif
ifdef CONFIG_MBO
@@ -1090,7 +1133,9 @@ NEED_GAS=y
endif
ifdef NEED_RSN_AUTHENTICATOR
+ifndef MULTICALL
CFLAGS += -DCONFIG_NO_RADIUS
+endif
NEED_AES_WRAP=y
OBJS += ../src/ap/wpa_auth.o
OBJS += ../src/ap/wpa_auth_ie.o
@@ -1189,6 +1234,7 @@ TLS_FUNCS=y
endif
ifeq ($(CONFIG_TLS), wolfssl)
+CFLAGS += -DCONFIG_TLS_WOLFSSL
ifdef TLS_FUNCS
CFLAGS += -DWOLFSSL_DER_LOAD
OBJS += ../src/crypto/tls_wolfssl.o
@@ -1204,6 +1250,7 @@ LIBS_p += -lwolfssl -lm
endif
ifeq ($(CONFIG_TLS), openssl)
+CFLAGS += -DCONFIG_TLS_OPENSSL
CFLAGS += -DCRYPTO_RSA_OAEP_SHA256
ifdef TLS_FUNCS
CFLAGS += -DEAP_TLS_OPENSSL
@@ -1230,7 +1277,28 @@ endif
CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\"
endif
+ifeq ($(CONFIG_TLS), mbedtls)
+CFLAGS += -DCONFIG_TLS_MBEDTLS
+ifndef CONFIG_CRYPTO
+CONFIG_CRYPTO=mbedtls
+endif
+ifdef TLS_FUNCS
+OBJS += ../src/crypto/tls_mbedtls.o
+LIBS += -lmbedtls -lmbedx509
+endif
+OBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
+OBJS_p += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
+OBJS_priv += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
+ifeq ($(CONFIG_CRYPTO), mbedtls)
+LIBS += -lmbedcrypto
+LIBS_p += -lmbedcrypto
+# XXX: create a config option?
+CFLAGS += -DCRYPTO_RSA_OAEP_SHA256
+endif
+endif
+
ifeq ($(CONFIG_TLS), gnutls)
+CFLAGS += -DCONFIG_TLS_GNUTLS
ifndef CONFIG_CRYPTO
# default to libgcrypt
CONFIG_CRYPTO=gnutls
@@ -1261,6 +1329,7 @@ endif
endif
ifeq ($(CONFIG_TLS), internal)
+CFLAGS += -DCONFIG_TLS_INTERNAL
ifndef CONFIG_CRYPTO
CONFIG_CRYPTO=internal
endif
@@ -1341,6 +1410,7 @@ endif
endif
ifeq ($(CONFIG_TLS), linux)
+CFLAGS += -DCONFIG_TLS_INTERNAL
OBJS += ../src/crypto/crypto_linux.o
OBJS_p += ../src/crypto/crypto_linux.o
ifdef TLS_FUNCS
@@ -1422,9 +1492,11 @@ endif
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
NEED_INTERNAL_AES_WRAP=y
endif
endif
+endif
ifdef CONFIG_OPENSSL_INTERNAL_AES_WRAP
# Seems to be needed at least with BoringSSL
NEED_INTERNAL_AES_WRAP=y
@@ -1438,9 +1510,11 @@ endif
ifdef NEED_INTERNAL_AES_WRAP
ifneq ($(CONFIG_TLS), linux)
+ifneq ($(CONFIG_TLS), mbedtls)
AESOBJS += ../src/crypto/aes-unwrap.o
endif
endif
+endif
ifdef NEED_AES_EAX
AESOBJS += ../src/crypto/aes-eax.o
NEED_AES_CTR=y
@@ -1450,35 +1524,45 @@ AESOBJS += ../src/crypto/aes-siv.o
NEED_AES_CTR=y
endif
ifdef NEED_AES_CTR
+ifneq ($(CONFIG_TLS), mbedtls)
AESOBJS += ../src/crypto/aes-ctr.o
endif
+endif
ifdef NEED_AES_ENCBLOCK
+ifneq ($(CONFIG_TLS), mbedtls)
AESOBJS += ../src/crypto/aes-encblock.o
endif
+endif
NEED_AES_ENC=y
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
AESOBJS += ../src/crypto/aes-omac1.o
endif
endif
endif
+endif
ifdef NEED_AES_WRAP
NEED_AES_ENC=y
ifdef NEED_INTERNAL_AES_WRAP
+ifneq ($(CONFIG_TLS), mbedtls)
AESOBJS += ../src/crypto/aes-wrap.o
endif
endif
+endif
ifdef NEED_AES_CBC
NEED_AES_ENC=y
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
AESOBJS += ../src/crypto/aes-cbc.o
endif
endif
endif
endif
+endif
ifdef NEED_AES_ENC
ifdef CONFIG_INTERNAL_AES
AESOBJS += ../src/crypto/aes-internal-enc.o
@@ -1493,12 +1577,16 @@ ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
SHA1OBJS += ../src/crypto/sha1.o
endif
endif
endif
endif
+endif
+ifneq ($(CONFIG_TLS), mbedtls)
SHA1OBJS += ../src/crypto/sha1-prf.o
+endif
ifdef CONFIG_INTERNAL_SHA1
SHA1OBJS += ../src/crypto/sha1-internal.o
ifdef NEED_FIPS186_2_PRF
@@ -1510,29 +1598,37 @@ CFLAGS += -DCONFIG_NO_PBKDF2
else
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
SHA1OBJS += ../src/crypto/sha1-pbkdf2.o
endif
endif
endif
+endif
ifdef NEED_T_PRF
+ifneq ($(CONFIG_TLS), mbedtls)
SHA1OBJS += ../src/crypto/sha1-tprf.o
endif
+endif
ifdef NEED_TLS_PRF
+ifneq ($(CONFIG_TLS), mbedtls)
SHA1OBJS += ../src/crypto/sha1-tlsprf.o
endif
endif
+endif
ifndef CONFIG_FIPS
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
MD5OBJS += ../src/crypto/md5.o
endif
endif
endif
endif
endif
+endif
ifdef NEED_MD5
ifdef CONFIG_INTERNAL_MD5
MD5OBJS += ../src/crypto/md5-internal.o
@@ -1587,12 +1683,17 @@ ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
SHA256OBJS += ../src/crypto/sha256.o
endif
endif
endif
endif
+endif
+
+ifneq ($(CONFIG_TLS), mbedtls)
SHA256OBJS += ../src/crypto/sha256-prf.o
+endif
ifdef CONFIG_INTERNAL_SHA256
SHA256OBJS += ../src/crypto/sha256-internal.o
endif
@@ -1605,50 +1706,68 @@ CFLAGS += -DCONFIG_INTERNAL_SHA512
SHA256OBJS += ../src/crypto/sha512-internal.o
endif
ifdef NEED_TLS_PRF_SHA256
+ifneq ($(CONFIG_TLS), mbedtls)
SHA256OBJS += ../src/crypto/sha256-tlsprf.o
endif
+endif
ifdef NEED_TLS_PRF_SHA384
+ifneq ($(CONFIG_TLS), mbedtls)
SHA256OBJS += ../src/crypto/sha384-tlsprf.o
endif
+endif
ifdef NEED_HMAC_SHA256_KDF
CFLAGS += -DCONFIG_HMAC_SHA256_KDF
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha256-kdf.o
endif
+endif
ifdef NEED_HMAC_SHA384_KDF
CFLAGS += -DCONFIG_HMAC_SHA384_KDF
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha384-kdf.o
endif
+endif
ifdef NEED_HMAC_SHA512_KDF
CFLAGS += -DCONFIG_HMAC_SHA512_KDF
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha512-kdf.o
endif
+endif
OBJS += $(SHA256OBJS)
ifdef NEED_SHA384
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha384.o
endif
endif
endif
endif
+endif
CFLAGS += -DCONFIG_SHA384
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha384-prf.o
endif
+endif
ifdef NEED_SHA512
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), linux)
ifneq ($(CONFIG_TLS), gnutls)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha512.o
endif
endif
endif
endif
+endif
CFLAGS += -DCONFIG_SHA512
+ifneq ($(CONFIG_TLS), mbedtls)
OBJS += ../src/crypto/sha512-prf.o
endif
+endif
ifdef NEED_ASN1
OBJS += ../src/tls/asn1.o
@@ -1823,10 +1942,12 @@ ifdef CONFIG_FIPS
CFLAGS += -DCONFIG_FIPS
ifneq ($(CONFIG_TLS), openssl)
ifneq ($(CONFIG_TLS), wolfssl)
+ifneq ($(CONFIG_TLS), mbedtls)
$(error CONFIG_FIPS=y requires CONFIG_TLS=openssl)
endif
endif
endif
+endif
OBJS += $(SHA1OBJS) $(DESOBJS)
@@ -2004,32 +2125,38 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
_OBJS_VAR := OBJS
include ../src/objs.mk
+wpa_supplicant_multi.a: .config $(BCHECK) $(OBJS) $(EXTRA_progs)
+ $(Q)$(CC) -c -o wpa_supplicant_multi.o -Dmain=wpa_supplicant_main $(CFLAGS) main.c
+ @$(E) " CC " $<
+ @rm -f $@
+ @$(AR) cr $@ wpa_supplicant_multi.o $(OBJS)
+
wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
- $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
+ +$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
@$(E) " LD " $@
_OBJS_VAR := OBJS_t
include ../src/objs.mk
eapol_test: $(OBJS_t)
- $(Q)$(LDO) $(LDFLAGS) -o eapol_test $(OBJS_t) $(LIBS)
+ +$(Q)$(LDO) $(LDFLAGS) -o eapol_test $(OBJS_t) $(LIBS)
@$(E) " LD " $@
_OBJS_VAR := OBJS_t2
include ../src/objs.mk
preauth_test: $(OBJS_t2)
- $(Q)$(LDO) $(LDFLAGS) -o preauth_test $(OBJS_t2) $(LIBS)
+ +$(Q)$(LDO) $(LDFLAGS) -o preauth_test $(OBJS_t2) $(LIBS)
@$(E) " LD " $@
_OBJS_VAR := OBJS_p
include ../src/objs.mk
wpa_passphrase: $(OBJS_p)
- $(Q)$(LDO) $(LDFLAGS) -o wpa_passphrase $(OBJS_p) $(LIBS_p) $(LIBS)
+ +$(Q)$(LDO) $(LDFLAGS) -o wpa_passphrase $(OBJS_p) $(LIBS_p) $(LIBS)
@$(E) " LD " $@
_OBJS_VAR := OBJS_c
include ../src/objs.mk
wpa_cli: $(OBJS_c)
- $(Q)$(LDO) $(LDFLAGS) -o wpa_cli $(OBJS_c) $(LIBS_c)
+ +$(Q)$(LDO) $(LDFLAGS) -o wpa_cli $(OBJS_c) $(LIBS_c)
@$(E) " LD " $@
LIBCTRL += ../src/common/wpa_ctrl.o
@@ -2136,6 +2263,12 @@ eap_gpsk.so: $(SRC_EAP_GPSK)
$(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
@$(E) " sed" $<
+dump_cflags:
+ @printf "%s " "$(CFLAGS)"
+
+dump_ldflags:
+ @printf "%s " "$(LDFLAGS) $(LIBS) $(EXTRALIBS)"
+
wpa_supplicant.exe: wpa_supplicant
mv -f $< $@
wpa_cli.exe: wpa_cli
diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index 69a0e5ee1..7e8c97c38 100644
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -1520,7 +1520,7 @@ int wpas_ap_wps_nfc_report_handover(struct wpa_supplicant *wpa_s,
#endif /* CONFIG_WPS */
-#ifdef CONFIG_CTRL_IFACE
+#if defined(CONFIG_CTRL_IFACE) && defined(CONFIG_CTRL_IFACE_MIB)
int ap_ctrl_iface_sta_first(struct wpa_supplicant *wpa_s,
char *buf, size_t buflen)
@@ -1846,17 +1846,37 @@ int ap_switch_channel(struct wpa_supplicant *wpa_s,
#ifdef CONFIG_CTRL_IFACE
+
+static int __ap_ctrl_iface_chanswitch(struct hostapd_iface *iface,
+ struct csa_settings *settings)
+{
+#ifdef NEED_AP_MLME
+ if (!iface || !iface->bss[0])
+ return 0;
+
+ return hostapd_switch_channel(iface->bss[0], settings);
+#else
+ return -1;
+#endif
+}
+
+
int ap_ctrl_iface_chanswitch(struct wpa_supplicant *wpa_s, const char *pos)
{
struct csa_settings settings;
int ret = hostapd_parse_csa_settings(pos, &settings);
- if (ret)
- return ret;
+ if (!(wpa_s->ap_iface && wpa_s->ap_iface->bss[0]) &&
+ !(wpa_s->ifmsh && wpa_s->ifmsh->bss[0]))
+ return -1;
settings.link_id = -1;
- return ap_switch_channel(wpa_s, &settings);
+ ret = __ap_ctrl_iface_chanswitch(wpa_s->ap_iface, &settings);
+ if (ret)
+ return ret;
+
+ return __ap_ctrl_iface_chanswitch(wpa_s->ifmsh, &settings);
}
#endif /* CONFIG_CTRL_IFACE */
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index b02b694a3..dc4b0636a 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -18,6 +18,7 @@
#include "eap_peer/eap.h"
#include "p2p/p2p.h"
#include "fst/fst.h"
+#include "ap/sta_info.h"
#include "config.h"
@@ -2421,6 +2422,97 @@ static char * wpa_config_write_mac_value(const struct parse_data *data,
#endif /* NO_CONFIG_WRITE */
+static int wpa_config_parse_mcast_rate(const struct parse_data *data,
+ struct wpa_ssid *ssid, int line,
+ const char *value)
+{
+ ssid->mcast_rate = (int)(strtod(value, NULL) * 10);
+
+ return 0;
+}
+
+#ifndef NO_CONFIG_WRITE
+static char * wpa_config_write_mcast_rate(const struct parse_data *data,
+ struct wpa_ssid *ssid)
+{
+ char *value;
+ int res;
+
+ if (!ssid->mcast_rate == 0)
+ return NULL;
+
+ value = os_malloc(6); /* longest: 300.0 */
+ if (value == NULL)
+ return NULL;
+ res = os_snprintf(value, 5, "%.1f", (double)ssid->mcast_rate / 10);
+ if (res < 0) {
+ os_free(value);
+ return NULL;
+ }
+ return value;
+}
+#endif /* NO_CONFIG_WRITE */
+
+static int wpa_config_parse_rates(const struct parse_data *data,
+ struct wpa_ssid *ssid, int line,
+ const char *value)
+{
+ int i;
+ char *pos, *r, *sptr, *end;
+ double rate;
+
+ pos = (char *)value;
+ r = strtok_r(pos, ",", &sptr);
+ i = 0;
+ while (pos && i < WLAN_SUPP_RATES_MAX) {
+ rate = 0.0;
+ if (r)
+ rate = strtod(r, &end);
+ ssid->rates[i] = rate * 2;
+ if (*end != '\0' || rate * 2 != ssid->rates[i])
+ return 1;
+
+ i++;
+ r = strtok_r(NULL, ",", &sptr);
+ }
+
+ return 0;
+}
+
+#ifndef NO_CONFIG_WRITE
+static char * wpa_config_write_rates(const struct parse_data *data,
+ struct wpa_ssid *ssid)
+{
+ char *value, *pos;
+ int res, i;
+
+ if (ssid->rates[0] <= 0)
+ return NULL;
+
+ value = os_malloc(6 * WLAN_SUPP_RATES_MAX + 1);
+ if (value == NULL)
+ return NULL;
+ pos = value;
+ for (i = 0; i < WLAN_SUPP_RATES_MAX - 1; i++) {
+ res = os_snprintf(pos, 6, "%.1f,", (double)ssid->rates[i] / 2);
+ if (res < 0) {
+ os_free(value);
+ return NULL;
+ }
+ pos += res;
+ }
+ res = os_snprintf(pos, 6, "%.1f",
+ (double)ssid->rates[WLAN_SUPP_RATES_MAX - 1] / 2);
+ if (res < 0) {
+ os_free(value);
+ return NULL;
+ }
+
+ value[6 * WLAN_SUPP_RATES_MAX] = '\0';
+ return value;
+}
+#endif /* NO_CONFIG_WRITE */
+
/* Helper macros for network block parser */
#ifdef OFFSET
@@ -2639,6 +2731,7 @@ static const struct parse_data ssid_fields[] = {
#else /* CONFIG_MESH */
{ INT_RANGE(mode, 0, 4) },
#endif /* CONFIG_MESH */
+ { INT_RANGE(noscan, 0, 1) },
{ INT_RANGE(proactive_key_caching, 0, 1) },
{ INT_RANGE(disabled, 0, 2) },
{ STR(id_str) },
@@ -2712,6 +2805,8 @@ static const struct parse_data ssid_fields[] = {
{ INT(ap_max_inactivity) },
{ INT(dtim_period) },
{ INT(beacon_int) },
+ { FUNC(rates) },
+ { FUNC(mcast_rate) },
#ifdef CONFIG_MACSEC
{ INT_RANGE(macsec_policy, 0, 1) },
{ INT_RANGE(macsec_integ_only, 0, 1) },
diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c
index fd8eafe2b..5ce616129 100644
--- a/wpa_supplicant/config_file.c
+++ b/wpa_supplicant/config_file.c
@@ -326,8 +326,13 @@ struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp,
while (cred_tail && cred_tail->next)
cred_tail = cred_tail->next;
+ if (!strncmp(name, "data:", 5)) {
+ f = fmemopen((void *)(name + 5), strlen(name + 5), "r");
+ name = "<inline>";
+ } else {
+ f = fopen(name, "r");
+ }
wpa_printf(MSG_DEBUG, "Reading configuration file '%s'", name);
- f = fopen(name, "r");
if (f == NULL) {
wpa_printf(MSG_ERROR, "Failed to open config file '%s', "
"error: %s", name, strerror(errno));
@@ -775,6 +780,7 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid)
#endif /* IEEE8021X_EAPOL */
INT(mode);
INT(no_auto_peer);
+ INT(noscan);
INT(mesh_fwding);
INT(frequency);
INT(enable_edmg);
diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
index d64c30508..872bcc270 100644
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -879,6 +879,9 @@ struct wpa_ssid {
*/
void *parent_cred;
+ unsigned char rates[WLAN_SUPP_RATES_MAX];
+ double mcast_rate;
+
#ifdef CONFIG_MACSEC
/**
* macsec_policy - Determines the policy for MACsec secure session
@@ -1035,6 +1038,8 @@ struct wpa_ssid {
*/
int no_auto_peer;
+ int noscan;
+
/**
* mesh_rssi_threshold - Set mesh parameter mesh_rssi_threshold (dBm)
*
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index d245531cd..4777c3abe 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -2355,7 +2355,7 @@ static int wpa_supplicant_ctrl_iface_status(struct wpa_supplicant *wpa_s,
pos += ret;
}
-#ifdef CONFIG_AP
+#if defined(CONFIG_AP) && defined(CONFIG_CTRL_IFACE_MIB)
if (wpa_s->ap_iface) {
pos += ap_ctrl_iface_wpa_get_status(wpa_s, pos,
end - pos,
@@ -12561,6 +12561,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
reply_len = -1;
} else if (os_strncmp(buf, "NOTE ", 5) == 0) {
wpa_printf(MSG_INFO, "NOTE: %s", buf + 5);
+#ifdef CONFIG_CTRL_IFACE_MIB
} else if (os_strcmp(buf, "MIB") == 0) {
reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
if (reply_len >= 0) {
@@ -12573,6 +12574,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
reply_size - reply_len);
#endif /* CONFIG_MACSEC */
}
+#endif
} else if (os_strncmp(buf, "STATUS", 6) == 0) {
reply_len = wpa_supplicant_ctrl_iface_status(
wpa_s, buf + 6, reply, reply_size);
@@ -13061,6 +13063,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
reply_len = wpa_supplicant_ctrl_iface_bss(
wpa_s, buf + 4, reply, reply_size);
#ifdef CONFIG_AP
+#ifdef CONFIG_CTRL_IFACE_MIB
} else if (os_strcmp(buf, "STA-FIRST") == 0) {
reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size);
} else if (os_strncmp(buf, "STA ", 4) == 0) {
@@ -13069,12 +13072,15 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
} else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply,
reply_size);
+#endif
+#ifdef CONFIG_CTRL_IFACE_MIB
} else if (os_strncmp(buf, "DEAUTHENTICATE ", 15) == 0) {
if (ap_ctrl_iface_sta_deauthenticate(wpa_s, buf + 15))
reply_len = -1;
} else if (os_strncmp(buf, "DISASSOCIATE ", 13) == 0) {
if (ap_ctrl_iface_sta_disassociate(wpa_s, buf + 13))
reply_len = -1;
+#endif
} else if (os_strncmp(buf, "CHAN_SWITCH ", 12) == 0) {
if (ap_ctrl_iface_chanswitch(wpa_s, buf + 12))
reply_len = -1;
@@ -13233,7 +13239,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
if (wpas_ctrl_iface_coloc_intf_report(wpa_s, buf + 18))
reply_len = -1;
#endif /* CONFIG_WNM */
-#ifdef CONFIG_WNM_AP
+#if defined(CONFIG_AP) && defined(CONFIG_WNM_AP)
} else if (os_strncmp(buf, "DISASSOC_IMMINENT ", 18) == 0) {
if (ap_ctrl_iface_disassoc_imminent(wpa_s, buf + 18))
reply_len = -1;
@@ -13243,7 +13249,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
} else if (os_strncmp(buf, "BSS_TM_REQ ", 11) == 0) {
if (ap_ctrl_iface_bss_tm_req(wpa_s, buf + 11))
reply_len = -1;
-#endif /* CONFIG_WNM_AP */
+#endif /* CONFIG_AP && CONFIG_WNM_AP */
} else if (os_strcmp(buf, "FLUSH") == 0) {
wpa_supplicant_ctrl_iface_flush(wpa_s);
} else if (os_strncmp(buf, "RADIO_WORK ", 11) == 0) {
diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig
index 52befd8f1..ace6c5530 100644
--- a/wpa_supplicant/defconfig
+++ b/wpa_supplicant/defconfig
@@ -10,8 +10,8 @@
# to override previous values of the variables.
-# Uncomment following two lines and fix the paths if you have installed OpenSSL
-# or GnuTLS in non-default location
+# Uncomment following two lines and fix the paths if you have installed TLS
+# libraries in a non-default location
#CFLAGS += -I/usr/local/openssl/include
#LIBS += -L/usr/local/openssl/lib
@@ -20,6 +20,7 @@
# used to fix build issues on such systems (krb5.h not found).
#CFLAGS += -I/usr/include/kerberos
+
# Driver interface for generic Linux wireless extensions
# Note: WEXT is deprecated in the current Linux kernel version and no new
# functionality is added to it. nl80211-based interface is the new
@@ -329,6 +330,7 @@ CONFIG_BACKEND=file
# openssl = OpenSSL (default)
# gnutls = GnuTLS
# internal = Internal TLSv1 implementation (experimental)
+# mbedtls = mbed TLS
# linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental)
# none = Empty template
#CONFIG_TLS=openssl
diff --git a/wpa_supplicant/eapol_test.c b/wpa_supplicant/eapol_test.c
index 0c17aaea4..3d35757bf 100644
--- a/wpa_supplicant/eapol_test.c
+++ b/wpa_supplicant/eapol_test.c
@@ -31,7 +31,12 @@
#include "ctrl_iface.h"
#include "pcsc_funcs.h"
#include "wpas_glue.h"
+#include "drivers/driver.h"
+void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data);
+void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data);
const struct wpa_driver_ops *const wpa_drivers[] = { NULL };
@@ -1328,6 +1333,10 @@ static void usage(void)
"option several times.\n");
}
+extern void supplicant_event(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data);
+extern void supplicant_event_global(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data);
int main(int argc, char *argv[])
{
@@ -1351,6 +1360,8 @@ int main(int argc, char *argv[])
if (os_program_init())
return -1;
+ wpa_supplicant_event = supplicant_event;
+ wpa_supplicant_event_global = supplicant_event_global;
hostapd_logger_register_cb(hostapd_logger_cb);
os_memset(&eapol_test, 0, sizeof(eapol_test));
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index bb0e95ba4..5c08d4a19 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -6038,8 +6038,8 @@ static void wpas_link_reconfig(struct wpa_supplicant *wpa_s)
}
-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
- union wpa_event_data *data)
+void supplicant_event(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data)
{
struct wpa_supplicant *wpa_s = ctx;
int resched;
@@ -6074,6 +6074,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
event_to_string(event), event);
#endif /* CONFIG_NO_STDOUT_DEBUG */
+ wpas_ucode_event(wpa_s, event, data);
switch (event) {
case EVENT_AUTH:
#ifdef CONFIG_FST
@@ -6991,7 +6992,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
}
-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
+void supplicant_event_global(void *ctx, enum wpa_event_type event,
union wpa_event_data *data)
{
struct wpa_supplicant *wpa_s;
diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c
index 9229eb51f..ee152c5b9 100644
--- a/wpa_supplicant/main.c
+++ b/wpa_supplicant/main.c
@@ -12,6 +12,7 @@
#endif /* __linux__ */
#include "common.h"
+#include "build_features.h"
#include "crypto/crypto.h"
#include "fst/fst.h"
#include "wpa_supplicant_i.h"
@@ -202,7 +203,7 @@ int main(int argc, char *argv[])
for (;;) {
c = getopt(argc, argv,
- "b:Bc:C:D:de:f:g:G:hi:I:KLMm:No:O:p:P:qsTtuvW");
+ "b:Bc:C:D:de:f:g:G:hi:I:KLMm:nNo:O:p:P:qsTtuv::W");
if (c < 0)
break;
switch (c) {
@@ -267,6 +268,9 @@ int main(int argc, char *argv[])
params.conf_p2p_dev = optarg;
break;
#endif /* CONFIG_P2P */
+ case 'n':
+ iface_count = 0;
+ break;
case 'o':
params.override_driver = optarg;
break;
@@ -302,8 +306,12 @@ int main(int argc, char *argv[])
break;
#endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
case 'v':
- printf("%s\n", wpa_supplicant_version);
- exitcode = 0;
+ if (optarg) {
+ exitcode = !has_feature(optarg);
+ } else {
+ printf("%s\n", wpa_supplicant_version);
+ exitcode = 0;
+ }
goto out;
case 'W':
params.wait_for_monitor++;
diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c
index 85c1ea8ba..dabbb0334 100644
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
@@ -506,6 +506,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s,
frequency);
goto out_free;
}
+ if (conf->noscan)
+ ssid->noscan = 1;
if (ssid->mesh_basic_rates == NULL) {
/*
@@ -630,6 +632,7 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s,
params->meshid = ssid->ssid;
params->meshid_len = ssid->ssid_len;
+ params->mcast_rate = ssid->mcast_rate;
ibss_mesh_setup_freq(wpa_s, ssid, &params->freq);
wpa_s->mesh_ht_enabled = !!params->freq.ht_enabled;
wpa_s->mesh_vht_enabled = !!params->freq.vht_enabled;
diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index af00e7910..b239410e8 100644
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -26,6 +26,15 @@
#include <cutils/properties.h>
#endif /* ANDROID */
+#ifndef CONFIG_P2P
+#define CONFIG_P2P
+#endif
+#ifndef CONFIG_AP
+#define CONFIG_AP
+#endif
+#ifndef CONFIG_MESH
+#define CONFIG_MESH
+#endif
static const char *const wpa_cli_version =
"wpa_cli v" VERSION_STR "\n"
diff --git a/wpa_supplicant/wpa_priv.c b/wpa_supplicant/wpa_priv.c
index 88f3f2a52..92efe5629 100644
--- a/wpa_supplicant/wpa_priv.c
+++ b/wpa_supplicant/wpa_priv.c
@@ -1042,8 +1042,8 @@ static void wpa_priv_send_ft_response(struct wpa_priv_interface *iface,
}
-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
- union wpa_event_data *data)
+static void supplicant_event(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data)
{
struct wpa_priv_interface *iface = ctx;
@@ -1106,7 +1106,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
}
-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
+void supplicant_event_global(void *ctx, enum wpa_event_type event,
union wpa_event_data *data)
{
struct wpa_priv_global *global = ctx;
@@ -1220,6 +1220,8 @@ int main(int argc, char *argv[])
if (os_program_init())
return -1;
+ wpa_supplicant_event = supplicant_event;
+ wpa_supplicant_event_global = supplicant_event_global;
wpa_priv_fd_workaround();
os_memset(&global, 0, sizeof(global));
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 1e77493ef..32b178560 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1151,6 +1151,7 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
sme_sched_obss_scan(wpa_s, 0);
}
wpa_s->wpa_state = state;
+ wpas_ucode_update_state(wpa_s);
#ifdef CONFIG_BGSCAN
if (state == WPA_COMPLETED && wpa_s->current_ssid != wpa_s->bgscan_ssid)
@@ -2831,7 +2832,7 @@ static int drv_supports_vht(struct wpa_supplicant *wpa_s,
}
-static bool ibss_mesh_is_80mhz_avail(int channel, struct hostapd_hw_modes *mode)
+static bool ibss_mesh_is_80mhz_avail(int channel, struct hostapd_hw_modes *mode, bool dfs_enabled)
{
int i;
@@ -2840,7 +2841,10 @@ static bool ibss_mesh_is_80mhz_avail(int channel, struct hostapd_hw_modes *mode)
chan = hw_get_channel_chan(mode, i, NULL);
if (!chan ||
- chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
+ chan->flag & HOSTAPD_CHAN_DISABLED)
+ return false;
+
+ if (!dfs_enabled && chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
return false;
}
@@ -2900,7 +2904,7 @@ static bool ibss_mesh_can_use_vht(struct wpa_supplicant *wpa_s,
const struct wpa_ssid *ssid,
struct hostapd_hw_modes *mode)
{
- if (mode->mode != HOSTAPD_MODE_IEEE80211A)
+ if (mode->mode != HOSTAPD_MODE_IEEE80211A && !(ssid->noscan))
return false;
if (!drv_supports_vht(wpa_s, ssid))
@@ -2967,13 +2971,13 @@ static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
const struct wpa_ssid *ssid,
struct hostapd_hw_modes *mode,
struct hostapd_freq_params *freq,
- int obss_scan) {
+ int obss_scan, bool dfs_enabled) {
int chan_idx;
struct hostapd_channel_data *pri_chan = NULL, *sec_chan = NULL;
int i, res;
unsigned int j;
static const int ht40plus[] = {
- 36, 44, 52, 60, 100, 108, 116, 124, 132, 140,
+ 1, 2, 3, 4, 5, 6, 7, 36, 44, 52, 60, 100, 108, 116, 124, 132, 140,
149, 157, 165, 173, 184, 192
};
int ht40 = -1;
@@ -2991,8 +2995,11 @@ static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
return;
/* Check primary channel flags */
- if (pri_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
+ if (pri_chan->flag & HOSTAPD_CHAN_DISABLED)
return;
+ if (pri_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
+ if (!dfs_enabled)
+ return;
#ifdef CONFIG_HT_OVERRIDES
if (ssid->disable_ht40)
@@ -3018,8 +3025,11 @@ static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
return;
/* Check secondary channel flags */
- if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
+ if (sec_chan->flag & HOSTAPD_CHAN_DISABLED)
return;
+ if (sec_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
+ if (!dfs_enabled)
+ return;
if (ht40 == -1) {
if (!(pri_chan->flag & HOSTAPD_CHAN_HT40MINUS))
@@ -3074,7 +3084,7 @@ static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
const struct wpa_ssid *ssid,
struct hostapd_hw_modes *mode,
struct hostapd_freq_params *freq,
- int ieee80211_mode, bool is_6ghz) {
+ int ieee80211_mode, bool is_6ghz, bool dfs_enabled) {
static const int bw80[] = {
5180, 5260, 5500, 5580, 5660, 5745, 5825,
5955, 6035, 6115, 6195, 6275, 6355, 6435,
@@ -3119,7 +3129,7 @@ static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
goto skip_80mhz;
/* Use 40 MHz if channel not usable */
- if (!ibss_mesh_is_80mhz_avail(channel, mode))
+ if (!ibss_mesh_is_80mhz_avail(channel, mode, dfs_enabled))
goto skip_80mhz;
chwidth = CONF_OPER_CHWIDTH_80MHZ;
@@ -3133,7 +3143,7 @@ static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
if ((mode->he_capab[ieee80211_mode].phy_cap[
HE_PHYCAP_CHANNEL_WIDTH_SET_IDX] &
HE_PHYCAP_CHANNEL_WIDTH_SET_160MHZ_IN_5G) && is_6ghz &&
- ibss_mesh_is_80mhz_avail(channel + 16, mode)) {
+ ibss_mesh_is_80mhz_avail(channel + 16, mode, dfs_enabled)) {
for (j = 0; j < ARRAY_SIZE(bw160); j++) {
if (freq->freq == bw160[j]) {
chwidth = CONF_OPER_CHWIDTH_160MHZ;
@@ -3161,10 +3171,12 @@ static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
if (!chan)
continue;
- if (chan->flag & (HOSTAPD_CHAN_DISABLED |
- HOSTAPD_CHAN_NO_IR |
- HOSTAPD_CHAN_RADAR))
+ if (chan->flag & HOSTAPD_CHAN_DISABLED)
continue;
+ if (chan->flag & (HOSTAPD_CHAN_RADAR |
+ HOSTAPD_CHAN_NO_IR))
+ if (!dfs_enabled)
+ continue;
/* Found a suitable second segment for 80+80 */
chwidth = CONF_OPER_CHWIDTH_80P80MHZ;
@@ -3216,12 +3228,17 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
int ieee80211_mode = wpas_mode_to_ieee80211_mode(ssid->mode);
enum hostapd_hw_mode hw_mode;
struct hostapd_hw_modes *mode = NULL;
- int obss_scan = 1;
+ int obss_scan = !(ssid->noscan);
u8 channel;
bool is_6ghz, is_24ghz;
+ bool dfs_enabled = wpa_s->conf->country[0] && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR);
freq->freq = ssid->frequency;
+ if (ssid->fixed_freq) {
+ obss_scan = 0;
+ }
+
if (ssid->mode == WPAS_MODE_IBSS && !ssid->fixed_freq) {
struct wpa_bss *bss = ibss_find_existing_bss(wpa_s, ssid);
@@ -3259,11 +3276,13 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
freq->he_enabled = ibss_mesh_can_use_he(wpa_s, ssid, mode,
ieee80211_mode);
freq->channel = channel;
+ if (mode->mode == HOSTAPD_MODE_IEEE80211G && ssid->noscan)
+ ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan, dfs_enabled);
/* Setup higher BW only for 5 GHz */
if (mode->mode == HOSTAPD_MODE_IEEE80211A) {
- ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan);
+ ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan, dfs_enabled);
if (!ibss_mesh_select_80_160mhz(wpa_s, ssid, mode, freq,
- ieee80211_mode, is_6ghz))
+ ieee80211_mode, is_6ghz, dfs_enabled))
freq->he_enabled = freq->vht_enabled = false;
}
@@ -4449,6 +4468,12 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
params.beacon_int = ssid->beacon_int;
else
params.beacon_int = wpa_s->conf->beacon_int;
+ int i = 0;
+ while (i < WLAN_SUPP_RATES_MAX) {
+ params.rates[i] = ssid->rates[i];
+ i++;
+ }
+ params.mcast_rate = ssid->mcast_rate;
}
if (bss && ssid->enable_edmg)
@@ -6093,7 +6118,7 @@ wpa_supplicant_alloc(struct wpa_supplicant *parent)
if (wpa_s == NULL)
return NULL;
wpa_s->scan_req = INITIAL_SCAN_REQ;
- wpa_s->scan_interval = 5;
+ wpa_s->scan_interval = 1;
wpa_s->new_connection = 1;
wpa_s->parent = parent ? parent : wpa_s;
wpa_s->p2pdev = wpa_s->parent;
@@ -7809,7 +7834,6 @@ struct wpa_interface * wpa_supplicant_match_iface(struct wpa_global *global,
return NULL;
}
-
/**
* wpa_supplicant_match_existing - Match existing interfaces
* @global: Pointer to global data from wpa_supplicant_init()
@@ -7844,6 +7868,11 @@ static int wpa_supplicant_match_existing(struct wpa_global *global)
#endif /* CONFIG_MATCH_IFACE */
+extern void supplicant_event(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data);
+
+extern void supplicant_event_global(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data);
/**
* wpa_supplicant_add_iface - Add a new network interface
@@ -7926,6 +7955,9 @@ struct wpa_supplicant * wpa_supplicant_add_iface(struct wpa_global *global,
}
#endif /* CONFIG_P2P */
+ wpas_ubus_add_bss(wpa_s);
+ wpas_ucode_add_bss(wpa_s);
+
return wpa_s;
}
@@ -7952,6 +7984,9 @@ int wpa_supplicant_remove_iface(struct wpa_global *global,
struct wpa_supplicant *parent = wpa_s->parent;
#endif /* CONFIG_MESH */
+ wpas_ucode_free_bss(wpa_s);
+ wpas_ubus_free_bss(wpa_s);
+
/* Remove interface from the global list of interfaces */
prev = global->ifaces;
if (prev == wpa_s) {
@@ -8100,6 +8135,8 @@ struct wpa_global * wpa_supplicant_init(struct wpa_params *params)
#ifndef CONFIG_NO_WPA_MSG
wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
#endif /* CONFIG_NO_WPA_MSG */
+ wpa_supplicant_event = supplicant_event;
+ wpa_supplicant_event_global = supplicant_event_global;
if (params->wpa_debug_file_path)
wpa_debug_open_file(params->wpa_debug_file_path);
@@ -8258,6 +8295,7 @@ struct wpa_global * wpa_supplicant_init(struct wpa_params *params)
eloop_register_timeout(WPA_SUPPLICANT_CLEANUP_INTERVAL, 0,
wpas_periodic, global, NULL);
+ wpas_ucode_init(global);
return global;
}
@@ -8330,6 +8368,8 @@ void wpa_supplicant_deinit(struct wpa_global *global)
wpas_notify_supplicant_deinitialized(global);
+ wpas_ucode_free();
+
eap_peer_unregister_methods();
#ifdef CONFIG_AP
eap_server_unregister_methods();
diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 48ec95fa5..952a3bd5a 100644
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -21,6 +21,8 @@
#include "config_ssid.h"
#include "wmm_ac.h"
#include "pasn/pasn_common.h"
+#include "ubus.h"
+#include "ucode.h"
extern const char *const wpa_supplicant_version;
extern const char *const wpa_supplicant_license;
@@ -319,6 +321,8 @@ struct wpa_global {
#endif /* CONFIG_WIFI_DISPLAY */
struct psk_list_entry *add_psk; /* From group formation */
+
+ struct ubus_object ubus_global;
};
@@ -693,6 +697,8 @@ struct wpa_supplicant {
unsigned char own_addr[ETH_ALEN];
unsigned char perm_addr[ETH_ALEN];
char ifname[100];
+ struct wpas_ubus_bss ubus;
+ struct wpas_ucode_bss ucode;
#ifdef CONFIG_MATCH_IFACE
int matched;
#endif /* CONFIG_MATCH_IFACE */
diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 7b9cf7f9e..03748f4bb 100644
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -33,6 +33,7 @@
#include "p2p/p2p.h"
#include "p2p_supplicant.h"
#include "wps_supplicant.h"
+#include "ubus.h"
#ifndef WPS_PIN_SCAN_IGNORE_SEL_REG
@@ -401,6 +402,8 @@ static int wpa_supplicant_wps_cred(void *ctx,
wpa_hexdump_key(MSG_DEBUG, "WPS: Received Credential attribute",
cred->cred_attr, cred->cred_attr_len);
+ wpas_ubus_notify(wpa_s, cred);
+
if (wpa_s->conf->wps_cred_processing == 1)
return 0;
diff --git a/wpa_supplicant/wps_supplicant.h b/wpa_supplicant/wps_supplicant.h
index aae3f7cb5..30b4e9105 100644
--- a/wpa_supplicant/wps_supplicant.h
+++ b/wpa_supplicant/wps_supplicant.h
@@ -9,6 +9,7 @@
#ifndef WPS_SUPPLICANT_H
#define WPS_SUPPLICANT_H
+struct wpa_bss;
struct wpa_scan_results;
#ifdef CONFIG_WPS
@@ -16,8 +17,6 @@ struct wpa_scan_results;
#include "wps/wps.h"
#include "wps/wps_defs.h"
-struct wpa_bss;
-
struct wps_new_ap_settings {
const char *ssid_hex;
const char *auth;
--
2.18.0