From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kiZgC-0004kX-PQ for mharc-grub-devel@gnu.org; Fri, 27 Nov 2020 04:04:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiZgB-0004iJ-JT for grub-devel@gnu.org; Fri, 27 Nov 2020 04:04:35 -0500 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]:33377) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kiZg9-0005SU-Nk for grub-devel@gnu.org; Fri, 27 Nov 2020 04:04:35 -0500 Received: by mail-lf1-x134.google.com with SMTP id l11so6061365lfg.0 for ; Fri, 27 Nov 2020 01:04:33 -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=BhqtmAOiHnUVg6mhwmNBbccwxVzOc7f1rhYzbONyKuU=; b=Qyr+wxGVb/1WSVT9NWMp44eX39n6NfS/YhyP+6n3vY/BDcd6H/E4URGNMJ5yFQ1ME2 W4E2oKh2h448JW/UDv5+TKEPql6V1KZkNINFJYJGqd0EmTrcFqD/SHd8d5lxQjnjKPLN LIbv6xYvJZjw1lgyHEyjOzFokUzEXd6s3t7aJgX0R1QYEDhDjCNKpEcBbET2FgpaNM5S aJF+NeGB6xdPqXL1fMgJHcMCJ6sEmsAdLQymtng6KOvHCdopLhm40vXoIXpPfhR/+Q6A y/OWoVoyU2cCdIwLUYSWbAOp6sCc+p1H7tah0cKDXkHLBHtCBAZIvZxBYSkWASYJcVxl gBSA== 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=BhqtmAOiHnUVg6mhwmNBbccwxVzOc7f1rhYzbONyKuU=; b=Jj0OSqQ2BExgVYit8x/i1ysSpKjASzb54UTQ1XJdslesOuwa/3F9YTNap4nt+TnEZM 23w8N2SCicKB5vRl8QsPlplRWsoqijCMe8xbhq6xPiOlycjXMReeg8CaqPAQIJBuH83Z Y4ZDbkesp/AXggOsio37LCOlr0pfDnsSgSrCu9fF0RwXvSLxycEcq2TlHY2lBjH3rD1I UGhAY2wZrSFefZde7XzrLEpen5aiOKdVBM8dQRXOnYOsjXq53PPGftRU8LVE4JWXyBCl vog6QhN+kehlurEXOQ4VNt3ERI5Lhkt00rXWPLGk4agmi5rKh+gIS0lNuKh7aKHa2d7/ c/Ew== X-Gm-Message-State: AOAM532stimtMvwf++8Fr/SQ1uO2l2juvFw/MSK71yX3Fvvi14+nzl03 Le7Da15gD9eeN8Q8t9LnxcweGd5jFnDrlA== X-Google-Smtp-Source: ABdhPJyVianLHfx++wQsPoC882Ax2zX6hqn3eRcoZ/nX5OoLLFTuOFup+G/nqYBa/LcCje6Wwjbpmw== X-Received: by 2002:a19:ed1:: with SMTP id 200mr3164429lfo.191.1606467871633; Fri, 27 Nov 2020 01:04:31 -0800 (PST) Received: from localhost.localdomain ([136.49.211.192]) by smtp.gmail.com with ESMTPSA id g2sm880675lja.87.2020.11.27.01.04.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 01:04:31 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v6 04/12] cryptodisk: Replace some literals with constants in grub_cryptodisk_endecrypt Date: Fri, 27 Nov 2020 03:03:36 -0600 Message-Id: <1a248b679bdc8244284f0bc4b6d926860f7e7865.1606467382.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=2a00:1450:4864:20::134; envelope-from=development@efficientek.com; helo=mail-lf1-x134.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: Fri, 27 Nov 2020 09:04:35 -0000 This should improve readability of code by providing clues as to what the value represents. The new macro GRUB_TYPE_BITS(type) returns the number of bits allocated for type. Also add GRUB_TYPE_U_MAX/MIN(type) macros to get the max/min values for an unsigned number with size of type. Signed-off-by: Glenn Washburn --- grub-core/disk/cryptodisk.c | 13 +++++++------ include/grub/types.h | 5 +++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index 473c93976..31b73c535 100644 --- a/grub-core/disk/cryptodisk.c +++ b/grub-core/disk/cryptodisk.c @@ -284,22 +284,23 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev, iv[1] = grub_cpu_to_le32 (sector >> 32); /* FALLTHROUGH */ case GRUB_CRYPTODISK_MODE_IV_PLAIN: - iv[0] = grub_cpu_to_le32 (sector & 0xFFFFFFFF); + iv[0] = grub_cpu_to_le32 (sector & GRUB_TYPE_U_MAX (iv[0])); break; case GRUB_CRYPTODISK_MODE_IV_BYTECOUNT64: - iv[1] = grub_cpu_to_le32 (sector >> (32 - dev->log_sector_size)); + iv[1] = grub_cpu_to_le32 (sector >> (GRUB_TYPE_BITS (iv[1]) + - dev->log_sector_size)); iv[0] = grub_cpu_to_le32 ((sector << dev->log_sector_size) - & 0xFFFFFFFF); + & GRUB_TYPE_U_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_BITS (iv[0])); + iv[sz - 1] = grub_cpu_to_be32 (num & GRUB_TYPE_U_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_U_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 f22055f98..29d807f71 100644 --- a/include/grub/types.h +++ b/include/grub/types.h @@ -72,6 +72,8 @@ # endif #endif +#define GRUB_TYPE_BITS(type) (sizeof(type) * GRUB_CHAR_BIT) + #ifndef __CHAR_BIT__ # error __CHAR_BIT__ is not defined #elif __CHAR_BIT__ != 8 @@ -159,6 +161,9 @@ typedef grub_int32_t grub_ssize_t; #endif # define GRUB_LONG_MIN (-GRUB_LONG_MAX - 1) +#define GRUB_TYPE_U_MAX(type) ((typeof (1ULL))((typeof (type))(~0))) +#define GRUB_TYPE_U_MIN(type) 0ULL + typedef grub_uint64_t grub_properly_aligned_t; #define GRUB_PROPERLY_ALIGNED_ARRAY(name, size) grub_properly_aligned_t name[((size) + sizeof (grub_properly_aligned_t) - 1) / sizeof (grub_properly_aligned_t)] -- 2.27.0