Unverified Commit 2a0aaa7e authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #245413 from oddlama/fix-hostapd-mac-allow

parents 868ced9c 0ac2ba76

nixos/modules/services/networking/hostapd.nix

+2 −5
Original line number Diff line number Diff line
@@ -921,9 +921,7 @@ in { 
                };



                config = let

                  bss = bssSubmod.name;

                  bssCfg = bssSubmod.config;



                  pairwiseCiphers =

                    concatStringsSep " " (unique (bssCfg.authentication.pairwiseCiphers

                      ++ optionals bssCfg.authentication.enableRecommendedPairwiseCiphers ["CCMP" "CCMP-256" "GCMP" "GCMP-256"]));
@@ -964,9 +962,9 @@ in { 
                  } // optionalAttrs (bssCfg.bssid != null) {

                    bssid = bssCfg.bssid;

                  } // optionalAttrs (bssCfg.macAllow != [] || bssCfg.macAllowFile != null || bssCfg.authentication.saeAddToMacAllow) {

                    accept_mac_file = "/run/hostapd/${bss}.mac.allow";

                    accept_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.allow";

                  } // optionalAttrs (bssCfg.macDeny != [] || bssCfg.macDenyFile != null) {

                    deny_mac_file = "/run/hostapd/${bss}.mac.deny";

                    deny_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.deny";

                  } // optionalAttrs (bssCfg.authentication.mode == "none") {

                    wpa = mkDefault 0;

                  } // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae") {
@@ -1051,7 +1049,6 @@ in { 
          };



          config.settings = let

            radio = radioSubmod.name;

            radioCfg = radioSubmod.config;

          in {

            driver = radioCfg.driver;

nixos/tests/wpa_supplicant.nix

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: 
              ssid = "nixos-test-mixed";

              authentication = {

                mode = "wpa3-sae-transition";

                saeAddToMacAllow = true;

                saePasswordsFile = pkgs.writeText "password" "reproducibility";

                wpaPasswordFile = pkgs.writeText "password" "reproducibility";

              };