From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kUDLE-00069k-Pb for mharc-grub-devel@gnu.org; Sun, 18 Oct 2020 14:23:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUDLC-00068z-FH for grub-devel@gnu.org; Sun, 18 Oct 2020 14:23:34 -0400 Received: from mail-qk1-x741.google.com ([2607:f8b0:4864:20::741]:37113) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kUDLA-0003mI-DR for grub-devel@gnu.org; Sun, 18 Oct 2020 14:23:34 -0400 Received: by mail-qk1-x741.google.com with SMTP id z6so6214172qkz.4 for ; Sun, 18 Oct 2020 11:23:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=SCRO21Do/v1tqecVU7buhP6TIcZTeYVT6XZEoCiBZks=; b=Dkf/bxxw60qUYGtNajYXep728Zdow40Ij9BsFJmI6x+fwC4nxANY+hZkZ+CeOfV+RD bNUCqgBix8mC1/jYVfRrmo+CH4Nz5Y77Q/IR/M7gv/xgWI7jvrTTV4op6sZ2L3o5CHpB Q6ZhZua6kSzzlQJ3w6LsBEHAqkaQAySgp/AdYUlUGQuBd9KWwCuSc1RwMCjI0nmSVVlx OFkIiFNo1otPqbevbO4QTTjH9qJdF8f+yFoYf60cNR9q+VfVwypVH4yX9NhYdUp73WKw WUfUFR9rm2K+2K/EuJPMsEwxPEzOeyu+gcg8zdOUWvdNhkLp9SzAo3X7NXk2bRURPLhj 4hoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=SCRO21Do/v1tqecVU7buhP6TIcZTeYVT6XZEoCiBZks=; b=pbXZyGotwyzu/9zL617cHfulbJskrTdHD1y5Lr1/h0KG2Iyk0MnSQClZBfcK86Dxnh kDpWd9gbCLfFVNs1UpUfgkvPU1a1SC6gVyke2YO1x+ckqTq1ng62Ml50whqxosZZQ5wI yVXvMMAIlXXUIj84bBjZhwulhOS4P0cAK+wMQZCkJNvCSkpvbateVhPQQGvVk9cKA+NW R6VGemYAz93vCnveF85QJ+C0fPXWRBlbu8jBw09+gy1WisstRGPVS8cNfsrzy2z9+g7w 2bZ936gEqh1ZNZdf78Aq/K7glK/mi+3PlrfbbkmyRx818+64hBGsKlKZ0P4QAh3358cv nHRg== X-Gm-Message-State: AOAM53095OBlRxyW6tMzi+g79tGe7Q0wRJHEGrGklxT7zDB+HUEyA12D uJ6QQqdZ7vCLyQHBQQNpZbEbzt7QB6UxtvEA X-Google-Smtp-Source: ABdhPJx7ze6p90lwlgN1PlHngg0aQMTHdV88pXaKrC4Hq9MQj4Cv5BMtwk7WxKZx2cRtZyGNatWmiA== X-Received: by 2002:ae9:e711:: with SMTP id m17mr12850129qka.255.1603045410096; Sun, 18 Oct 2020 11:23:30 -0700 (PDT) Received: from crass-HP-ZBook-15-G2 (47-218-232-180.bcstcmtk03.res.dyn.suddenlink.net. [47.218.232.180]) by smtp.gmail.com with ESMTPSA id x62sm3351544qke.10.2020.10.18.11.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Oct 2020 11:23:29 -0700 (PDT) Date: Sun, 18 Oct 2020 13:23:25 -0500 From: Glenn Washburn To: grub-devel@gnu.org Cc: Daniel Kiper , Patrick Steinhardt Subject: Re: [PATCH v2 07/10] cryptodisk: Replace some literals with constants in grub_cryptodisk_endecrypt. Message-ID: <20201018132156.727d87c5@crass-HP-ZBook-15-G2> In-Reply-To: References: Reply-To: development@efficientek.com X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=2607:f8b0:4864:20::741; envelope-from=development@efficientek.com; helo=mail-qk1-x741.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: Sun, 18 Oct 2020 18:23:34 -0000 Daniel, Patrick, Have either of you had a chance to review this patch? Daniel, this is my interpretation of what you suggested earlier to remove constant literals in this message: https://lists.gnu.org/archive/html/grub-devel/2020-09/msg00069.html I'm going to make a v3 patchset with Patrick's suggested changes. Please reply to that patch. Glenn On Sat, 3 Oct 2020 17:55:31 -0500 Glenn Washburn wrote: > This should improve readability of code by providing clues as to what > the value represents. > > Signed-off-by: Glenn Washburn > --- > grub-core/disk/cryptodisk.c | 12 +++++++----- > include/grub/types.h | 3 +++ > 2 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c > index 623f0f396..1a91c2d55 100644 > --- a/grub-core/disk/cryptodisk.c > +++ b/grub-core/disk/cryptodisk.c > @@ -297,19 +297,21 @@ grub_cryptodisk_endecrypt (struct > grub_cryptodisk *dev, } > break; > case GRUB_CRYPTODISK_MODE_IV_BYTECOUNT64: > - iv[1] = grub_cpu_to_le32 (sector >> (32 - > log_sector_size)); > + /* The IV is the 64 bit byte offset of the sector. */ > + iv[1] = grub_cpu_to_le32 (sector >> (GRUB_TYPE_BIT(iv[0]) > + - log_sector_size)); > iv[0] = grub_cpu_to_le32 ((sector << log_sector_size) > - & 0xFFFFFFFF); > + & GRUB_TYPE_MAX(iv[0])); > break; > case GRUB_CRYPTODISK_MODE_IV_BENBI: > { > grub_uint64_t num = (sector << dev->benbi_log) + 1; > - iv[sz - 2] = grub_cpu_to_be32 (num >> 32); > - iv[sz - 1] = grub_cpu_to_be32 (num & 0xFFFFFFFF); > + iv[sz - 2] = grub_cpu_to_be32 (num >> > GRUB_TYPE_BIT(iv[0])); > + iv[sz - 1] = grub_cpu_to_be32 (num & > GRUB_TYPE_MAX(iv[0])); } > break; > case GRUB_CRYPTODISK_MODE_IV_ESSIV: > - iv[0] = grub_cpu_to_le32 (sector & 0xFFFFFFFF); > + iv[0] = grub_cpu_to_le32 (sector & GRUB_TYPE_MAX(iv[0])); > err = grub_crypto_ecb_encrypt (dev->essiv_cipher, iv, iv, > dev->cipher->cipher->blocksize); > if (err) > diff --git a/include/grub/types.h b/include/grub/types.h > index 035a4b528..8b4267ebd 100644 > --- a/include/grub/types.h > +++ b/include/grub/types.h > @@ -319,4 +319,7 @@ static inline void grub_set_unaligned64 (void > *ptr, grub_uint64_t val) > #define GRUB_CHAR_BIT 8 > > +#define GRUB_TYPE_BIT(type) (sizeof(type) * GRUB_CHAR_BIT) > +#define GRUB_TYPE_MAX(type) ((2 * ((1ULL << (GRUB_TYPE_BIT(type) - > 1)) - 1)) + 1) + > #endif /* ! GRUB_TYPES_HEADER */