From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kUeKh-0000gN-CP for mharc-grub-devel@gnu.org; Mon, 19 Oct 2020 19:12:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUeKd-0000Xx-FE for grub-devel@gnu.org; Mon, 19 Oct 2020 19:12:47 -0400 Received: from mail-oi1-x242.google.com ([2607:f8b0:4864:20::242]:38285) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kUeKY-0007VM-PQ for grub-devel@gnu.org; Mon, 19 Oct 2020 19:12:47 -0400 Received: by mail-oi1-x242.google.com with SMTP id h10so1951205oie.5 for ; Mon, 19 Oct 2020 16:12:41 -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=zTRHUcIzqQHMA/UvpqoXG1qPs692+HoNfsa7AhK3g3I=; b=JilmKzZLQwfOJ/N0UAOSvzRE6hFeOGNiQQ/8e8PYRB8PM6btXUc/GZzJ0Xb+m8r63H zTPlmRil6uwkir0gnnOtQRXLxj9GBWp5h/enXEnNjNSl+P5dWVmAdUyb9LOhVbBJrGct n/EjKAYJEz9vjz2vy01KMcBJFrO3Jaowk4XQcJAwCWWrBSXGAJg6pr1f41ODqrobyPap K2DSOhJ45Wf7/LpxPHJYH47EyuIsZO10/bK3Jp87C1V5+bSFSw6Ys44dmu1kcilvuzyR TOtcsKAvKQ3zyp+Z0JeShpK6I97G0lGwJP7DXusfQodAeTm90V/v+fHwzljx2w4dsUR5 X4+g== 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=zTRHUcIzqQHMA/UvpqoXG1qPs692+HoNfsa7AhK3g3I=; b=pMKOWtjnLCIoquEzW+7XMQleZSv0kCZlVPZv4U02xJKvL4X+HkJatSnsHbf7Y+phBH ecJkRfIuewUUYSV+4tcgpOHIx9ePa2KRPTXnfeBABUnK3eEXU+iTqMDQ49iLkpa3OdsN g+goGdSe6+z/jqUTbvm9UJ01OXLzhB0t1oBrTeMvw+17WTfrKGcZoMHE6JcKkAj32o/k bdAZ6/HyF/qBb1cpDQNYdU03QWnA6NQqOAfT/fTnR733HbzLaDEnIBaqQyk3vo9DkIMo NZxC/pMh4fJTl+L7+y9JI+7cfDutiGitXWJbz2pY6vu6+K+6zx6YGrCTqNoJwO2MuFQp hqGA== X-Gm-Message-State: AOAM532/JDfAJRdPnX4MOFaeyRyo0VGclteCu72wf2w3C5RaSkx678nJ TvovgP9OgpeD6dr4cElqSdH3eOAG36B4JQ== X-Google-Smtp-Source: ABdhPJyVmCrSc2/JeZNWtGYzu2ZwP3cWNHiX/OJG2eR3UcPu2ekFEd9alyptJTbZl1nTuMa7sAnNpg== X-Received: by 2002:aca:1311:: with SMTP id e17mr114439oii.158.1603149160247; Mon, 19 Oct 2020 16:12:40 -0700 (PDT) Received: from localhost.localdomain (47-218-232-180.bcstcmtk03.res.dyn.suddenlink.net. [47.218.232.180]) by smtp.gmail.com with ESMTPSA id d27sm310848otc.6.2020.10.19.16.12.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2020 16:12:39 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v3 08/10] cryptodisk: Rename total_length field in grub_cryptodisk_t to total_sectors. Date: Mon, 19 Oct 2020 18:09:56 -0500 Message-Id: <28e0cac661495f962db3898bd97e8975492cab0a.1603148099.git.development@efficientek.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: <20201009100122.GH2088@tanuki> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::242; envelope-from=development@efficientek.com; helo=mail-oi1-x242.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: Mon, 19 Oct 2020 23:12:47 -0000 This creates an alignment with grub_disk_t naming of the same field and is more intuitive as to how it should be used. Signed-off-by: Glenn Washburn --- grub-core/disk/cryptodisk.c | 2 +- grub-core/disk/geli.c | 2 +- grub-core/disk/luks.c | 2 +- grub-core/disk/luks2.c | 4 ++-- include/grub/cryptodisk.h | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index 1a91c2d55..f5d098f65 100644 --- a/grub-core/disk/cryptodisk.c +++ b/grub-core/disk/cryptodisk.c @@ -711,7 +711,7 @@ grub_cryptodisk_open (const char *name, grub_disk_t disk) } disk->data = dev; - disk->total_sectors = dev->total_length; + disk->total_sectors = dev->total_sectors; disk->max_agglomerate = GRUB_DISK_MAX_MAX_AGGLOMERATE; disk->id = dev->id; dev->ref++; diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c index e9d23299a..4ec875821 100644 --- a/grub-core/disk/geli.c +++ b/grub-core/disk/geli.c @@ -391,7 +391,7 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid, newdev->modname = "geli"; - newdev->total_length = grub_disk_get_size (disk) - 1; + newdev->total_sectors = grub_disk_get_size (disk) - 1; grub_memcpy (newdev->uuid, uuid, sizeof (newdev->uuid)); COMPILE_TIME_ASSERT (sizeof (newdev->uuid) >= 32 * 2 + 1); return newdev; diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c index 20cc20b9b..545734342 100644 --- a/grub-core/disk/luks.c +++ b/grub-core/disk/luks.c @@ -125,7 +125,7 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid, newdev->offset = grub_be_to_cpu32 (header.payloadOffset); newdev->source_disk = NULL; newdev->log_sector_size = LUKS1_LOG_SECTOR_SIZE; - newdev->total_length = grub_disk_get_size (disk) - newdev->offset; + newdev->total_sectors = grub_disk_get_size (disk) - newdev->offset; grub_memcpy (newdev->uuid, uuid, sizeof (uuid)); newdev->modname = "luks"; diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index b9e0e98e1..bae54936c 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -616,10 +616,10 @@ luks2_recover_key (grub_disk_t disk, crypt->log_sector_size = sizeof (unsigned int) * 8 - __builtin_clz ((unsigned int) segment.sector_size) - 1; if (grub_strcmp (segment.size, "dynamic") == 0) - crypt->total_length = (grub_disk_get_size (disk) >> (crypt->log_sector_size - disk->log_sector_size)) + crypt->total_sectors = (grub_disk_get_size (disk) >> (crypt->log_sector_size - disk->log_sector_size)) - crypt->offset; else - crypt->total_length = grub_strtoull (segment.size, NULL, 10) >> crypt->log_sector_size; + crypt->total_sectors = grub_strtoull (segment.size, NULL, 10) >> crypt->log_sector_size; ret = luks2_decrypt_key (candidate_key, disk, crypt, &keyslot, (const grub_uint8_t *) passphrase, grub_strlen (passphrase)); diff --git a/include/grub/cryptodisk.h b/include/grub/cryptodisk.h index 006f3ec49..9e10ae927 100644 --- a/include/grub/cryptodisk.h +++ b/include/grub/cryptodisk.h @@ -73,7 +73,8 @@ struct grub_cryptodisk char *source; grub_disk_addr_t offset; - grub_disk_addr_t total_length; + /* Total number of encrypted sectors of size (1<