From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kOqRj-0007Xi-GS for mharc-grub-devel@gnu.org; Sat, 03 Oct 2020 18:56:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kOqRi-0007Wp-4C for grub-devel@gnu.org; Sat, 03 Oct 2020 18:56:06 -0400 Received: from mail-oo1-xc44.google.com ([2607:f8b0:4864:20::c44]:42444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kOqRf-0000F8-Uf for grub-devel@gnu.org; Sat, 03 Oct 2020 18:56:05 -0400 Received: by mail-oo1-xc44.google.com with SMTP id l18so202788ooa.9 for ; Sat, 03 Oct 2020 15:56:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qn/1m2keASJ+bspE/pzuxLaDlxSff+Yazmrh7qS3QYc=; b=kKnR76Yb/Lhrn708OeOTmKG97zKX5LaRVVb0Ibq+cz288I3QvThkubsQyRMJTICGzj Oyp/ME8GjtbBMXM65RLUY5uPrTM7GsHXiLsBy6Bu4BvGznP4cbZbcBNQober1EEteccl I5iYBxl8aXTgVVFOmlnqHjsRKFH/JioO7pbskrFsOKl+aY3ei1z8IYk5gwakuxNpUpMq K2yg67hN0KW8wmgmX1+zVFrNVb/PCuD+0BaGOtx46HXNPquWWoD/i2Qpcq88u5C5IEm0 xnqRd2ccC+D7I3RT5u7k2wzMFAmCFdBO/iPYKFJwODScvkEEF+bmZYpwaj5Pk3wGADjs QMHQ== 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:mime-version:content-transfer-encoding; bh=qn/1m2keASJ+bspE/pzuxLaDlxSff+Yazmrh7qS3QYc=; b=uLVEzfYSfi2SwOQL7s99euSfHz2/5ZApCbqJzpDAhppekNqpUqTdhXtVaZNaC5XJQs ++i5Rj4hxHk6AY88aAKgR95s9ATtSjK+r2uUPam6Q89pdFWK29FqNssDBMgNtcMfZu/s GeC8Et9waTAt41Md7OiB2btPOrvEjdlvI4tKrUbkt1AkxR15GZWSmY9h3kHr7A08nmjd OPYIo1gHU9oPvsKuqk2Xd7NqYYRMGxOMWnNlTQSS2l9vSQkzt0C3LMYFIHHLrorMXliO vVfLpDmkp/uT0QoSWzEJpgjb+AqLkoVCveAHdMjrXQw9xWSq5KxrJ+xqDwXQdfulqTDB 2waA== X-Gm-Message-State: AOAM532NYVqVjT0r1gkEU3T86S9E5yWlKidtXIuX7q+/cSpyO1fv2EwA GPpA3ZZg3vCxxZZhxasTgt7KMp80Lse+mw== X-Google-Smtp-Source: ABdhPJxFNIcz9naggDLrgQQW1qHgr4f85E8wttYq0IDxBvrwFPf5cKm3be7Fx9eYt8Cuh8uSbJeV1Q== X-Received: by 2002:a4a:dc99:: with SMTP id g25mr6952349oou.64.1601765762448; Sat, 03 Oct 2020 15:56:02 -0700 (PDT) Received: from crass-HP-ZBook-15-G2.lan ([136.49.44.103]) by smtp.gmail.com with ESMTPSA id d17sm1524580oth.73.2020.10.03.15.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 15:56:02 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org Cc: Daniel Kiper , Patrick Steinhardt , Glenn Washburn Subject: [PATCH v2 02/10] luks2: Improve readability in luks2_get_keyslot. Date: Sat, 3 Oct 2020 17:55:26 -0500 Message-Id: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::c44; envelope-from=development@efficientek.com; helo=mail-oo1-xc44.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Oct 2020 22:56:06 -0000 Introduce new variables keyslot_key, digest_key, and segment_key which represent the integer key of the item in the respective associative array when looping over the array items. This replaces using a generically named variable named "idx" used for all three values. The parameter "i" is renamed to "keyslot_idx" and the loop variable "j" is renamed to "i". Error messages now distinguish between indexes and keys. The former include "index" in the error string, and the later are surrounded in quotes. Signed-off-by: Glenn Washburn Reviewed-by: Patrick Steinhardt --- grub-core/disk/luks2.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index 2241e0312..c3cd63606 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -255,54 +255,55 @@ luks2_parse_digest (grub_luks2_digest_t *out, const grub_json_t *digest) static grub_err_t luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_segment_t *s, - const grub_json_t *root, grub_size_t i) + const grub_json_t *root, grub_size_t keyslot_idx) { grub_json_t keyslots, keyslot, digests, digest, segments, segment; - grub_size_t j, size; - grub_uint64_t idx; + grub_size_t i, size; + grub_uint64_t keyslot_key, digest_key, segment_key; /* Get nth keyslot */ if (grub_json_getvalue (&keyslots, root, "keyslots") || - grub_json_getchild (&keyslot, &keyslots, i) || - grub_json_getuint64 (&idx, &keyslot, NULL) || + grub_json_getchild (&keyslot, &keyslots, keyslot_idx) || + grub_json_getuint64 (&keyslot_key, &keyslot, NULL) || grub_json_getchild (&keyslot, &keyslot, 0) || luks2_parse_keyslot (k, &keyslot)) - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse keyslot %"PRIuGRUB_SIZE, i); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse keyslot index %"PRIuGRUB_SIZE, keyslot_idx); /* Get digest that matches the keyslot. */ if (grub_json_getvalue (&digests, root, "digests") || grub_json_getsize (&size, &digests)) return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not get digests"); - for (j = 0; j < size; j++) + for (i = 0; i < size; i++) { - if (grub_json_getchild (&digest, &digests, j) || + if (grub_json_getchild (&digest, &digests, i) || + grub_json_getuint64 (&digest_key, &digest, NULL) || grub_json_getchild (&digest, &digest, 0) || luks2_parse_digest (d, &digest)) - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest %"PRIuGRUB_SIZE, j); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest index %"PRIuGRUB_SIZE, i); - if ((d->keyslots & (1 << idx))) + if ((d->keyslots & (1 << keyslot_key))) break; } - if (j == size) - return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot %"PRIuGRUB_SIZE, i); + if (i == size) + return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot \"%"PRIuGRUB_UINT64_T"\"", keyslot_key); /* Get segment that matches the digest. */ if (grub_json_getvalue (&segments, root, "segments") || grub_json_getsize (&size, &segments)) return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not get segments"); - for (i = j, j = 0; j < size; j++) + for (i = 0; i < size; i++) { - if (grub_json_getchild (&segment, &segments, j) || - grub_json_getuint64 (&idx, &segment, NULL) || + if (grub_json_getchild (&segment, &segments, i) || + grub_json_getuint64 (&segment_key, &segment, NULL) || grub_json_getchild (&segment, &segment, 0) || luks2_parse_segment (s, &segment)) - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment %"PRIuGRUB_SIZE, j); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment index %"PRIuGRUB_SIZE, i); - if ((d->segments & (1 << idx))) + if ((d->segments & (1 << segment_key))) break; } - if (j == size) - return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest %"PRIuGRUB_SIZE, i); + if (i == size) + return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest \"%"PRIuGRUB_UINT64_T"\"", digest_key); return GRUB_ERR_NONE; } -- 2.27.0