From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kmlkj-0004qN-F7 for mharc-grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmlkf-0004hi-93 for grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:33 -0500 Received: from mail-ot1-x341.google.com ([2607:f8b0:4864:20::341]:43979) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kmlkX-0000ke-8D for grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:32 -0500 Received: by mail-ot1-x341.google.com with SMTP id q25so323178otn.10 for ; Tue, 08 Dec 2020 14:46:20 -0800 (PST) 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=FT1yaMtbiNrGA4pV98aAJZC2hZRW0KBPHELawTEFcyE=; b=N1K8l7Gdq1rHe/NsQc3WGzrSEDmemua7N4W1hibDKYXAXEcZsPIuiRthsFeF/n0468 b5Gl78U5eEPzmbC3eTi+XTZN+50fGp5pk/9lhC9sJz0G8O4ELK31yF+5zDqxsAAYd3rq ISwWvUW9x8erIw/XFv/vVRJCTjSD25ea7I3UMG+irsnKDxOntFbz3ECmpCmGysmQKgUe H7L0khNJygphZSLTBFJGbMQWj9X75egPyOuAo6fFvabq2EAt+a5Y7d87nU0a/VYUfc21 mZ+Tq9Tx66PdFbqDabXXMqEESg7aNytqb7nI3nxFDtUb2tzhu9BqnAZj0Ry7aXVfKGlm zTtg== 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=FT1yaMtbiNrGA4pV98aAJZC2hZRW0KBPHELawTEFcyE=; b=igsFnT/1Lnrt5ySK5E5kWWNink3F+eJpcoI2bPGMuywuOje0rk6DHRmkOpsy3Avf32 hEgPK5nVTAfEuvLwSnNxl6AQppYGO2l2VE1Q10PyGfes7UUr9/jaUhl3iLoB2hMrz1+L Bvay0Vf9LMyNLqpVon2ctuP5WwkuCCQFqNYj+Ev+0VwS1AIMG4Pwfd4vTTRLkXJhjhxd AS1louMnz4DeJ6tbCl2tjDuHcRy8D7Hqge8teSjprqSwXZURT8aXz6YwZZrMTlYF1QJO 6jI7K/OMCmiJ+WysJ2VOwnpUPISvPSk37wY7+1NRHoVoP+dSWsjXDjIbpf58UcUTvyOy sl6w== X-Gm-Message-State: AOAM533Q/T6DuDRAkm1ihb3SmQl0sXAlJuwBJ51ggl7LVTG3lFMoIMSn mjxzo6En8Zkxy7h40J01lG+ixFw9jbMqDg== X-Google-Smtp-Source: ABdhPJzcZf7rzVKyqMPAYEiJ2IVE0+9S+omEMYNzRvOlNu7NIVTHyBRfSkw7rlhCYYxKGdarSwPafg== X-Received: by 2002:a9d:a4e:: with SMTP id 72mr258352otg.267.1607467580039; Tue, 08 Dec 2020 14:46:20 -0800 (PST) Received: from crass-HP-ZBook-15-G2.attlocal.net ([136.49.211.192]) by smtp.gmail.com with ESMTPSA id v8sm45538otp.10.2020.12.08.14.46.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 14:46:19 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v8 08/18] luks2: Rename json index variables to names that they are obviously json indexes Date: Tue, 8 Dec 2020 16:45:39 -0600 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::341; envelope-from=development@efficientek.com; helo=mail-ot1-x341.google.com 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: Tue, 08 Dec 2020 22:46:33 -0000 Signed-off-by: Glenn Washburn --- grub-core/disk/luks2.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index b6930b2f5..7e0419a82 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -261,53 +261,53 @@ 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 keyslot_idx) + const grub_json_t *root, grub_size_t keyslot_json_idx) { grub_json_t keyslots, keyslot, digests, digest, segments, segment; - grub_size_t i, size; + grub_size_t json_idx, size; /* Get nth keyslot */ if (grub_json_getvalue (&keyslots, root, "keyslots") || - grub_json_getchild (&keyslot, &keyslots, keyslot_idx) || + grub_json_getchild (&keyslot, &keyslots, keyslot_json_idx) || grub_json_getuint64 (&k->idx, &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, keyslot_idx); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse keyslot %"PRIuGRUB_SIZE, keyslot_json_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 (i = 0; i < size; i++) + for (json_idx = 0; json_idx < size; json_idx++) { - if (grub_json_getchild (&digest, &digests, i) || + if (grub_json_getchild (&digest, &digests, json_idx) || grub_json_getuint64 (&d->idx, &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, i); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest %"PRIuGRUB_SIZE, json_idx); if ((d->keyslots & (1 << k->idx))) break; } - if (i == size) + if (json_idx == size) return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot \"%"PRIuGRUB_UINT64_T"\"", k->idx); /* 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 = 0; i < size; i++) + for (json_idx = 0; json_idx < size; json_idx++) { - if (grub_json_getchild (&segment, &segments, i) || + if (grub_json_getchild (&segment, &segments, json_idx) || grub_json_getuint64 (&s->idx, &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, i); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment %"PRIuGRUB_SIZE, json_idx); if ((d->segments & (1 << s->idx))) break; } - if (i == size) + if (json_idx == size) return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest \"%"PRIuGRUB_UINT64_T"\"", d->idx); return GRUB_ERR_NONE; @@ -542,7 +542,7 @@ luks2_recover_key (grub_disk_t source, grub_uint8_t candidate_key[GRUB_CRYPTODISK_MAX_KEYLEN]; char passphrase[MAX_PASSPHRASE], cipher[32]; char *json_header = NULL, *part = NULL, *ptr; - grub_size_t candidate_key_len = 0, i, size; + grub_size_t candidate_key_len = 0, json_idx, size; grub_luks2_header_t header; grub_luks2_keyslot_t keyslot; grub_luks2_digest_t digest; @@ -596,9 +596,9 @@ luks2_recover_key (grub_disk_t source, } /* Try all keyslot */ - for (i = 0; i < size; i++) + for (json_idx = 0; json_idx < size; json_idx++) { - ret = luks2_get_keyslot (&keyslot, &digest, &segment, json, i); + ret = luks2_get_keyslot (&keyslot, &digest, &segment, json, json_idx); if (ret) goto err; -- 2.27.0