From patchwork Wed May 20 18:34:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Lund X-Patchwork-Id: 1294579 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=DLuguj80; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=NL/Elsnd; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49S1dt54QYz9sTR for ; Thu, 21 May 2020 04:35:30 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AQ1C1Bg36Ce7QUhVR4J3bIhKM/TCr3lUzwTnwJej5SY=; b=DLuguj806rvWhf j5c6ZU3U8iDkMAYQwsAo4G26REpMD9z23W5z+chN3PAVbA6uBtYT0vF89AQbfIi8LRkwbegKwZxcd 8Fdt5o+921Q1zc7SoyoesiAjCqtORWlEaLyhskyArJeXQXmNJRm4pbVZ8V9TKNBJWavOwABQCYkbY t/ulu5ULaRuSjlQTM9gKYuinWgygzHDoUm8KlyOG+gZ4qgbyGwCoXNx5rxeMmzYTrbKLdUKUIU+SI qoksLgmTvYVdOcG4DTaFCwrnoRyfyuJfZM0bLE8UECJBN2kg1+6daiCqS3DIGjRsr6Ei6twRKpFs8 GnsGCdDxWZD3Nd2jLxOA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jbTYb-0003nD-U2; Wed, 20 May 2020 18:35:10 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jbTYA-0002GD-1V for hostap@lists.infradead.org; Wed, 20 May 2020 18:34:44 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id z7so2665191ybn.21 for ; Wed, 20 May 2020 11:34:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=9ArNwHn4SQ/OXsvj2LlLglNYE8Vlyhf0p4qVh+qcjuU=; b=NL/ElsndBdaBkMlGPNl8wIY8TTcJn+OhJ/vQP5f+MJkwbux0CwJK6OaM/AGmHcA62e Wbik+1KILYIaS3OA6IwdB2rQvnRn5cozudjoudREkx/SC4wioF864qwspZX6IgEwbOqX kCYHmyG/YFX0zpophN3HfudWCczyUekSBi48M/kqASQirQvXNWiT981teTmFwVW0HZTQ rJE8Fx40FolJAm2dubBUWNthz+Y1PLAPc5orqJyznkbyuRPcN5GYLZrcKJDxmUH09VKS ySJvHcAcJOHwrYQVkM2QQqsaf1PZxg6cHsVOs4Onl1SuXUP7+Zwtcnv/WeN+QUeOA9AJ cMjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=9ArNwHn4SQ/OXsvj2LlLglNYE8Vlyhf0p4qVh+qcjuU=; b=YU5ED+e0S/UN4Z096REjc7YuDnVflToWh83AYOP7g+Rkv47lmebQ3/3Y4oLDj4vKDl FMZo0lKRK+VSjfa8qowiXYj5to2FxBV5kR/ul7/NG9PEFw7TV1G13yOpdE8ColNck5HH sU5Dk/mXHPixwSZDLOqyAdEnMm8kur+z9P5VPbc1SxKz2tpm2/tx3ZeNm1YrLdLAxfRH cjYr6dHTgyHaurpevUOpmlAsHFOBbyOKBWtziCUoUYTZgzKvznQKlICW1nBiOOGQEsHL cbG37G5Frtg5N/GrBoXuQXyAY/PCntoAZoRC8GctUm46bx29agB4zCxEoU6EQDwsnlGz Du4g== X-Gm-Message-State: AOAM532ltSfCG6yMT5k1ln7Rd0MBoUyHIEjlixHcnA7EvSR244Y2LA33 nZB9rW8TXRyn8ZT3b4aTjwBcD8Rm02kOVmEYGJXgLK77WgTYPzxwP6c3F+HWQKdaZ4HfZhCursN i52RkmGrO7UiQoi7t2BLpBLOZ8oPd3GJfgIkoOLFlzIh5v+9RZRsWsrwxp4e8iPgbjBE= X-Google-Smtp-Source: ABdhPJxEIIWnbL3fFJ/TSLwg2m0K0zmAzB0IGH0uyRoGi6emwfawlIwzV3XxhFKJDYzljTgrzfKl+2QHN0A= X-Received: by 2002:a05:6902:4b1:: with SMTP id r17mr9300394ybs.238.1589999677843; Wed, 20 May 2020 11:34:37 -0700 (PDT) Date: Wed, 20 May 2020 12:34:17 -0600 In-Reply-To: <20200520183417.214702-1-kglund@google.com> Message-Id: <20200520183417.214702-4-kglund@google.com> Mime-Version: 1.0 References: <20200520183417.214702-1-kglund@google.com> X-Mailer: git-send-email 2.26.2.761.g0e0b3e54be-goog Subject: [PATCH 4/4] wpa_supplicant-2.8: Add new blacklist tests From: Kevin Lund To: hostap@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200520_113442_436969_65C54532 X-CRM114-Status: UNSURE ( 9.14 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:b4a listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 DKIMWL_WL_MED DKIMwl.org - Medium sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Lund Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This change adds some barebones tests for new blacklisting functionality to wpas_module_tests.c. The tests ensure some basic functionality for the functions wpa_blacklist_is_blacklisted() and wpa_blacklist_update(). BUG=chromium:1040974, chromium:1051374 TEST=emerge and deploy hostap-test for Betty board on a cros_vm instance `tast -verbose run -var=network.HostapHwsim.runArgs='-f module_tests' localhost:9222 network.HostapHwsim.full` Signed-off-by: Kevin Lund Change-Id: I237c6d83e68cbd7298d239a8be520ab4d09c3618 --- wpa_supplicant/wpas_module_tests.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/wpa_supplicant/wpas_module_tests.c b/wpa_supplicant/wpas_module_tests.c index 4e37591be..1c136f782 100644 --- a/wpa_supplicant/wpas_module_tests.c +++ b/wpa_supplicant/wpas_module_tests.c @@ -59,6 +59,23 @@ static int wpas_blacklist_module_tests(void) wpa_blacklist_add(&wpa_s, (u8 *) "333333") < 0) goto fail; + wpa_blacklist_clear(&wpa_s); + + if (wpa_blacklist_add(&wpa_s, (u8 *) "111111") < 0 || + wpa_blacklist_add(&wpa_s, (u8 *) "222222") < 0 || + wpa_blacklist_add(&wpa_s, (u8 *) "333333") < 0 || + wpa_blacklist_add(&wpa_s, (u8 *) "444444") < 0 || + !wpa_blacklist_is_blacklisted(&wpa_s, (u8 *) "111111") || + wpa_blacklist_del(&wpa_s, (u8 *) "111111") < 0 || + wpa_blacklist_is_blacklisted(&wpa_s, (u8 *) "111111") || + wpa_blacklist_add(&wpa_s, (u8 *) "111111") < 0) + goto fail; + + wpa_blacklist_update(&wpa_s); + + if (!wpa_blacklist_is_blacklisted(&wpa_s, (u8 *) "111111")) + goto fail; + ret = 0; fail: wpa_blacklist_clear(&wpa_s);