From patchwork Fri Nov 2 18:02:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Kartashev X-Patchwork-Id: 992478 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="M5vclcvw"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="j9dGPDse"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42mqh54p69zB4XD for ; Sat, 3 Nov 2018 05:03:49 +1100 (AEDT) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=/w3q9iU38ZmBQ7kBH9ZvGbxQziGLgAafsjj5pHdU2CU=; b=M5vclcvwE4gToVErTFgj4qthjN BcFPYAT8dcB21VoGicnu0ykJG2eNzQada7v1ZHMfSmaYhtSVc4EbCaiUG0Bm0JbKdbs0yP4IJfxBW f4ol1oiEIayLAazxc9nBMER1Ah0GOvFd4AKKWOHzeUPFlMi8PsT40LhsmfHOOKQAbpPIfBVnBWsTx mDGPx+r59vQfBSrU/ER5H7MvmUX6PthgC+8cexnnrS4h4X9VHkg2DglWPHH94HVJwgEttkZbWpqZd 2FdVUm8K+8T721i9f4exWd9aOnNKcjqtyV37zo0177ybvfM9duCBLzixkYqyo2zKCHh8eYrNh7Ex5 5xSbct0Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gIdnG-0002xd-S8; Fri, 02 Nov 2018 18:03:38 +0000 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gIdmu-0002Wu-2u for hostap@lists.infradead.org; Fri, 02 Nov 2018 18:03:17 +0000 Received: by mail-lf1-x131.google.com with SMTP id n3-v6so1913652lfe.7 for ; Fri, 02 Nov 2018 11:03:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rDBUQq707xWQCMLARnBmd2aURZ9DXB9fFpYzW9fcPRY=; b=j9dGPDseUWzpnfJs8fNwk5yVO+S9ch/tTow0luWD30jjSDYSM0OWC9OmzCZZhVrnvb vypq9nDIzP356s1DhG85rMpnfaHnz3OVeukWxwRUauBKTQwt9tBjf+ya7ouy6MamuQv+ lWrCQhMTdJO/ubziNfhx1a9M5dhfN4CoJrK+QB7Ny1uK9//3Ir0scCHlqIAGVIunQFIS 08A2lwWBmIsVI67acSd+yROjltqscq3HLNtIKX1XTMJJheXgzcugI9jlkoeVcKP+v+YJ zxIke6i+K/1+KZDxAVyu1rXTyuFBr4yf4tcEf1202hAYpBr/LV2dFs26XvN0VakThwKf D1JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rDBUQq707xWQCMLARnBmd2aURZ9DXB9fFpYzW9fcPRY=; b=b+gRcaPddPaX8fAv6+pQezvyP/Y+AbVxMqX29RvL2I7dYG98o+IKrz9Sx62JrneeD0 qLBq1PCMfTeSR2Mmr53EPs2o61+mu9dylWDQGDbmfk/DFgw7Ye5t09iXL3hcs0AcUKLO xv2k19EayMWS339ZaQ3SCDHdTj8wVoidlNr5O1Hd50Ch1P6PEbyFFT6Ic4UhMm9y8OXr n2MiFb7ewpTW9d/1zyI9MiiJGfSiL40o4N/i3ZgHnad/DqlVsMfD990WzJjdX23jdJeI G7y6DawGFsZgdVE14+nL8ZPpeeMaHUDE3YIXJUmbp/qStXZ1sO1EiKSPWcxEKgLH1CT9 aF4Q== X-Gm-Message-State: AGRZ1gKtkhULPXmp4w5RGwzesWPC9yNkMRDIZVan8j+aCsHMp73INA8x 5ElJK1yO8tcETgGddbglxop+I7Ou X-Google-Smtp-Source: AJdET5dq2UmsgZBQVVQf1KIbNccZYbYbVOmeq3Q8tETkm3AAJWSo96JQLinTSV74vHmiNiNruRfDfw== X-Received: by 2002:a19:982:: with SMTP id 124mr1864911lfj.138.1541181783729; Fri, 02 Nov 2018 11:03:03 -0700 (PDT) Received: from localhost.localdomain ([194.103.244.100]) by smtp.gmail.com with ESMTPSA id a9sm1002595lfa.19.2018.11.02.11.03.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 11:03:02 -0700 (PDT) From: Andrey Kartashev To: hostap@lists.infradead.org Subject: [PATCH 3/8] mka: Debug output cleanup/fix Date: Fri, 2 Nov 2018 19:02:15 +0100 Message-Id: <20181102180220.20948-3-a.s.kartashev@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181102180220.20948-1-a.s.kartashev@gmail.com> References: <20181102180220.20948-1-a.s.kartashev@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181102_110316_125867_D91076C8 X-CRM114-Status: GOOD ( 12.34 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:131 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (a.s.kartashev[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 Message has at least one valid DKIM or DK signature X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Kartashev MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Andrey Kartashev Make debug output more consistent, fix several errors. Signed-off-by: Andrey Kartashev --- src/pae/ieee802_1x_kay.c | 30 ++++++++++++++++-------------- src/pae/ieee802_1x_secy_ops.c | 4 ++-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/pae/ieee802_1x_kay.c b/src/pae/ieee802_1x_kay.c index 20dd10c07..e508b38de 100644 --- a/src/pae/ieee802_1x_kay.c +++ b/src/pae/ieee802_1x_kay.c @@ -169,7 +169,7 @@ ieee802_1x_mka_dump_peer_body(struct ieee802_1x_mka_peer_body *body) for (i = 0; i < body_len; i += MI_LEN + sizeof(mn)) { mi = body->peer + i; os_memcpy(&mn, mi + MI_LEN, sizeof(mn)); - wpa_hexdump_ascii(MSG_DEBUG, "\tMember Id.....:", mi, MI_LEN); + wpa_hexdump(MSG_DEBUG, "\tMember Id.....:", mi, MI_LEN); wpa_printf(MSG_DEBUG, "\tMessage Number: %d", be_to_host32(mn)); } } @@ -223,11 +223,11 @@ ieee802_1x_mka_dump_sak_use_body(struct ieee802_1x_mka_sak_use_body *body) wpa_printf(MSG_DEBUG, "\tLatest Key AN....: %d", body->lan); wpa_printf(MSG_DEBUG, "\tLatest Key Tx....: %s", yes_no(body->ltx)); wpa_printf(MSG_DEBUG, "\tLatest Key Rx....: %s", yes_no(body->lrx)); - wpa_printf(MSG_DEBUG, "\tOld Key AN....: %d", body->oan); - wpa_printf(MSG_DEBUG, "\tOld Key Tx....: %s", yes_no(body->otx)); - wpa_printf(MSG_DEBUG, "\tOld Key Rx....: %s", yes_no(body->orx)); - wpa_printf(MSG_DEBUG, "\tPlain Key Tx....: %s", yes_no(body->ptx)); - wpa_printf(MSG_DEBUG, "\tPlain Key Rx....: %s", yes_no(body->prx)); + wpa_printf(MSG_DEBUG, "\tOld Key AN.......: %d", body->oan); + wpa_printf(MSG_DEBUG, "\tOld Key Tx.......: %s", yes_no(body->otx)); + wpa_printf(MSG_DEBUG, "\tOld Key Rx.......: %s", yes_no(body->orx)); + wpa_printf(MSG_DEBUG, "\tPlain Key Tx.....: %s", yes_no(body->ptx)); + wpa_printf(MSG_DEBUG, "\tPlain Key Rx.....: %s", yes_no(body->prx)); wpa_printf(MSG_DEBUG, "\tDelay Protect....: %s", yes_no(body->delay_protect)); wpa_printf(MSG_DEBUG, "\tBody Length......: %d", body_len); @@ -240,11 +240,11 @@ ieee802_1x_mka_dump_sak_use_body(struct ieee802_1x_mka_sak_use_body *body) be_to_host32(body->lkn)); wpa_printf(MSG_DEBUG, "\tLowest PN........: %u", be_to_host32(body->llpn)); - wpa_hexdump_ascii(MSG_DEBUG, "\tOld Key Server MI....:", + wpa_hexdump(MSG_DEBUG, "\tOld Key Server MI:", body->osrv_mi, sizeof(body->osrv_mi)); - wpa_printf(MSG_DEBUG, "\tOld Key Number.......: %u", + wpa_printf(MSG_DEBUG, "\tOld Key Number...: %u", be_to_host32(body->okn)); - wpa_printf(MSG_DEBUG, "\tOld Lowest PN........: %u", + wpa_printf(MSG_DEBUG, "\tOld Lowest PN....: %u", be_to_host32(body->olpn)); } @@ -464,7 +464,7 @@ ieee802_1x_kay_init_receive_sa(struct receive_sc *psc, u8 an, u32 lowest_pn, dl_list_add(&psc->sa_list, &psa->list); wpa_printf(MSG_DEBUG, - "KaY: Create receive SA(AN: %hhu lowest_pn: %u of SC", + "KaY: Create receive SA(AN: %hhu lowest_pn: %u) of SC", an, lowest_pn); return psa; @@ -549,10 +549,12 @@ ieee802_1x_kay_deinit_receive_sc( static void ieee802_1x_kay_dump_peer(struct ieee802_1x_kay_peer *peer) { - wpa_hexdump(MSG_DEBUG, "\tMI: ", peer->mi, sizeof(peer->mi)); - wpa_printf(MSG_DEBUG, "\tMN: %d", peer->mn); - wpa_hexdump(MSG_DEBUG, "\tSCI Addr: ", peer->sci.addr, ETH_ALEN); - wpa_printf(MSG_DEBUG, "\tPort: %d", peer->sci.port); + wpa_hexdump(MSG_DEBUG, "\tMI......: ", peer->mi, sizeof(peer->mi)); + wpa_printf(MSG_DEBUG, "\tMN......: %d", peer->mn); + wpa_printf(MSG_DEBUG, "\tSCI MAC.: " MACSTR, + MAC2STR(peer->sci.addr)); + wpa_printf(MSG_DEBUG, "\tSCI Port: %d", + be_to_host16(peer->sci.port)); } diff --git a/src/pae/ieee802_1x_secy_ops.c b/src/pae/ieee802_1x_secy_ops.c index ab5339bb2..d92542210 100644 --- a/src/pae/ieee802_1x_secy_ops.c +++ b/src/pae/ieee802_1x_secy_ops.c @@ -187,7 +187,7 @@ int secy_get_transmit_next_pn(struct ieee802_1x_kay *kay, ops = kay->ctx; if (!ops || !ops->get_transmit_next_pn) { wpa_printf(MSG_ERROR, - "KaY: secy get_receive_lowest_pn operation not supported"); + "KaY: secy get_transmit_next_pn operation not supported"); return -1; } @@ -208,7 +208,7 @@ int secy_set_transmit_next_pn(struct ieee802_1x_kay *kay, ops = kay->ctx; if (!ops || !ops->set_transmit_next_pn) { wpa_printf(MSG_ERROR, - "KaY: secy get_receive_lowest_pn operation not supported"); + "KaY: secy set_transmit_next_pn operation not supported"); return -1; }