From 3641cfe30ecbececf208832a56f5736777aa94c0 Mon Sep 17 00:00:00 2001
From: James Prestwood <james.prestwood@linux.intel.com>
Date: Fri, 22 Mar 2019 09:23:12 -0700
Subject: [PATCH] auto-t: update SAE tests to use MFP/CCMP

---
 autotests/testFT-SAE-roam/ft-psk-3.conf | 2 +-
 autotests/testFT-SAE-roam/ft-sae-1.conf | 2 +-
 autotests/testFT-SAE-roam/ft-sae-2.conf | 2 +-
 autotests/testSAE/ssidSAE-20.conf       | 2 ++
 autotests/testSAE/ssidSAE-Clogging.conf | 2 ++
 autotests/testSAE/ssidSAE.conf          | 2 ++
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/autotests/testFT-SAE-roam/ft-psk-3.conf b/autotests/testFT-SAE-roam/ft-psk-3.conf
index d4710de6..56aa7768 100644
--- a/autotests/testFT-SAE-roam/ft-psk-3.conf
+++ b/autotests/testFT-SAE-roam/ft-psk-3.conf
@@ -15,7 +15,7 @@ wpa_pairwise=CCMP
 wpa_passphrase=EasilyGuessedPassword
 wpa_ptk_rekey=30
 wpa_group_rekey=80
-ieee80211w=1
+ieee80211w=2
 rsn_preauth=1
 rsn_preauth_interfaces=lo
 disable_pmksa_caching=0
diff --git a/autotests/testFT-SAE-roam/ft-sae-1.conf b/autotests/testFT-SAE-roam/ft-sae-1.conf
index 950c17ae..214e7e23 100644
--- a/autotests/testFT-SAE-roam/ft-sae-1.conf
+++ b/autotests/testFT-SAE-roam/ft-sae-1.conf
@@ -15,7 +15,7 @@ sae_password=EasilyGuessedPassword|mac=ff:ff:ff:ff:ff:ff
 wpa_pairwise=CCMP
 wpa_ptk_rekey=30
 wpa_group_rekey=80
-ieee80211w=1
+ieee80211w=2
 rsn_preauth=1
 rsn_preauth_interfaces=lo
 disable_pmksa_caching=0
diff --git a/autotests/testFT-SAE-roam/ft-sae-2.conf b/autotests/testFT-SAE-roam/ft-sae-2.conf
index c2f58cfa..c651f9d1 100644
--- a/autotests/testFT-SAE-roam/ft-sae-2.conf
+++ b/autotests/testFT-SAE-roam/ft-sae-2.conf
@@ -15,7 +15,7 @@ sae_password=EasilyGuessedPassword|mac=ff:ff:ff:ff:ff:ff
 wpa_pairwise=CCMP
 wpa_ptk_rekey=30
 wpa_group_rekey=80
-ieee80211w=1
+ieee80211w=2
 rsn_preauth=1
 rsn_preauth_interfaces=lo
 disable_pmksa_caching=0
diff --git a/autotests/testSAE/ssidSAE-20.conf b/autotests/testSAE/ssidSAE-20.conf
index e07d5f74..895682cf 100644
--- a/autotests/testSAE/ssidSAE-20.conf
+++ b/autotests/testSAE/ssidSAE-20.conf
@@ -4,5 +4,7 @@ ssid=ssidSAE-20
 
 wpa=2
 wpa_key_mgmt=SAE
+wpa_pairwise=CCMP
 sae_password=secret123|mac=ff:ff:ff:ff:ff:ff
 sae_groups=20
+ieee80211w=2
diff --git a/autotests/testSAE/ssidSAE-Clogging.conf b/autotests/testSAE/ssidSAE-Clogging.conf
index 4298bed4..1a96d152 100644
--- a/autotests/testSAE/ssidSAE-Clogging.conf
+++ b/autotests/testSAE/ssidSAE-Clogging.conf
@@ -4,5 +4,7 @@ ssid=ssidSAE-Clogging
 
 wpa=2
 wpa_key_mgmt=SAE
+wpa_pairwise=CCMP
 sae_password=secret123|mac=ff:ff:ff:ff:ff:ff
 sae_anti_clogging_threshold=2
+ieee80211w=2
diff --git a/autotests/testSAE/ssidSAE.conf b/autotests/testSAE/ssidSAE.conf
index 1d11fe16..0c6c807d 100644
--- a/autotests/testSAE/ssidSAE.conf
+++ b/autotests/testSAE/ssidSAE.conf
@@ -4,4 +4,6 @@ ssid=ssidSAE
 
 wpa=2
 wpa_key_mgmt=SAE
+wpa_pairwise=CCMP
 sae_password=secret123|mac=ff:ff:ff:ff:ff:ff
+ieee80211w=2