From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1klEm1-0000UF-3i for mharc-grub-devel@gnu.org; Fri, 04 Dec 2020 12:21:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klEgy-0008IN-TA for grub-devel@gnu.org; Fri, 04 Dec 2020 12:16:47 -0500 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:39129) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1klEe4-0007so-O2 for grub-devel@gnu.org; Fri, 04 Dec 2020 12:15:17 -0500 Received: by mail-pg1-x543.google.com with SMTP id f17so3889322pge.6 for ; Fri, 04 Dec 2020 09:12:24 -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=e0jIEYsdjyfBlMxv9EJKuDyK4jCkCKzOREOe4yJ8R4g=; b=SOcLT5MoBXWh4BjgfcHAyZZ9B/5nUtEGtaEGoJO+VTM6qDxzIOeYN8KsCtcDIozyeU EkzMxwgCSFu/TEPNClgq5WdSPI7NnUjUVcLf+TSc05H18nAU6ioAmbqHe5KSGt9EY8u/ oc64f+TnE0yBZBdg+HNSEWs1ErbrhCmIvB1b6YtmCNP78AzvYcY7xgekdOnW3KlnjrgC qZtdbky4+noUfbxZDSnyQMw7LybkD+GJOclpBMsY9ur2wUymWokT9zku7O273ZJWO8vG oWkU8KPmCGtjSdp+WJ42mCQsUDb4TI+qJtE3HAmyBFZ1sbcldHoj4ZWBPg/rnqXE3eT+ ZsHw== 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=e0jIEYsdjyfBlMxv9EJKuDyK4jCkCKzOREOe4yJ8R4g=; b=qAQGuXn11+h2tY/viiWjKej+aUxQDLNl1KJjunzkfqhhikNkc5k8KyejZahE2LodM2 iBTK8aUFPPrOLPd2jQmQeStE/dMrWgOt7ZFmoVluuArdDdkS2CYt1lA3s+rFo1EKc5wo mwH0rAuDWxxph7RNYj56jQH0EB2A5ey4GzSoP+h7lRDIknv+ViZt7srfWH4rm7QcqoYU r7TEp5ZCz4YPqvI6t38meqbG4RRrPOYJMM9nbjcAgMK2DajOncombN95QrgI7V2BIMZ7 bu6sxBo0bnIrii2sGHvplauJfAuw+J9W8+73vh0APfZqlp0tedqy1I2Vjl+GBysH7c5z OOTQ== X-Gm-Message-State: AOAM530G0dHu2b3rNivnNr8YmUTD44fJZCvEAn/EZOvuYlStL/Jpq1RO 0qbt3tJgiIEEiIk7KJ5YxQUl0CMJprJ8Dg== X-Google-Smtp-Source: ABdhPJyYY7RC0fCwvQp06Axd85cKoH/kh11WWxTM9kCktjQkin4D+xzLeCzNxwApNXSVZ3EJjo2Bsg== X-Received: by 2002:a92:15c6:: with SMTP id 67mr7195114ilv.283.1607100261534; Fri, 04 Dec 2020 08:44:21 -0800 (PST) Received: from localhost.localdomain ([136.49.211.192]) by smtp.gmail.com with ESMTPSA id w3sm1754909iol.9.2020.12.04.08.44.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 08:44:21 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v7 08/17] cryptodisk: Add macro GRUB_TYPE_BITS() to replace some literals Date: Fri, 4 Dec 2020 10:43:37 -0600 Message-Id: <4aa9757e1dcdebbdf503e6fe56c0b2b7e55334ea.1607098915.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::543; envelope-from=development@efficientek.com; helo=mail-pg1-x543.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=unavailable 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, 04 Dec 2020 17:17:06 -0000 The new macro GRUB_TYPE_BITS(type) returns the number of bits allocated for type. Signed-off-by: Glenn Washburn --- grub-core/disk/cryptodisk.c | 7 ++++--- include/grub/types.h | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index 473c93976..0e955a020 100644 --- a/grub-core/disk/cryptodisk.c +++ b/grub-core/disk/cryptodisk.c @@ -281,20 +281,21 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev, } break; case GRUB_CRYPTODISK_MODE_IV_PLAIN64: - iv[1] = grub_cpu_to_le32 (sector >> 32); + iv[1] = grub_cpu_to_le32 (sector >> GRUB_TYPE_BITS (iv[0])); /* FALLTHROUGH */ case GRUB_CRYPTODISK_MODE_IV_PLAIN: iv[0] = grub_cpu_to_le32 (sector & 0xFFFFFFFF); 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); 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 - 2] = grub_cpu_to_be32 (num >> GRUB_TYPE_BITS (iv[0])); iv[sz - 1] = grub_cpu_to_be32 (num & 0xFFFFFFFF); } break; diff --git a/include/grub/types.h b/include/grub/types.h index f22055f98..9989e3a16 100644 --- a/include/grub/types.h +++ b/include/grub/types.h @@ -80,6 +80,8 @@ # define GRUB_CHAR_BIT __CHAR_BIT__ #endif +#define GRUB_TYPE_BITS(type) (sizeof(type) * GRUB_CHAR_BIT) + /* Define various wide integers. */ typedef signed char grub_int8_t; typedef short grub_int16_t; -- 2.27.0