From patchwork Wed Sep 15 08:32:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Archie Pusaka X-Patchwork-Id: 12495747 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.2 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94676C433FE for ; Wed, 15 Sep 2021 08:33:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B94B611AF for ; Wed, 15 Sep 2021 08:33:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236929AbhIOIex (ORCPT ); Wed, 15 Sep 2021 04:34:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236916AbhIOIew (ORCPT ); Wed, 15 Sep 2021 04:34:52 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D7F5C061574 for ; Wed, 15 Sep 2021 01:33:34 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id d93-20020a25a366000000b0059fff274d9aso2718764ybi.4 for ; Wed, 15 Sep 2021 01:33:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=XxgMY0lQyqsn2YWSD15Rue0slAKBxD3+jDuR2m/PDZw=; b=SJCoF0wGzB6sJwd8+yoz3AN/BWAe+3hQaQ0X7oCeP6fWNLU2Hlw2ItoYoJKR4SDqme l0cQGCNq+6ef2tv/V0tDwpURDi37+BXxUIiUKGOFSsDEuv5libqOD+AOzYBpBN/xUH+N TK/AxFO4L7Wtswt/eJSnj4+AT1yarkIbCdic33JRKzQq6pA09PAcRbJUc5XRvz/F9Aa0 E7w2kAJOxWzqzjHfEC2AuDn3kQ/6E97+j47yUqD/CTAtuxrt2NbwXu4xSHHWepedQJ80 9hXUB73yWvXK4ooQdfsuqtrZZLTLvMDCFsqfHERW4r8zjdKbRNBKW0+lFpCNE9tS7xgz xRQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=XxgMY0lQyqsn2YWSD15Rue0slAKBxD3+jDuR2m/PDZw=; b=Y/HNtMgZf2t1IbZDGk4Hz03pOkQAjS3jXHbycWPqGnc1Jn3ygu7eg2Q0Ez2ZCdAYzq FZHOKZ2WW6YK2h8cCx4v/oX/fI9cPU2sP1GB66Lp8ZVE4h6d/2BRgBiYy/ah0muGtMZH QL74NeTaVCiBe1xAABHNnUnn4qzM78RPSzqRVRQz3yeR+AD6KgOb49lU432QclZiXr9X YTxMEb75GERzoVpFgE50i8gTvyvP0gob0Cxmh4z50Edn3SxRBYYpDEmDQYpqLUfdSAPH Zkn3tGFF30xm9bXnpYj6Czq/c2MMcmGKa/iI1ptL8jfujbK4Dsw/LnRtd8QnaN2U/Jwn 3zww== X-Gm-Message-State: AOAM532emvxIWdCZl2OZgAnesCMvInHmeNkv7XwSBg9n3atAsaGMhRSJ YEfxaj42MmXnT4sbt+/b5FRifpP162EfIt2AHZs546VP5xypH6QTH9xdRb0lzEUT5lCeDUvpPdx fsDIXQnQKNmZTLKjKeVgG21Bh+oupfhMZTWjoJMzyDwE7tyTStKSNOZRBuG30ic93DNnzKHiXmj cG X-Google-Smtp-Source: ABdhPJwswyV7OY/HUMopx89Lw5NB7QHQDeBiZ1yG+d2ppiE1NMqnZxXRtWDvAZmdBC2DxBwNzj/VoTA4IdkT X-Received: from apusaka-p920.tpe.corp.google.com ([2401:fa00:1:10:3c6b:8053:7e45:276b]) (user=apusaka job=sendgmr) by 2002:a25:804:: with SMTP id 4mr4563731ybi.346.1631694813589; Wed, 15 Sep 2021 01:33:33 -0700 (PDT) Date: Wed, 15 Sep 2021 16:32:07 +0800 In-Reply-To: <20210915083207.243957-1-apusaka@google.com> Message-Id: <20210915162843.Bluez.v5.11.I9802817b065e02b0060e91cf8ce11a8f5fec973a@changeid> Mime-Version: 1.0 References: <20210915083207.243957-1-apusaka@google.com> X-Mailer: git-send-email 2.33.0.464.g1972c5931b-goog Subject: [Bluez PATCH v5 11/13] mesh: Inclusive language changes From: Archie Pusaka To: linux-bluetooth , Luiz Augusto von Dentz Cc: CrosBT Upstreaming , Archie Pusaka Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Archie Pusaka According to https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf "flooding", "accept list", and "reject list" are the preferred terms. --- (no changes since v1) mesh/net-keys.c | 38 +++++++++++++++++++------------------- mesh/net-keys.h | 8 ++++---- mesh/net.h | 4 ++-- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/mesh/net-keys.c b/mesh/net-keys.c index e0060df746..ee7bbf0c05 100644 --- a/mesh/net-keys.c +++ b/mesh/net-keys.c @@ -45,7 +45,7 @@ struct net_key { uint16_t beacon_enables; uint8_t friend_key; uint8_t nid; - uint8_t master[16]; + uint8_t flooding[16]; uint8_t encrypt[16]; uint8_t privacy[16]; uint8_t beacon[16]; @@ -53,7 +53,7 @@ struct net_key { }; static struct l_queue *keys = NULL; -static uint32_t last_master_id = 0; +static uint32_t last_flooding_id = 0; /* To avoid re-decrypting same packet for multiple nodes, cache and check */ static uint8_t cache_pkt[29]; @@ -63,11 +63,11 @@ static size_t cache_plainlen; static uint32_t cache_id; static uint32_t cache_iv_index; -static bool match_master(const void *a, const void *b) +static bool match_flooding(const void *a, const void *b) { const struct net_key *key = a; - return (memcmp(key->master, b, sizeof(key->master)) == 0); + return (memcmp(key->flooding, b, sizeof(key->flooding)) == 0); } static bool match_id(const void *a, const void *b) @@ -87,9 +87,9 @@ static bool match_network(const void *a, const void *b) } /* Key added from Provisioning, NetKey Add or NetKey update */ -uint32_t net_key_add(const uint8_t master[16]) +uint32_t net_key_add(const uint8_t flooding[16]) { - struct net_key *key = l_queue_find(keys, match_master, master); + struct net_key *key = l_queue_find(keys, match_flooding, flooding); uint8_t p[] = {0}; bool result; @@ -102,22 +102,22 @@ uint32_t net_key_add(const uint8_t master[16]) keys = l_queue_new(); key = l_new(struct net_key, 1); - memcpy(key->master, master, 16); + memcpy(key->flooding, flooding, 16); key->ref_cnt++; - result = mesh_crypto_k2(master, p, sizeof(p), &key->nid, key->encrypt, + result = mesh_crypto_k2(flooding, p, sizeof(p), &key->nid, key->encrypt, key->privacy); if (!result) goto fail; - result = mesh_crypto_k3(master, key->network); + result = mesh_crypto_k3(flooding, key->network); if (!result) goto fail; - result = mesh_crypto_nkbk(master, key->beacon); + result = mesh_crypto_nkbk(flooding, key->beacon); if (!result) goto fail; - key->id = ++last_master_id; + key->id = ++last_flooding_id; l_queue_push_tail(keys, key); return key->id; @@ -126,11 +126,11 @@ fail: return 0; } -uint32_t net_key_frnd_add(uint32_t master_id, uint16_t lpn, uint16_t frnd, +uint32_t net_key_frnd_add(uint32_t flooding_id, uint16_t lpn, uint16_t frnd, uint16_t lp_cnt, uint16_t fn_cnt) { const struct net_key *key = l_queue_find(keys, match_id, - L_UINT_TO_PTR(master_id)); + L_UINT_TO_PTR(flooding_id)); struct net_key *frnd_key; uint8_t p[9] = {0x01}; bool result; @@ -145,7 +145,7 @@ uint32_t net_key_frnd_add(uint32_t master_id, uint16_t lpn, uint16_t frnd, l_put_be16(lp_cnt, p + 5); l_put_be16(fn_cnt, p + 7); - result = mesh_crypto_k2(key->master, p, sizeof(p), &frnd_key->nid, + result = mesh_crypto_k2(key->flooding, p, sizeof(p), &frnd_key->nid, frnd_key->encrypt, frnd_key->privacy); if (!result) { @@ -155,7 +155,7 @@ uint32_t net_key_frnd_add(uint32_t master_id, uint16_t lpn, uint16_t frnd, frnd_key->friend_key = true; frnd_key->ref_cnt++; - frnd_key->id = ++last_master_id; + frnd_key->id = ++last_flooding_id; l_queue_push_head(keys, frnd_key); return frnd_key->id; @@ -174,22 +174,22 @@ void net_key_unref(uint32_t id) } } -bool net_key_confirm(uint32_t id, const uint8_t master[16]) +bool net_key_confirm(uint32_t id, const uint8_t flooding[16]) { struct net_key *key = l_queue_find(keys, match_id, L_UINT_TO_PTR(id)); if (key) - return memcmp(key->master, master, sizeof(key->master)) == 0; + return !memcmp(key->flooding, flooding, sizeof(key->flooding)); return false; } -bool net_key_retrieve(uint32_t id, uint8_t *master) +bool net_key_retrieve(uint32_t id, uint8_t *flooding) { struct net_key *key = l_queue_find(keys, match_id, L_UINT_TO_PTR(id)); if (key) { - memcpy(master, key->master, sizeof(key->master)); + memcpy(flooding, key->flooding, sizeof(key->flooding)); return true; } diff --git a/mesh/net-keys.h b/mesh/net-keys.h index 70b3d22c3a..420618f710 100644 --- a/mesh/net-keys.h +++ b/mesh/net-keys.h @@ -13,10 +13,10 @@ #define IV_INDEX_UPDATE 0x02 void net_key_cleanup(void); -bool net_key_confirm(uint32_t id, const uint8_t master[16]); -bool net_key_retrieve(uint32_t id, uint8_t *master); -uint32_t net_key_add(const uint8_t master[16]); -uint32_t net_key_frnd_add(uint32_t master_id, uint16_t lpn, uint16_t frnd, +bool net_key_confirm(uint32_t id, const uint8_t flooding[16]); +bool net_key_retrieve(uint32_t id, uint8_t *flooding); +uint32_t net_key_add(const uint8_t flooding[16]); +uint32_t net_key_frnd_add(uint32_t flooding_id, uint16_t lpn, uint16_t frnd, uint16_t lp_cnt, uint16_t fn_cnt); void net_key_unref(uint32_t id); uint32_t net_key_decrypt(uint32_t iv_index, const uint8_t *pkt, size_t len, diff --git a/mesh/net.h b/mesh/net.h index 4dbc94b8b3..465d889090 100644 --- a/mesh/net.h +++ b/mesh/net.h @@ -86,8 +86,8 @@ struct mesh_node; #define PROXY_OP_FILTER_STATUS 0x03 /* Proxy Filter Defines */ -#define PROXY_FILTER_WHITELIST 0x00 -#define PROXY_FILTER_BLACKLIST 0x01 +#define PROXY_FILTER_ACCEPT_LIST 0x00 +#define PROXY_FILTER_REJECT_LIST 0x01 /* Network Tranport Opcodes */ #define NET_OP_SEG_ACKNOWLEDGE 0x00