From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kmlkr-00051m-Ru for mharc-grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmlkf-0004iv-SO for grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:33 -0500 Received: from mail-ot1-x344.google.com ([2607:f8b0:4864:20::344]:36409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kmlkX-0000kk-MF for grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:33 -0500 Received: by mail-ot1-x344.google.com with SMTP id y24so369244otk.3 for ; Tue, 08 Dec 2020 14:46:21 -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=qVVU6bYO2CH6NjCRQwlIKiKG11Z+N8FL8pomYmyB5tw=; b=MDH7Ep9hYKOPCqewoAItda7dfWTvYkuPwmBQ4VnFD1ndI+nIkZfxGHnAW4/VlzcFMW OzT6mGZBNythbf9ghLsquUIecr8ky6j8hGSy5pIZVy+P7egAiIrnuAaBwnmo3QKdSKpY k8jcFftoZtUD8PawOR+k/YD0E6hqJPnxI6IHCkv/9m0OWQc53KelSgX7PW+YfKswhhcc lhU9FkFs0k7YmOGoOiuzvtRh3RD23DMM6tTqCYFb7QEh4YeU8i+L9M1mpAIwmPWxGhIl gW6s9u9sw42CagqYvFh9o1BdielR3aB9dHfD2bkG4pMXEjibvDKnfkC3syukQBdc0Rd7 1PTA== 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=qVVU6bYO2CH6NjCRQwlIKiKG11Z+N8FL8pomYmyB5tw=; b=IkJBLdgmAzT6it64QMMo6VYkF5XGvoAx4ckBR6eHPrtG6Pqq/wIh8VGSuI4BEx/FEC dwfBq/rgvAe2dd9Epq7g03Qm350V8tQjvxi4PDTgEbyq36IifDBNZeCVgQIWz8Q+YT2s dEKZ2xcwjBcFos59rdePO69iY/+DqWhdMI/NsgLmD6SFdUvRbSTFeBaftcB99jW38y4w +6YVTUvEfgIUCfaT7xokQV9O84HV8zwqQzrRREFsX7aHml2L8/vgGWvk6YirAGAbCftD Bwa0vHICs/Bje764ZpbyaCokYYuAcVWV+EVYqkwS3Tkdm8LpFm0Fr2va6kqEVxSFCRz0 qysA== X-Gm-Message-State: AOAM531w06wd9bXEBngRau6maxgRoc7N2pDD2jlK6uADbqYYrvCYUbW7 /mnCfsUeCC6wDySpbhJszZNK45pJt2PDTQ== X-Google-Smtp-Source: ABdhPJyT70DBG4QHdDpkPRzEJM25/0Mmi9JTzT5pTMda/2skQfHY+9zXHsOiah61uClhsUH0FgUPuw== X-Received: by 2002:a9d:1725:: with SMTP id i37mr287413ota.258.1607467580962; 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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 14:46:20 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v8 09/18] luks2: Add string "index" to user strings using a json index. Date: Tue, 8 Dec 2020 16:45:40 -0600 Message-Id: <9841667705da8873cdb16eae524001eee90ebcc1.1607466704.git.development@efficientek.com> 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::344; envelope-from=development@efficientek.com; helo=mail-ot1-x344.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:34 -0000 This allows error messages to be more easily distinguishable between indexes and slot keys. The former include the string "index" in the error/debug string, and the later are surrounded in quotes. Signed-off-by: Glenn Washburn --- grub-core/disk/luks2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index 7e0419a82..ebf03e77b 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -272,7 +272,7 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s 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_json_idx); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse keyslot index %"PRIuGRUB_SIZE, keyslot_json_idx); /* Get digest that matches the keyslot. */ if (grub_json_getvalue (&digests, root, "digests") || @@ -284,7 +284,7 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s 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, json_idx); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest index %"PRIuGRUB_SIZE, json_idx); if ((d->keyslots & (1 << k->idx))) break; @@ -302,7 +302,7 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s 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, json_idx); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment index %"PRIuGRUB_SIZE, json_idx); if ((d->segments & (1 << s->idx))) break; -- 2.27.0