Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1k0tzK-0002h8-6N for mharc-grub-devel@gnu.org; Wed, 29 Jul 2020 17:51:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0tzI-0002eL-LB for grub-devel@gnu.org; Wed, 29 Jul 2020 17:51:48 -0400 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]:46839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0tzG-0006IM-QA for grub-devel@gnu.org; Wed, 29 Jul 2020 17:51:48 -0400 Received: by mail-qt1-x842.google.com with SMTP id o22so18619157qtt.13 for ; Wed, 29 Jul 2020 14:51:46 -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=YLmBkkVStEfdI8CuR7UFbHmpUATOeihQ1NazgbIDFAA=; b=0I71TfuFff74WNgreRAo4SsMbM7ZTx61WebXhpGCGM0CdEIOle3uviHYQX7pOUMqnk SnS1SAwuF5BhXEs1jeVcHJF5fF4aZVZsAZ1xum5rz6Awhwf0ozPON35pW9MnZux98ud7 Au1QS4TQhsp6C2pAN00Rrr74Busbl4VLXlEJU8tCLZtoLcnqGYOTwpumWRWL7oS5BZDb Id+W2jxSsKtQtHKnlB0jSvOoByyE0eC/WgwgYMpxIs8lH0cnMRC+cYHW3naDdRmHQE9V CZFRTdGQnTTECZNYF9gurkQ7S7mF8qeFEzKv4R3wJozujoAYM1fOs0cyjjFJZJ/6fQQH fkNA== 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=YLmBkkVStEfdI8CuR7UFbHmpUATOeihQ1NazgbIDFAA=; b=AQCba4yKwey1F0JCRb1Mb1XUkPolLVOSXD4+9FoAetupjniWlZbTyQPvHxUFmAsd5O Dt5Jr45UHbApn9M6OcymU5f7JHIoPA6eC27AQskGSfptHm+U0k+cvYuRN9pOOq4wo1xQ RmYr7LzRZNx89puSsTy56XBGc12Pz50g69LdPwNLlxfagncoEiqLGxktRAGN8S5O4UAd 4D3RfBS92i3FlWYdC6J9bMwU3Xqi/vJlIXU+ERthNHj1lbczbWd2UV51r8Y2loTOJHHg JnmMrD9CioiJhTJ4yZK0SZwIIMPrlEYVVVmxRChjo2CSYsXO5ihvAgFuc3N/yKmxs1l3 1pfw== X-Gm-Message-State: AOAM530GyixaNp6PpgaPzEw524ZCjUmWfuWcTnw40VZ/3T0fOO2eLr5+ E8/DDwe9ZsGQGWsYiv89kTAYogBfjWD5rQ== X-Google-Smtp-Source: ABdhPJwxq4IQitMk01/P9o/JZSIPFmgv/qHd0xo45IRE+HBTHNxfQac9t7dUseRJXntOA/XPGU5PuQ== X-Received: by 2002:ac8:5146:: with SMTP id h6mr26922qtn.290.1596059505642; Wed, 29 Jul 2020 14:51:45 -0700 (PDT) Received: from localhost.localdomain ([189.216.105.24]) by smtp.gmail.com with ESMTPSA id n127sm2804165qke.29.2020.07.29.14.51.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2020 14:51:45 -0700 (PDT) From: development@efficientek.com To: grub-devel@gnu.org Cc: Glenn Washburn , Daniel Kiper , Patrick Steinhardt Subject: [PATCH 02/17] cryptodisk: Fix cipher IV mode 'plain64' always being set as 'plain'. Date: Wed, 29 Jul 2020 16:50:07 -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::842; envelope-from=development@efficientek.com; helo=mail-qt1-x842.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: Wed, 29 Jul 2020 21:51:48 -0000 From: Glenn Washburn Signed-off-by: Glenn Washburn --- grub-core/disk/cryptodisk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index 1897acc4b..d8f66e9ef 100644 --- a/grub-core/disk/cryptodisk.c +++ b/grub-core/disk/cryptodisk.c @@ -501,10 +501,10 @@ grub_cryptodisk_setcipher (grub_cryptodisk_t crypt, const char *ciphername, cons if (cipheriv == NULL) ; - else if (grub_memcmp (cipheriv, "plain", sizeof ("plain") - 1) == 0) - mode_iv = GRUB_CRYPTODISK_MODE_IV_PLAIN; else if (grub_memcmp (cipheriv, "plain64", sizeof ("plain64") - 1) == 0) mode_iv = GRUB_CRYPTODISK_MODE_IV_PLAIN64; + else if (grub_memcmp (cipheriv, "plain", sizeof ("plain") - 1) == 0) + mode_iv = GRUB_CRYPTODISK_MODE_IV_PLAIN; else if (grub_memcmp (cipheriv, "benbi", sizeof ("benbi") - 1) == 0) { if (cipher->cipher->blocksize & (cipher->cipher->blocksize - 1) -- 2.25.1