From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kbG8q-0000NY-FI for mharc-grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbG8o-0000JM-Q4 for grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:54 -0500 Received: from mail-oo1-xc43.google.com ([2607:f8b0:4864:20::c43]:34290) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kbG8m-0002tv-Vy for grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:54 -0500 Received: by mail-oo1-xc43.google.com with SMTP id f1so867326oov.1 for ; Fri, 06 Nov 2020 20:47:52 -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=hieCeLGCXiuJmscESIW8+d1IRycj68JnC/tjpau9I4o=; b=I5x/x7pxFxlhWfH1dhgq+2WFayEYwYLzNTC5boN/ncVxaYCZ1amI1U6QK5TOjBV4bg 1Tlq3K4p8n5Y99kbMgpPkDLMPSk6qBqX9fFe9CGegH8mnpb8tiUYGZ3n5TdGP0ZzKqXs HPWztB8NZDJVK/vEnHd5WQizGN0E99jajPbj87LwS1dbryRJwMPhn2zJew4+8wDjsg/2 jPXuaEzsvWow2VtBEGqHK3Cmgo51BNUQf0/tLEsErDYSGTvZAQzfWrJyA/N0bwf3VjRT v4QazY5zEd9hUoybATCWBEP0RiVr0qnfKxE5zeSGzKtx7pkgYv4vtc+CRLFXP4P34wsr C37w== 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=hieCeLGCXiuJmscESIW8+d1IRycj68JnC/tjpau9I4o=; b=Kzfm3qS6lPR1b6XUz9LtyJFJi0sdgtQ4kL4DcFDOpq119IStIGv8YdIDw0nNsAt5d4 YzB9gjYCH52RdVsHR8X5TieHamzC2EgDxFaJhT9nEyxNMUtYxOhb5sEVS7uL3jSn2NBK RkoFOlWMZ/mvbsjTkgSsGozWG568X1WWVnEv6S0eO3JMFiI0+Y3oUW7aeSNqc2evfbwV CL2cy/rkzQG6RSxMltqcRUGCjIsQ8KlchJVlba5R9mIN8CTsVaIXqMu44yf1vLj7jOZN 4R8bJdJPtIXWdbeZDqfny5VQ1YtbLwPXuFNO8W1O5+6t4OclsoHCJ73fW4FkH//wM7Vc Vmbw== X-Gm-Message-State: AOAM533vAojNPw4X62VsiZCTRv5ghB3ZHx3Pz5rnsn393h69FIjiV/On TKQvnyVFmm6a9YgkmMPM8M37ckVwwOWItDiL X-Google-Smtp-Source: ABdhPJyugk0lVwIdn5yBug8yXmLnX49LIRl5kpU23rwktpr3oRc2wptM3JagxR7xxo4DSFYVxF7ekQ== X-Received: by 2002:a4a:5a06:: with SMTP id v6mr3473240ooa.69.1604724471658; Fri, 06 Nov 2020 20:47:51 -0800 (PST) Received: from localhost.localdomain ([136.49.44.103]) by smtp.gmail.com with ESMTPSA id x25sm836888oie.17.2020.11.06.20.47.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 20:47:51 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v4 11/15] cryptodisk: Replace some literals with constants in grub_cryptodisk_endecrypt. Date: Fri, 6 Nov 2020 22:44:31 -0600 Message-Id: <87bafa5d9ef66472506a7a92b6e0a1cd1421c19e.1604723348.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::c43; envelope-from=development@efficientek.com; helo=mail-oo1-xc43.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: Sat, 07 Nov 2020 04:47:55 -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 495c86bb1..b57acc3b1 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) ((2 * ((1ULL << (GRUB_TYPE_BITS (type) - 1)) - 1)) + 1) +#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