From f89d1fcffbdc62375b286bfab40b075e352b42f8 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 12 Sep 2022 21:41:40 +0200
Subject: [PATCH] pkgs/openwrt: enable wpa3 and owe

---
 nix/pkgs/openwrt/default.nix    | 3 +++
 nix/pkgs/openwrt/uci-config.nix | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nix/pkgs/openwrt/default.nix b/nix/pkgs/openwrt/default.nix
index 3ad0377..a93c230 100644
--- a/nix/pkgs/openwrt/default.nix
+++ b/nix/pkgs/openwrt/default.nix
@@ -72,6 +72,9 @@ in rec {
             # monitoring
             "collectd" "collectd-mod-interface" "collectd-mod-load"
             "collectd-mod-cpu" "collectd-mod-iwinfo" "collectd-mod-network"
+            # wpa3
+            "-wpad-basic-wolfssl"
+            "wpad-openssl"
           ] ++ modelPackages.${model} or [];
           disabledServices = [ "dnsmasq" "uhttpd" ];
           files = pkgs.runCommandNoCC "image-files" {} ''
diff --git a/nix/pkgs/openwrt/uci-config.nix b/nix/pkgs/openwrt/uci-config.nix
index 2f47663..74845ce 100644
--- a/nix/pkgs/openwrt/uci-config.nix
+++ b/nix/pkgs/openwrt/uci-config.nix
@@ -277,11 +277,11 @@ in
           uci set wireless.@wifi-iface[-1].mcast_rate=18000
           ${if (ssidConfig.psk != null)
             then ''
-              uci set wireless.@wifi-iface[-1].encryption=psk2
+              uci set wireless.@wifi-iface[-1].encryption='sae-mixed'
               uci set wireless.@wifi-iface[-1].key='${ssidConfig.psk}'
             ''
             else ''
-              uci set wireless.@wifi-iface[-1].encryption=none
+              uci set wireless.@wifi-iface[-1].encryption='owe'
               uci -q delete wireless.@wifi-iface[-1].key || true
             ''}
         ''