From patchwork Mon May 13 18:00:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 13663612 Received: from mail-oa1-f54.google.com (mail-oa1-f54.google.com [209.85.160.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 973A137700 for ; Mon, 13 May 2024 18:00:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715623250; cv=none; b=K761Irsla0EJWlq9zL8dekLkUhxTLp8/dctR6cn2WpSOEbB1JYBq/V72fF6tKDd1Cwq6lcY4g8IbJ16Hb0bdcvKnSUPEHYBnrmhJyh5kIvduakleCDHOuu3yYC9giGWyH6dSnL7psFXLb24QGabmJinWbPKfZngg2nrfQ/7eMjU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715623250; c=relaxed/simple; bh=ucloBuCvVMvE66xJZC3/wXA+1i0GwEMEZp5z4qEYZgk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=swAOqR0V23DSfKUP5+GfPy08iSvtNmPxUESWVtCy/v3po3UjMUtD7ErrTY4FZT7viMxgibqei5VZbPFA//jZCf20EFLSIpH6DnqOIneTV2PIYchKpk8CCGvUI6/tK9pH7WFj8qF6/H5ZgavkCqLnKprNJNnSJ4riJeCOMNs0D94= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=K+9rmB7w; arc=none smtp.client-ip=209.85.160.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="K+9rmB7w" Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-23f9d07829bso2496775fac.3 for ; Mon, 13 May 2024 11:00:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715623247; x=1716228047; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5l3mf1Ku8B/DFLJvIYPwJHk5PcutLzNsCUAJMGmkDfk=; b=K+9rmB7wdRwAZmPkt73TvanQc/WFc8lgTfD8N5HVET8A87Q1n++acOYM4hmv5sElfj faCt/ID1mQy2cSJKyGAEdz/0lIierzHZUxjbgR+sbaiaY9dyrNkKoYlL8ZA3PQ52L37M pF+Ot1TefuorzsWGCKzHDOgyvvfOq7gcvO9IxOgwR+HLD/LeeijUzKkv5Mhu6natjLtd BTuAO9969CtrRS83bYwbecodC3cb8HYCYdCeeVIegMWyr78OQMUoObkH2COgFao4CdfQ oB+j8k1q31lLZxbkmN7gbU32PjDmeyA+PQNDKM6ZvOmShQhIwGUrizJz4JZI64B2eKG6 Yoig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715623247; x=1716228047; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5l3mf1Ku8B/DFLJvIYPwJHk5PcutLzNsCUAJMGmkDfk=; b=MEsq9Szm7vs9s51o90pMvImf4+Eq7hYeTI+5uodBpYmeSzP5S2+t/sZpH/UehUYrOA DalK22PwVN2T6to7+x5AjGM2XJC3FZz8APBt3d5UroOb5PnpvGjq1Q1SBoaiz+ozGMSr i6zvn28QRuUm62C5RCZBou/NxImip7OsModM3mthiVgEnMIem6ZLW5BEP7p/z+/RbWFA I14D0I6sC4QugtajLmLN98Epfg9FGCrblcPMbNe80C8CgejLjXuysfQksSSLmB81yGyd EvGbKb5NcHrt00Gpyk472G6F4nioW7zwfN2rS+Uf7sKnynNzo8gl5bB/LtV23tFbEavj oORA== X-Gm-Message-State: AOJu0YyYDi5C2XQd5A/cyAuLlgLYPs1tA/TFuyktZ6KcWH9x3oDOps8/ 7ocdmw8MAQ1+ffx7IP4tUazgItIY8sajPcvshcPdTeNlb5DKqC5bjMzlUg== X-Google-Smtp-Source: AGHT+IHCEY/EO85ZV8mNNXjn6B+rfIVWSCgAk93K07AZctMqFlA+HH/UFsyvK8ZfuvndU+WTeum/Rg== X-Received: by 2002:a05:6870:9589:b0:23f:2cb:7c12 with SMTP id 586e51a60fabf-24172bd071amr12710459fac.27.1715623247180; Mon, 13 May 2024 11:00:47 -0700 (PDT) Received: from LOCLAP699.rst-02.locus ([208.195.13.130]) by smtp.gmail.com with ESMTPSA id af79cd13be357-792bf2a4b38sm479404385a.66.2024.05.13.11.00.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 11:00:46 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH 1/3] scan: remove force_default_sae_group from scan_bss Date: Mon, 13 May 2024 11:00:40 -0700 Message-Id: <20240513180042.257401-1-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This was added to support a single buggy AP model that failed to negotiate the SAE group correctly. This may still be a problem but since then the [Network].UseDefaultEccGroup option has been added which accomplishes the same thing. Remove the special handling for this specific OUI and rely on the user setting the new option if they have problems. --- src/network.c | 3 +-- src/scan.c | 3 --- src/scan.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/network.c b/src/network.c index 7b996f51..09099fac 100644 --- a/src/network.c +++ b/src/network.c @@ -556,8 +556,7 @@ int network_handshake_setup(struct network *network, struct scan_bss *bss, handshake_state_set_protocol_version(hs, eapol_proto_version); } - hs->force_default_ecc_group = network->force_default_ecc_group || - bss->force_default_sae_group; + hs->force_default_ecc_group = network->force_default_ecc_group; /* * The randomization options in the provisioning file are dependent on diff --git a/src/scan.c b/src/scan.c index f48ffdef..d3f0ad31 100644 --- a/src/scan.c +++ b/src/scan.c @@ -1242,9 +1242,6 @@ static void scan_parse_vendor_specific(struct scan_bss *bss, const void *data, bss->cost_flags = cost_flags; return; } - - if (is_ie_default_sae_group_oui(data, len)) - bss->force_default_sae_group = true; } /* diff --git a/src/scan.h b/src/scan.h index 65caf41c..516b6152 100644 --- a/src/scan.h +++ b/src/scan.h @@ -82,7 +82,6 @@ struct scan_bss { bool vht_capable : 1; bool anqp_capable : 1; bool hs20_capable : 1; - bool force_default_sae_group : 1; bool proxy_arp : 1; bool hs20_dgaf_disable : 1; uint8_t cost_level : 3; From patchwork Mon May 13 18:00:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 13663613 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B981E3771C for ; Mon, 13 May 2024 18:00:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715623251; cv=none; b=hU+pBnwoq1rpwdi61ZM8HaYgnITQnLOs/g5wdv7E/5bKQCJKErxoHLi+LjQwWP/Eg/WtCMqBx7ftRMH3PZCHah5CkVDKIDYqou5QOdo2mYXJjjdZXLdALPozzwMHj63Sm9pabzNpd1vWN9K0b2woYMyWaE2Z5YBmPn58NbuqakA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715623251; c=relaxed/simple; bh=TKWHuG/tbsMV8V76BucLoYhc+rcmGhtQ2T0+f3CTANc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NjGCi2/KC4T4O/Zh/6sd35uB2eW41QD7aaTfXYa4MVw19v/eCMrdON2BiLJ+xd+nEgFKt7mjcshmptksv9K2ulTDBzN/nvLobG5xGctZ6mzz57LTWpyArr+hdX3XWAXDIf6DRooiAu91CDPNXdF/rR1Ml3YLfpkKfTv6y9GGsqw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nfW1m4cl; arc=none smtp.client-ip=209.85.222.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nfW1m4cl" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-792b934de39so419519585a.3 for ; Mon, 13 May 2024 11:00:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715623248; x=1716228048; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=knn2iLBvhcrVipri5wYgGGxxl4wlCeOxBhzDhdyvaIM=; b=nfW1m4clNqv7FNrfl/KMHCwjnFHnzVRmYbmh5PtF5vq0LrbjPrSrfRq333cNLnnMuP PbJJEiYYPb0R1HHlCKwvWwG20iAHadtvohGteyhzjZLqbsP+2w/Yg9hm/t/eHGhSp+DH KfTfWRqFFkRjfRX6uJgPv9nY5vD9B4kWkFdxcKvPKD6xWl7iwc5sLp+YrdhX3CkU1Gj0 D1xs8rl7NAH29qJjj4hgYkuG1A3LwSk+k4YYuB9X3m0tTJOx1Rca3T3a4yJXtiJFr1N6 YFGyvm0ajRqY03IGWcqrTzb8Wodm4gpOjIsoCbED4VI0nj7d4Uet2+54MwZwc5esLEy1 RkAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715623248; x=1716228048; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=knn2iLBvhcrVipri5wYgGGxxl4wlCeOxBhzDhdyvaIM=; b=LsZS6sT3iSKVZwqW2hu40IlhrTAWn6L5hX1BWBwcD39wn3i87oRA+wPHbUdrOZXUNk 2qHV3iPosX2FoXuLO6OuTVvNhPtFVUzbW13OoA685lmpnniljQDQUQgFlxsXDzwMv8OT FEksKS+lR7Z62sQrtkglM4uhf8YPeZqXfdtYBel4TmxOvKp1iybVc3Q7hFKe7pxHoeFp 3t+d3sG8OpUn3sDyAHFBzvd9b6smB6BtIUuGvcoIdY4u8gk5xpmY7cvpgDJiPnnjXuc+ x+kQ4NwTaqOVGVJgJPfGALJaMDESXi1pxU5SYcnVPLn5Egfw2hahJfqbJiKb47L7dQYM +smg== X-Gm-Message-State: AOJu0YyIg6ToEwFStFSD06J9pqSPIE7u3wlfXQzblFoAjZVs9Qb0rf7M Ab4fDWEwMSv5kysn654cCRMM9YclzZsVQFRm0G+focgt2PsWS1Ljeav9vw== X-Google-Smtp-Source: AGHT+IEXMKXjYqey38SrptVyUu6q2u00SMkk8Rou0C7DMEZX3rIvwXPPz1cQi5t3rBfqX4FPXNUumQ== X-Received: by 2002:a05:620a:cc3:b0:792:ad22:68fa with SMTP id af79cd13be357-792c75ff7d9mr984903485a.76.1715623248410; Mon, 13 May 2024 11:00:48 -0700 (PDT) Received: from LOCLAP699.rst-02.locus ([208.195.13.130]) by smtp.gmail.com with ESMTPSA id af79cd13be357-792bf2a4b38sm479404385a.66.2024.05.13.11.00.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 11:00:48 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH 2/3] ie: remove is_ie_default_sae_group_oui Date: Mon, 13 May 2024 11:00:41 -0700 Message-Id: <20240513180042.257401-2-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240513180042.257401-1-prestwoj@gmail.com> References: <20240513180042.257401-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This is no longer used and instead a generic option was added rather than referencing a static OUI list. --- src/ie.c | 26 -------------------------- src/ie.h | 1 - 2 files changed, 27 deletions(-) diff --git a/src/ie.c b/src/ie.c index 86f33f2a..b180291a 100644 --- a/src/ie.c +++ b/src/ie.c @@ -1509,32 +1509,6 @@ bool is_ie_wpa_ie(const uint8_t *data, uint8_t len) return false; } -/* - * List of vendor OUIs (prefixed with a length byte) which require forcing - * the default SAE group. - */ -static const uint8_t use_default_sae_group_ouis[][5] = { - { 0x04, 0xf4, 0xf5, 0xe8, 0x05 }, -}; - -bool is_ie_default_sae_group_oui(const uint8_t *data, uint16_t len) -{ - unsigned int i; - const uint8_t *oui; - - for (i = 0; i < L_ARRAY_SIZE(use_default_sae_group_ouis); i++) { - oui = use_default_sae_group_ouis[i]; - - if (len < oui[0]) - continue; - - if (!memcmp(oui + 1, data, oui[0])) - return true; - } - - return false; -} - int ie_parse_wpa(struct ie_tlv_iter *iter, struct ie_rsn_info *out_info) { const uint8_t *data = iter->data; diff --git a/src/ie.h b/src/ie.h index 9ada64bf..024eacaa 100644 --- a/src/ie.h +++ b/src/ie.h @@ -634,7 +634,6 @@ int ie_parse_wpa_from_data(const uint8_t *data, size_t len, struct ie_rsn_info *info); bool is_ie_wfa_ie(const uint8_t *data, uint8_t len, uint8_t oi_type); bool is_ie_wpa_ie(const uint8_t *data, uint8_t len); -bool is_ie_default_sae_group_oui(const uint8_t *data, uint16_t len); bool ie_build_wpa(const struct ie_rsn_info *info, uint8_t *to); From patchwork Mon May 13 18:00:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 13663614 Received: from mail-oo1-f44.google.com (mail-oo1-f44.google.com [209.85.161.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 14DC82943C for ; Mon, 13 May 2024 18:00:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715623252; cv=none; b=R+P/9N4heBnu74d1TGMraMHgjCPzUaWwdIRnzQzSsU6FRxVaEukyfvj5C42XIpUfnbIinqpFRJuw3IwUT7uPP5w3XdcFzxPkwDKQLBK7SMetuMoMZKcN/GvtOLyHgmzI6N4oJu9xKKwT/MaW26JsjPEEC0zCBL0H+DPOq/FyJP0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715623252; c=relaxed/simple; bh=Ewuy0Wcev3lyoyxQwNdHLbhw+LeMtSPElpSYBESyFFw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kewjqUyUGlZPtSu0hA6Al5QzN2ClCW3rBsWkutPxp1WPKR51WqScEQM/smZRdj0Nu91aZloWShhHCYouZYcXIw6hFZ2vU76eetNVJmFom+zkzPksSN0DhV7Wrghuyua0gUtbto5NqpbAI86bDPlbhJuR/MAV7ir47gExFhphObA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VPrpKZS6; arc=none smtp.client-ip=209.85.161.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VPrpKZS6" Received: by mail-oo1-f44.google.com with SMTP id 006d021491bc7-5b277993a48so2682784eaf.1 for ; Mon, 13 May 2024 11:00:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715623250; x=1716228050; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QvuWI6sqPVihnirRlEtyFP27P6IeDVRAKOxVUGXaxP4=; b=VPrpKZS6Prb2kgK/PwwaC3lDUfOHm3kUgIc+kdWp7dSm15+ERnc61dQw7PeFiNuEWa N4D/jUKZVsXfUXKO0IxCT8dAnP4P3g/FYJHaPHmvC3B2Vo0Oh4XYgQL7uPDQppPuEvHY aleJFLFwWYA+SLlTbITvrIaOPKDJkEyQKdmq749hts2NHVGNO9jUKHLl/8Xw3aKc7tfr NWqqLP2jd6A7EV/TYWwCFGG5G8SQiYAXjdP7zFd5PX449n2O4B/Pjbc3ZAXZJAn8HXmS zH8VRZaTi42C55PdPBlYWqO3kKHbERCBJRnHsr252RJPOjPISwO0Ds4ps5ILIq80FEUM s2Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715623250; x=1716228050; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QvuWI6sqPVihnirRlEtyFP27P6IeDVRAKOxVUGXaxP4=; b=uncd4IlDnWHEcSVwX19Co3WT+OI5tK8Yv+9S3eVBQFpvubgx3lJlB4JnIh43yz+VZ4 6F4Y6gWpOoMDBxTg1oQ1ej9jQZWcQqe5yjzEFRbJTmvads+j7dGrqrRzBhQ0bsn8Wkak KyjCgch2t93vTRrVc+i/38S2pODe4RBOnZElRXammohSMK6msFRAXLntM7l8+0GWoCWK HQyriXjqSKBeXUpXzx+4qIaCdOhKoIUq53W0Wat33If7LZnwkdcnwbWkSkjTWJgCgGdH /KvKNIY83bgMDAzv/gna5l2KQpVVBWYaS5w++MPMgLY7CzF9Ep+8dEzeeQHUH7AX9VPs xn1A== X-Gm-Message-State: AOJu0YwXvh5Mmoza+yUcYIEqtpERvqqt47wPH+ajVkqYtbp1hPevCWPp V8XSfvv8dm8z47vsD02PKZUo5gFRqjwel3FLtMyPBFjwXUT8F/i+dbJa+A== X-Google-Smtp-Source: AGHT+IFqxIHXTh9MkVDhKAU3864xp1d3H9E9T6Xzk7EvWcuTo4CqItIOYHtNtox+sUMQLQN6NCkNPg== X-Received: by 2002:a05:6871:878a:b0:22e:7040:3e00 with SMTP id 586e51a60fabf-24172a23576mr13483712fac.8.1715623249845; Mon, 13 May 2024 11:00:49 -0700 (PDT) Received: from LOCLAP699.rst-02.locus ([208.195.13.130]) by smtp.gmail.com with ESMTPSA id af79cd13be357-792bf2a4b38sm479404385a.66.2024.05.13.11.00.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 11:00:49 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH 3/3] auto-t: remove default group SAE test for specific OUI Date: Mon, 13 May 2024 11:00:42 -0700 Message-Id: <20240513180042.257401-3-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240513180042.257401-1-prestwoj@gmail.com> References: <20240513180042.257401-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There are already tests for UseDefaultEccGroup and this test is not longer valid as the static OUI list has been removed. --- autotests/testSAE/connection_test.py | 7 ------- autotests/testSAE/hw.conf | 3 +-- autotests/testSAE/ssidSAE-default-group.conf | 12 ------------ 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 autotests/testSAE/ssidSAE-default-group.conf diff --git a/autotests/testSAE/connection_test.py b/autotests/testSAE/connection_test.py index f7776385..107daa55 100644 --- a/autotests/testSAE/connection_test.py +++ b/autotests/testSAE/connection_test.py @@ -52,12 +52,6 @@ class Test(unittest.TestCase): self.hostapd.wait_for_event("AP-ENABLED") self.validate_connection(self.wd, "ssidSAE", self.hostapd, 19) - def test_SAE_force_group_19(self): - # Vendor data from APs which require group 19 be used first - self.hostapd.reload() - self.hostapd.wait_for_event("AP-ENABLED") - self.validate_connection(self.wd, "ssidSAE-default-group", self.hostapd_defgroup, 19) - def test_SAE_Group20(self): self.hostapd.set_value('sae_groups', '20') self.hostapd.reload() @@ -88,7 +82,6 @@ class Test(unittest.TestCase): def setUpClass(cls): cls.hostapd = HostapdCLI(config='ssidSAE.conf') cls.hostapd_h2e = HostapdCLI(config='ssidSAE-H2E.conf') - cls.hostapd_defgroup = HostapdCLI(config='ssidSAE-default-group.conf') @classmethod def tearDownClass(cls): diff --git a/autotests/testSAE/hw.conf b/autotests/testSAE/hw.conf index 127bbb31..cc0836b7 100644 --- a/autotests/testSAE/hw.conf +++ b/autotests/testSAE/hw.conf @@ -1,9 +1,8 @@ [SETUP] -num_radios=4 +num_radios=3 start_iwd=0 hwsim_medium=yes [HOSTAPD] rad0=ssidSAE.conf rad1=ssidSAE-H2E.conf -rad2=ssidSAE-default-group.conf diff --git a/autotests/testSAE/ssidSAE-default-group.conf b/autotests/testSAE/ssidSAE-default-group.conf deleted file mode 100644 index 752e9c7b..00000000 --- a/autotests/testSAE/ssidSAE-default-group.conf +++ /dev/null @@ -1,12 +0,0 @@ -hw_mode=g -channel=1 -ssid=ssidSAE-default-group - -wpa=2 -wpa_key_mgmt=SAE -wpa_pairwise=CCMP -sae_password=secret123 -sae_groups=19 -ieee80211w=2 -sae_pwe=0 -vendor_elements=dd0cf4f5e8050500000000000000