From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1npHFr-0007Gs-GB for mharc-grub-devel@gnu.org; Thu, 12 May 2022 18:25:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npHFp-0007Gk-V9 for grub-devel@gnu.org; Thu, 12 May 2022 18:25:54 -0400 Received: from mail-vk1-xa35.google.com ([2607:f8b0:4864:20::a35]:42510) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1npHFo-000298-94 for grub-devel@gnu.org; Thu, 12 May 2022 18:25:53 -0400 Received: by mail-vk1-xa35.google.com with SMTP id e144so3371019vke.9 for ; Thu, 12 May 2022 15:25:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=k/neYGLoawKgdv/zYSMHZG8Fk4QUFGKGm/rBIzkhAYM=; b=EHYgpByrqxdyzBgdSeMR9Rnyby1117MliPBTMSzsd8+m5lfnE8xg41vuo5/HcEkG6h n5+/fc0MLNs867AVuS2/JQrfpgQX007K+KXh4M5UMfsp+2cNiyPPgHxu+gAGbrZpN7R1 OhsoScpveiIgze3b4EO4Fchut5H2Rv+faTKVB0AEF+wDPSea8hxsiE5t/f2J//PT+cpl IKFBiA1TGbDX9edJfP7pg5A+mQE0g/U1HkQpWPcRFWucjtbNxUHQSFKx/mAXunVj1tZ0 qGWVS2APRPEtj6W4kIp/ztJSlH8L7GpP+Gyl/wIyZCnqiauX6bPNFjpHveF7BsZRm7sX UtvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=k/neYGLoawKgdv/zYSMHZG8Fk4QUFGKGm/rBIzkhAYM=; b=wGJJh3Yqfx9K45Cq7mv6YOM1lveXXS0VQc3fHJs11jtg2buDVSirnkAzFXtLVL/r0S S5kxmhqcEQPEYJ0obXtMJlj8yBipmXj+P30E5JVKZ8svahUq6hKFXypQRt4X4w30FKdS 3APoCPstfPtskNfF/7Y01vdU1qq1QTmIF7XwsraUASG5fcHACkgCB+wrvjm8yz+VkBsg Z4XagATXijii7RP+z0wRDOOabkcJyaKHo/b0BWSjyS/EbGyo8v7cpzyFqWvwU+c2bXFb pq128LaLTd3RPW/imnuq58awSr7ePh57Zv1Za7e/DYbO+ldanFZw+3Us9rEAYGC+ZkAK /FeA== X-Gm-Message-State: AOAM530fwWibc8PGWG7GywEVPrFoK3NyBWIxXY07o731QrYciRXxfEQ8 ZougSWIo5KFkGWLz2Ety2SYjTw== X-Google-Smtp-Source: ABdhPJx5GqNHgZHyff7O1x7aCqe4P+R+dNnnetWKjkBdskOKGh2Yoh1+4HiTsgcggcZQNFNDN3zcxw== X-Received: by 2002:a05:6122:c56:b0:34e:5891:906d with SMTP id i22-20020a0561220c5600b0034e5891906dmr1168897vkr.7.1652394351000; Thu, 12 May 2022 15:25:51 -0700 (PDT) Received: from crass-HP-ZBook-15-G2 ([37.218.244.249]) by smtp.gmail.com with ESMTPSA id n6-20020a67e046000000b0032fd1d62244sm101197vsl.17.2022.05.12.15.25.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 15:25:50 -0700 (PDT) Date: Thu, 12 May 2022 17:25:43 -0500 From: Glenn Washburn To: Josselin Poiret Cc: grub-devel@gnu.org Subject: Re: [PATCH v2 1/2] devmapper/getroot: Have devmapper recognize LUKS2 Message-ID: <20220512172543.41c28408@crass-HP-ZBook-15-G2> In-Reply-To: <20211211122945.6326-2-dev@jpoiret.xyz> References: <20211209141526.002e83a4@crass-HP-ZBook-15-G2> <20211211122945.6326-1-dev@jpoiret.xyz> <20211211122945.6326-2-dev@jpoiret.xyz> Reply-To: development@efficientek.com X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; 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::a35; envelope-from=development@efficientek.com; helo=mail-vk1-xa35.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 May 2022 22:25:54 -0000 On Sat, 11 Dec 2021 13:29:44 +0100 Josselin Poiret wrote: > Changes UUID comparisons so that LUKS1 and LUKS2 are both recognized > as being LUKS cryptodisks. > --- > grub-core/osdep/devmapper/getroot.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/grub-core/osdep/devmapper/getroot.c b/grub-core/osdep/devmapper/getroot.c > index 9ba5c9865..ad1daf9c8 100644 > --- a/grub-core/osdep/devmapper/getroot.c > +++ b/grub-core/osdep/devmapper/getroot.c > @@ -138,7 +138,7 @@ grub_util_get_dm_abstraction (const char *os_dev) > grub_free (uuid); > return GRUB_DEV_ABSTRACTION_LVM; > } > - if (strncmp (uuid, "CRYPT-LUKS1-", 12) == 0) > + if (strncmp (uuid, "CRYPT-LUKS", sizeof ("CRYPT-LUKS") - 1) == 0) > { > grub_free (uuid); > return GRUB_DEV_ABSTRACTION_LUKS; > @@ -179,7 +179,7 @@ grub_util_pull_devmapper (const char *os_dev) > grub_util_pull_device (subdev); > } > } > - if (uuid && strncmp (uuid, "CRYPT-LUKS1-", sizeof ("CRYPT-LUKS1-") - 1) == 0 > + if (uuid && strncmp (uuid, "CRYPT-LUKS", sizeof ("CRYPT-LUKS") - 1) == 0 > && lastsubdev) > { > char *grdev = grub_util_get_grub_dev (lastsubdev); > @@ -253,11 +253,11 @@ grub_util_get_devmapper_grub_dev (const char *os_dev) > { > char *dash; > > - dash = grub_strchr (uuid + sizeof ("CRYPT-LUKS1-") - 1, '-'); > + dash = grub_strchr (uuid + sizeof ("CRYPT-LUKS*-") - 1, '-'); > if (dash) > *dash = 0; > grub_dev = grub_xasprintf ("cryptouuid/%s", > - uuid + sizeof ("CRYPT-LUKS1-") - 1); > + uuid + sizeof ("CRYPT-LUKS*-") - 1); > grub_free (uuid); > return grub_dev; > } Reviewed-by: Glenn Washburn Glenn