All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/5] doc: add CONFIG_DRIVER_NONE to hostapd config
@ 2019-12-30 18:09 James Prestwood
  2019-12-30 18:09 ` [PATCH 2/5] test-runner: add special radius_server key James Prestwood
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: James Prestwood @ 2019-12-30 18:09 UTC (permalink / raw)
  To: iwd

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

This allows hostapd to be started as a standalone radius server
---
 doc/hostapd.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/hostapd.config b/doc/hostapd.config
index cf88386e..2ad99b8a 100644
--- a/doc/hostapd.config
+++ b/doc/hostapd.config
@@ -1,5 +1,6 @@
 CONFIG_DRIVER_HOSTAP=y
 CONFIG_DRIVER_NL80211=y
+CONFIG_DRIVER_NONE=y
 CONFIG_LIBNL32=y
 CONFIG_IAPP=y
 CONFIG_RSN_PREAUTH=y
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 2/5] test-runner: add special radius_server key
  2019-12-30 18:09 [PATCH 1/5] doc: add CONFIG_DRIVER_NONE to hostapd config James Prestwood
@ 2019-12-30 18:09 ` James Prestwood
  2019-12-30 18:09 ` [PATCH 3/5] auto-t: use stand alone radius server for testFILS James Prestwood
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: James Prestwood @ 2019-12-30 18:09 UTC (permalink / raw)
  To: iwd

[-- Attachment #1: Type: text/plain, Size: 995 bytes --]

Some test cases require (at least with recent hostapd versions) a
stand alone radius server. This is done using driver=none in the
hostapd config file. For this use case hostapd does not need any
radio since its not doing anything wireless related.

Now inside the hw.conf file, under the HOSTAPD group, you can
specify a config file as the value to 'radius_server' key. This
config file will be used without any associated radio when hostapd
is started.
---
 tools/test-runner.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/test-runner.c b/tools/test-runner.c
index 71c5f14e..6a3a2932 100644
--- a/tools/test-runner.c
+++ b/tools/test-runner.c
@@ -1398,6 +1398,9 @@ static bool configure_hostapd_instances(struct l_settings *hw_settings,
 			goto done;
 		}
 
+		if (!strcmp(hostap_keys[i], "radius_server"))
+			continue;
+
 		for (wiphy_entry = l_queue_get_entries(wiphy_list);
 					wiphy_entry;
 					wiphy_entry = wiphy_entry->next,
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 3/5] auto-t: use stand alone radius server for testFILS
  2019-12-30 18:09 [PATCH 1/5] doc: add CONFIG_DRIVER_NONE to hostapd config James Prestwood
  2019-12-30 18:09 ` [PATCH 2/5] test-runner: add special radius_server key James Prestwood
@ 2019-12-30 18:09 ` James Prestwood
  2019-12-30 18:09 ` [PATCH 4/5] auto-t: use stand alone radius server for testFT-FILS-SHA256 James Prestwood
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: James Prestwood @ 2019-12-30 18:09 UTC (permalink / raw)
  To: iwd

[-- Attachment #1: Type: text/plain, Size: 2381 bytes --]

This fixes the test with recent hostapd versions
---
 autotests/testFILS/hw.conf           |  1 +
 autotests/testFILS/radius.conf       | 15 +++++++++++++++
 autotests/testFILS/ssidFILS-256.conf |  8 --------
 autotests/testFILS/ssidFILS-384.conf |  6 ------
 4 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 autotests/testFILS/radius.conf

diff --git a/autotests/testFILS/hw.conf b/autotests/testFILS/hw.conf
index 0028b5f6..3b88f36f 100644
--- a/autotests/testFILS/hw.conf
+++ b/autotests/testFILS/hw.conf
@@ -7,3 +7,4 @@ start_iwd=0
 [HOSTAPD]
 rad0=ssidFILS-256.conf
 rad1=ssidFILS-384.conf
+radius_server=radius.conf
diff --git a/autotests/testFILS/radius.conf b/autotests/testFILS/radius.conf
new file mode 100644
index 00000000..4fcfdfff
--- /dev/null
+++ b/autotests/testFILS/radius.conf
@@ -0,0 +1,15 @@
+driver=none
+radius_server_clients=/tmp/certs/radius-clients.text
+radius_server_auth_port=1812
+eap_user_file=/tmp/pwd.eap_user
+eap_server=0
+eap_server_erp=1
+
+erp_send_reauth_start=1
+erp_domain=example.com
+fils_realm=example.com
+disable_pmksa_caching=1
+
+pwd_group=19
+wpa_group_rekey=30
+wpa_ptk_rekey=30
diff --git a/autotests/testFILS/ssidFILS-256.conf b/autotests/testFILS/ssidFILS-256.conf
index b3f3139a..a5f70f3a 100644
--- a/autotests/testFILS/ssidFILS-256.conf
+++ b/autotests/testFILS/ssidFILS-256.conf
@@ -14,16 +14,8 @@ auth_server_port=1812
 auth_server_shared_secret=secret
 nas_identifier=nas.w1.fi
 
-erp_send_reauth_start=1
-erp_domain=example.com
 fils_realm=example.com
 disable_pmksa_caching=1
 
-radius_server_clients=/tmp/certs/radius-clients.text
-radius_server_auth_port=1812
-eap_server=0
-eap_user_file=/tmp/pwd.eap_user
-eap_server_erp=1
-pwd_group=19
 wpa_group_rekey=30
 wpa_ptk_rekey=30
diff --git a/autotests/testFILS/ssidFILS-384.conf b/autotests/testFILS/ssidFILS-384.conf
index 9a3a3059..613c37be 100644
--- a/autotests/testFILS/ssidFILS-384.conf
+++ b/autotests/testFILS/ssidFILS-384.conf
@@ -14,14 +14,8 @@ auth_server_port=1812
 auth_server_shared_secret=secret
 nas_identifier=nas.w1.fi
 
-erp_send_reauth_start=1
-erp_domain=example.com
 fils_realm=example.com
 disable_pmksa_caching=1
 
-eap_server=0
-eap_user_file=/tmp/pwd.eap_user
-eap_server_erp=1
-pwd_group=19
 wpa_group_rekey=30
 wpa_ptk_rekey=30
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 4/5] auto-t: use stand alone radius server for testFT-FILS-SHA256
  2019-12-30 18:09 [PATCH 1/5] doc: add CONFIG_DRIVER_NONE to hostapd config James Prestwood
  2019-12-30 18:09 ` [PATCH 2/5] test-runner: add special radius_server key James Prestwood
  2019-12-30 18:09 ` [PATCH 3/5] auto-t: use stand alone radius server for testFILS James Prestwood
@ 2019-12-30 18:09 ` James Prestwood
  2019-12-30 18:09 ` [PATCH 5/5] auto-t: use stand alone radius server for testFT-FILS-SHA384 James Prestwood
  2020-01-06 17:20 ` [PATCH 1/5] doc: add CONFIG_DRIVER_NONE to hostapd config Denis Kenzior
  4 siblings, 0 replies; 6+ messages in thread
From: James Prestwood @ 2019-12-30 18:09 UTC (permalink / raw)
  To: iwd

[-- Attachment #1: Type: text/plain, Size: 3058 bytes --]

This fixes the test with recent hostapd versions
---
 autotests/testFT-FILS-SHA256/ft-eap-ccmp-1.conf | 14 ++------------
 autotests/testFT-FILS-SHA256/ft-eap-ccmp-2.conf | 11 ++---------
 autotests/testFT-FILS-SHA256/hw.conf            |  1 +
 autotests/testFT-FILS-SHA256/radius.conf        | 15 +++++++++++++++
 4 files changed, 20 insertions(+), 21 deletions(-)
 create mode 100644 autotests/testFT-FILS-SHA256/radius.conf

diff --git a/autotests/testFT-FILS-SHA256/ft-eap-ccmp-1.conf b/autotests/testFT-FILS-SHA256/ft-eap-ccmp-1.conf
index a55d90a2..1853ff70 100644
--- a/autotests/testFT-FILS-SHA256/ft-eap-ccmp-1.conf
+++ b/autotests/testFT-FILS-SHA256/ft-eap-ccmp-1.conf
@@ -12,16 +12,9 @@ wpa=2
 wpa_key_mgmt=FT-EAP FILS-SHA256 FT-FILS-SHA256
 wpa_pairwise=CCMP
 ieee8021x=1
-eap_server=0
-eap_server_erp=1
-erp_domain=example.com
+
 fils_realm=example.com
-#eap_user_file=/tmp/certs/eap-user-tls.text
-eap_user_file=/tmp/pwd.eap_user
-pwd_group=19
-#ca_cert=/tmp/certs/cert-ca.pem
-#server_cert=/tmp/certs/cert-server.pem
-#private_key=/tmp/certs/cert-server-key.pem
+
 wpa_ptk_rekey=30
 wpa_group_rekey=80
 ieee80211w=1
@@ -43,9 +36,6 @@ ap_table_expiration_time=36000
 ap_table_max_size=10
 rrm_neighbor_report=1
 
-radius_server_clients=/tmp/certs/radius-clients.text
-radius_server_auth_port=1812
-
 auth_server_addr=127.0.0.1
 auth_server_port=1812
 auth_server_shared_secret=secret
diff --git a/autotests/testFT-FILS-SHA256/ft-eap-ccmp-2.conf b/autotests/testFT-FILS-SHA256/ft-eap-ccmp-2.conf
index a7878264..24266ea9 100644
--- a/autotests/testFT-FILS-SHA256/ft-eap-ccmp-2.conf
+++ b/autotests/testFT-FILS-SHA256/ft-eap-ccmp-2.conf
@@ -12,16 +12,9 @@ wpa=2
 wpa_key_mgmt=FT-FILS-SHA256
 wpa_pairwise=CCMP
 ieee8021x=1
-eap_server=0
-eap_server_erp=1
-erp_domain=example.com
+
 fils_realm=example.com
-#eap_user_file=/tmp/certs/eap-user-tls.text
-eap_user_file=/tmp/pwd.eap_user
-pwd_group=19
-#ca_cert=/tmp/certs/cert-ca.pem
-#server_cert=/tmp/certs/cert-server.pem
-#private_key=/tmp/certs/cert-server-key.pem
+
 wpa_ptk_rekey=30
 wpa_group_rekey=80
 ieee80211w=1
diff --git a/autotests/testFT-FILS-SHA256/hw.conf b/autotests/testFT-FILS-SHA256/hw.conf
index 9ea4f110..b5c6757c 100644
--- a/autotests/testFT-FILS-SHA256/hw.conf
+++ b/autotests/testFT-FILS-SHA256/hw.conf
@@ -7,3 +7,4 @@ iwd_config_dir=/tmp
 [HOSTAPD]
 rad0=ft-eap-ccmp-1.conf
 rad1=ft-eap-ccmp-2.conf
+radius_server=radius.conf
diff --git a/autotests/testFT-FILS-SHA256/radius.conf b/autotests/testFT-FILS-SHA256/radius.conf
new file mode 100644
index 00000000..4fcfdfff
--- /dev/null
+++ b/autotests/testFT-FILS-SHA256/radius.conf
@@ -0,0 +1,15 @@
+driver=none
+radius_server_clients=/tmp/certs/radius-clients.text
+radius_server_auth_port=1812
+eap_user_file=/tmp/pwd.eap_user
+eap_server=0
+eap_server_erp=1
+
+erp_send_reauth_start=1
+erp_domain=example.com
+fils_realm=example.com
+disable_pmksa_caching=1
+
+pwd_group=19
+wpa_group_rekey=30
+wpa_ptk_rekey=30
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 5/5] auto-t: use stand alone radius server for testFT-FILS-SHA384
  2019-12-30 18:09 [PATCH 1/5] doc: add CONFIG_DRIVER_NONE to hostapd config James Prestwood
                   ` (2 preceding siblings ...)
  2019-12-30 18:09 ` [PATCH 4/5] auto-t: use stand alone radius server for testFT-FILS-SHA256 James Prestwood
@ 2019-12-30 18:09 ` James Prestwood
  2020-01-06 17:20 ` [PATCH 1/5] doc: add CONFIG_DRIVER_NONE to hostapd config Denis Kenzior
  4 siblings, 0 replies; 6+ messages in thread
From: James Prestwood @ 2019-12-30 18:09 UTC (permalink / raw)
  To: iwd

[-- Attachment #1: Type: text/plain, Size: 3058 bytes --]

This fixes the test with recent hostapd versions
---
 autotests/testFT-FILS-SHA384/ft-eap-ccmp-1.conf | 14 ++------------
 autotests/testFT-FILS-SHA384/ft-eap-ccmp-2.conf | 11 ++---------
 autotests/testFT-FILS-SHA384/hw.conf            |  1 +
 autotests/testFT-FILS-SHA384/radius.conf        | 15 +++++++++++++++
 4 files changed, 20 insertions(+), 21 deletions(-)
 create mode 100644 autotests/testFT-FILS-SHA384/radius.conf

diff --git a/autotests/testFT-FILS-SHA384/ft-eap-ccmp-1.conf b/autotests/testFT-FILS-SHA384/ft-eap-ccmp-1.conf
index ae1d4bfe..61262c69 100644
--- a/autotests/testFT-FILS-SHA384/ft-eap-ccmp-1.conf
+++ b/autotests/testFT-FILS-SHA384/ft-eap-ccmp-1.conf
@@ -12,16 +12,9 @@ wpa=2
 wpa_key_mgmt=FT-EAP FILS-SHA384 FT-FILS-SHA384
 wpa_pairwise=CCMP
 ieee8021x=1
-eap_server=0
-eap_server_erp=1
-erp_domain=example.com
+
 fils_realm=example.com
-#eap_user_file=/tmp/certs/eap-user-tls.text
-eap_user_file=/tmp/pwd.eap_user
-pwd_group=19
-#ca_cert=/tmp/certs/cert-ca.pem
-#server_cert=/tmp/certs/cert-server.pem
-#private_key=/tmp/certs/cert-server-key.pem
+
 wpa_ptk_rekey=30
 wpa_group_rekey=80
 ieee80211w=1
@@ -43,9 +36,6 @@ ap_table_expiration_time=36000
 ap_table_max_size=10
 rrm_neighbor_report=1
 
-radius_server_clients=/tmp/certs/radius-clients.text
-radius_server_auth_port=1812
-
 auth_server_addr=127.0.0.1
 auth_server_port=1812
 auth_server_shared_secret=secret
diff --git a/autotests/testFT-FILS-SHA384/ft-eap-ccmp-2.conf b/autotests/testFT-FILS-SHA384/ft-eap-ccmp-2.conf
index 0c4deee8..8af73cbc 100644
--- a/autotests/testFT-FILS-SHA384/ft-eap-ccmp-2.conf
+++ b/autotests/testFT-FILS-SHA384/ft-eap-ccmp-2.conf
@@ -12,16 +12,9 @@ wpa=2
 wpa_key_mgmt=FT-FILS-SHA384
 wpa_pairwise=CCMP
 ieee8021x=1
-eap_server=0
-eap_server_erp=1
-erp_domain=example.com
+
 fils_realm=example.com
-#eap_user_file=/tmp/certs/eap-user-tls.text
-eap_user_file=/tmp/pwd.eap_user
-pwd_group=19
-#ca_cert=/tmp/certs/cert-ca.pem
-#server_cert=/tmp/certs/cert-server.pem
-#private_key=/tmp/certs/cert-server-key.pem
+
 wpa_ptk_rekey=30
 wpa_group_rekey=80
 ieee80211w=1
diff --git a/autotests/testFT-FILS-SHA384/hw.conf b/autotests/testFT-FILS-SHA384/hw.conf
index 9ea4f110..b5c6757c 100644
--- a/autotests/testFT-FILS-SHA384/hw.conf
+++ b/autotests/testFT-FILS-SHA384/hw.conf
@@ -7,3 +7,4 @@ iwd_config_dir=/tmp
 [HOSTAPD]
 rad0=ft-eap-ccmp-1.conf
 rad1=ft-eap-ccmp-2.conf
+radius_server=radius.conf
diff --git a/autotests/testFT-FILS-SHA384/radius.conf b/autotests/testFT-FILS-SHA384/radius.conf
new file mode 100644
index 00000000..4fcfdfff
--- /dev/null
+++ b/autotests/testFT-FILS-SHA384/radius.conf
@@ -0,0 +1,15 @@
+driver=none
+radius_server_clients=/tmp/certs/radius-clients.text
+radius_server_auth_port=1812
+eap_user_file=/tmp/pwd.eap_user
+eap_server=0
+eap_server_erp=1
+
+erp_send_reauth_start=1
+erp_domain=example.com
+fils_realm=example.com
+disable_pmksa_caching=1
+
+pwd_group=19
+wpa_group_rekey=30
+wpa_ptk_rekey=30
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/5] doc: add CONFIG_DRIVER_NONE to hostapd config
  2019-12-30 18:09 [PATCH 1/5] doc: add CONFIG_DRIVER_NONE to hostapd config James Prestwood
                   ` (3 preceding siblings ...)
  2019-12-30 18:09 ` [PATCH 5/5] auto-t: use stand alone radius server for testFT-FILS-SHA384 James Prestwood
@ 2020-01-06 17:20 ` Denis Kenzior
  4 siblings, 0 replies; 6+ messages in thread
From: Denis Kenzior @ 2020-01-06 17:20 UTC (permalink / raw)
  To: iwd

[-- Attachment #1: Type: text/plain, Size: 247 bytes --]

Hi James,

On 12/30/19 12:09 PM, James Prestwood wrote:
> This allows hostapd to be started as a standalone radius server
> ---
>   doc/hostapd.config | 1 +
>   1 file changed, 1 insertion(+)
> 

All applied, thanks.

Regards,
-Denis

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-01-06 17:20 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-30 18:09 [PATCH 1/5] doc: add CONFIG_DRIVER_NONE to hostapd config James Prestwood
2019-12-30 18:09 ` [PATCH 2/5] test-runner: add special radius_server key James Prestwood
2019-12-30 18:09 ` [PATCH 3/5] auto-t: use stand alone radius server for testFILS James Prestwood
2019-12-30 18:09 ` [PATCH 4/5] auto-t: use stand alone radius server for testFT-FILS-SHA256 James Prestwood
2019-12-30 18:09 ` [PATCH 5/5] auto-t: use stand alone radius server for testFT-FILS-SHA384 James Prestwood
2020-01-06 17:20 ` [PATCH 1/5] doc: add CONFIG_DRIVER_NONE to hostapd config Denis Kenzior

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.