Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1k1Tke-0007il-3e for mharc-grub-devel@gnu.org; Fri, 31 Jul 2020 08:03:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1Tkc-0007eA-F6 for grub-devel@gnu.org; Fri, 31 Jul 2020 08:03:02 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:46069) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k1Tka-0005ZK-Ix for grub-devel@gnu.org; Fri, 31 Jul 2020 08:03:02 -0400 Received: by mail-pl1-x643.google.com with SMTP id bh1so4084082plb.12 for ; Fri, 31 Jul 2020 05:03:00 -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=SAw++i7UyIemTmzqRbTRhazLwL2EbXNBqdyvbL5ep/w=; b=SQ1eN7V5SbMaOZZYaLP0jiacUcZnLBkXIk5P5DeqY/dm55j2TmcWuLR5XQRtVjmkjD zGsxd4+M3KNGpAP1CFBReGJvqT/iS6LG5c6oNBIgk0NGl1lP9NOcHD1pKHZUXFHo7/Du ykZ/MsTONmgBNV/eCA6xDrBlGqgsah+RUdbHSggP7c0W6wQ9u4YAIvJsyTbrzxN+/Uy5 SXii37wgpUPM7O7l5NYbdO1kJxAtmXCWd7wJhf8RMocISq0nvp0P3GVbrp0NHHKbbvr0 gnMBxFqcIAzgY5RfNRfDDPPsWyC35u9ysMVeWSUpvQiK1VB+vZDYi4HN0c29s/EL7Qa+ ggxQ== 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=SAw++i7UyIemTmzqRbTRhazLwL2EbXNBqdyvbL5ep/w=; b=QuUsw2qeDoCcJ9XuwPTe5cXyJXJKAplXAd/7lRoEjJw5IuoJ7p7QGFz89E5h3OvTxE YRc0SGKfRE6rWl2bYyXHhqAF0CNkY5KPTRCb7a6sVm+8Hd672WekdiJZz1m/h+5piHLz BMQOm7SjKVskKtIYA41MEjToS2VaCv1itI3DL9uSTs0eWiVPUFUrbj3p0gXZKERuT6rn 1iuqSWVSkfb2Q+kLZQ2w56KizPx7/TpjyHD3f+KnEynkEwFT7ioZyECMPkLrgvKEcwcs vhKOzhxxLybQVpyZlTpvND3eg7KfbWsUqt/E+DgE4Zch4Y8eDs6a18Yh7RIF3Vcsy5Da Fb7Q== X-Gm-Message-State: AOAM532SEPDcaOXCHMdgZ1cM5nJyQOuyHdkWZ8AO/imBrYjCy1lsdBab TEP1Skf8aoF9kjnYNxQ6ycB/4Bnvtys= X-Google-Smtp-Source: ABdhPJxhhVfxGCW4PX39e8pZzzF1+Vfv5/gfJWOTmgmfbPZ0cl5FOlX4k5fx5EUdoACkyN+rYRw/GQ== X-Received: by 2002:a17:90a:ce90:: with SMTP id g16mr3853178pju.109.1596196978951; Fri, 31 Jul 2020 05:02:58 -0700 (PDT) Received: from localhost.localdomain ([189.216.105.24]) by smtp.gmail.com with ESMTPSA id o4sm9781590pfd.25.2020.07.31.05.02.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2020 05:02:58 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org Cc: Glenn Washburn , Daniel Kiper , Patrick Steinhardt Subject: [CRYPTO-LUKS v1 19/19] cryptodisk: Rename offset in grub_cryptodisk_t to offset_sectors to improve readability. Date: Fri, 31 Jul 2020 07:02:00 -0500 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::643; envelope-from=development@efficientek.com; helo=mail-pl1-x643.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: Fri, 31 Jul 2020 12:03:02 -0000 Signed-off-by: Glenn Washburn --- grub-core/disk/cryptodisk.c | 12 ++++++------ grub-core/disk/geli.c | 2 +- grub-core/disk/luks.c | 4 ++-- grub-core/disk/luks2.c | 4 ++-- include/grub/cryptodisk.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index 2c6e73b39..4921d031d 100644 --- a/grub-core/disk/cryptodisk.c +++ b/grub-core/disk/cryptodisk.c @@ -761,12 +761,12 @@ grub_cryptodisk_read (grub_disk_t disk, grub_disk_addr_t sector, "Reading %" PRIuGRUB_SIZE " sectors from sector 0x%" PRIxGRUB_UINT64_T " with offset of %" PRIuGRUB_UINT64_T " sectors and sector size of %u on disk (%s)\n", - size, sector, dev->offset, 1U << disk->log_sector_size, + size, sector, dev->offset_sectors, 1U << disk->log_sector_size, dev->source_disk->name); err = grub_disk_read (dev->source_disk, - ((sector + dev->offset) << (disk->log_sector_size - - GRUB_DISK_SECTOR_BITS)), 0, + ((sector + dev->offset_sectors) << (disk->log_sector_size + - GRUB_DISK_SECTOR_BITS)), 0, size << disk->log_sector_size, buf); if (err) { @@ -813,7 +813,7 @@ grub_cryptodisk_write (grub_disk_t disk, grub_disk_addr_t sector, "Writing %" PRIuGRUB_SIZE " sectors to sector 0x%" PRIxGRUB_UINT64_T " with offset of %" PRIuGRUB_UINT64_T " sectors and sector size of %u on disk (%s)\n", - size, sector, dev->offset, 1U << disk->log_sector_size, + size, sector, dev->offset_sectors, 1U << disk->log_sector_size, dev->source_disk->name); gcry_err = grub_cryptodisk_endecrypt (dev, (grub_uint8_t *) tmp, @@ -831,7 +831,7 @@ grub_cryptodisk_write (grub_disk_t disk, grub_disk_addr_t sector, err = grub_disk_write_weak (dev->source_disk, (sector << (disk->log_sector_size - GRUB_DISK_SECTOR_BITS)) - + dev->offset, + + dev->offset_sectors, 0, size << disk->log_sector_size, tmp); else err = grub_error (GRUB_ERR_BUG, "disk.mod not loaded"); @@ -1262,7 +1262,7 @@ luks_script_get (grub_size_t *sz) *ptr++ = ' '; ptr = grub_stpcpy (ptr, i->uuid); *ptr++ = ' '; - ptr += grub_snprintf (ptr, 21, "%" PRIuGRUB_UINT64_T " ", i->offset); + ptr += grub_snprintf (ptr, 21, "%" PRIuGRUB_UINT64_T " ", i->offset_sectors); ptr += grub_snprintf (ptr, 6, "%d ", 1 << i->log_sector_size); for (iptr = i->cipher->cipher->name; *iptr; iptr++) *ptr++ = grub_tolower (*iptr); diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c index 4ec875821..0175ce4c4 100644 --- a/grub-core/disk/geli.c +++ b/grub-core/disk/geli.c @@ -361,7 +361,7 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid, } newdev->cipher = cipher; newdev->secondary_cipher = secondary_cipher; - newdev->offset = 0; + newdev->offset_sectors = 0; newdev->source_disk = NULL; newdev->benbi_log = 0; if (grub_le_to_cpu16 (header.alg) == 0x16) diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c index b1db3d137..f825fa9a9 100644 --- a/grub-core/disk/luks.c +++ b/grub-core/disk/luks.c @@ -110,10 +110,10 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid, newdev = grub_zalloc (sizeof (struct grub_cryptodisk)); if (!newdev) return NULL; - newdev->offset = grub_be_to_cpu32 (header.payloadOffset); + newdev->offset_sectors = grub_be_to_cpu32 (header.payloadOffset); newdev->source_disk = NULL; newdev->log_sector_size = LOG_SECTOR_SIZE; - newdev->total_sectors = grub_disk_get_size (disk) - newdev->offset; + newdev->total_sectors = grub_disk_get_size (disk) - newdev->offset_sectors; grub_memcpy (newdev->uuid, header.uuid, sizeof (newdev->uuid)); newdev->modname = "luks"; diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index 09584c84c..35f705076 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -605,7 +605,7 @@ luks2_recover_key (grub_disk_t source, grub_dprintf ("luks2", "Trying keyslot %"PRIuGRUB_SIZE"\n", i); /* Set up disk according to keyslot's segment. */ - crypt->offset = grub_divmod64 (segment.offset, segment.sector_size, NULL); + crypt->offset_sectors = grub_divmod64 (segment.offset, segment.sector_size, NULL); crypt->log_sector_size = sizeof (unsigned int) * 8 - __builtin_clz ((unsigned int) segment.sector_size) - 1; if (grub_strcmp (segment.size, "dynamic") == 0) @@ -614,7 +614,7 @@ luks2_recover_key (grub_disk_t source, * before subtracting the offset, which is in cryptodisk sized sectors. */ crypt->total_sectors = (grub_disk_get_size (source) >> (crypt->log_sector_size - source->log_sector_size)) - - crypt->offset; + - crypt->offset_sectors; else crypt->total_sectors = grub_strtoull (segment.size, NULL, 10) >> crypt->log_sector_size; diff --git a/include/grub/cryptodisk.h b/include/grub/cryptodisk.h index 8d3284aad..1a78f6f58 100644 --- a/include/grub/cryptodisk.h +++ b/include/grub/cryptodisk.h @@ -70,7 +70,7 @@ struct grub_cryptodisk /* The offset number of sectors of the encrypt data on the underlying disk * where sectors are the size of this cryptodisk. */ - grub_disk_addr_t offset; + grub_disk_addr_t offset_sectors; /* Total number of encrypted sectors of size (1<