From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1n3rvx-0000hW-HS for mharc-grub-devel@gnu.org; Sat, 01 Jan 2022 22:53:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3rvw-0000g2-3L for grub-devel@gnu.org; Sat, 01 Jan 2022 22:53:24 -0500 Received: from [2607:f8b0:4864:20::f33] (port=39798 helo=mail-qv1-xf33.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n3rvu-0007GD-OD for grub-devel@gnu.org; Sat, 01 Jan 2022 22:53:23 -0500 Received: by mail-qv1-xf33.google.com with SMTP id p12so3880809qvj.6 for ; Sat, 01 Jan 2022 19:53:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OzSSzzapnyRpvyPtxHT+HjLS/HDGpeGxTTzqJx28mCs=; b=AXL4RnPIFIPGj+SzGARnSn44Ljjz+fxQ6lg7MN7LJiqYgbqSJP4Lb7n1vJ9N/SGAfR Ds3EL+MdL0xan+KjmHSrpEUOl0mbwgWAVJQgLNjEznpCF3xtOUX/fwMcPRDnk3/PI+m4 H0ZEbr/jrmBPBbpPrg6vNqh/xRrqGV79vOxlumXPBoGjVqJxDQvhPbZqVpS5X9vYj8zn dgdJrDqJg7SuhiKBh0DwdwQ/devqoP5zfCs6huymljrDgG03klqoto0ew85RdiX4vgwV uqlSPrOt8b5WSCo/ZFWGUxuGv9aDay5QxZUp7XRZFb1D2DXVSOxYZdpw7YdbQWOAHKUl tNpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OzSSzzapnyRpvyPtxHT+HjLS/HDGpeGxTTzqJx28mCs=; b=U2AaQK8CsGwvaTMClqUSavgBn50WAFBFOEFM6Lz1IKAOJ4SILjG4tGrqd8r4iOmAAp cSHlVxKJIq+Fmh4LPJ4WLifS71QhR6KyQXLnuXn8z4KCfHmcmNrgLSG9SwL4XoIFnly5 RVmDkBPTDQvtCSLGVXpSA3rFgMczjF1g/OUh2Kw3XBEcpDJE81gPQpnYaFhIWQcy+v+O FMFqeuuHYnnMeFQMZP363WOi35fjxUbRG83aqV+5U1IkL+LtgKppJhe6708PDC3tRekQ 1BOtpNe9octdMsb3xhSZyGqVgBkbWkwXwyIu1p/WYsJE1YX0KWZRux/PjBcjusfM4srj EmaQ== X-Gm-Message-State: AOAM530l5fuCQ2470mTI8RBQyWM5F4Kh173zKc2nbttnpa5c3GMje5/w tk2HQ7fzwP3zX7FCDJYB2oM0pTGdFMZaNA== X-Google-Smtp-Source: ABdhPJx8p24qjDQcTkdGMd0IiS5Ma6eK+BlE2iB4ym0JKvBYq/2FcaETBYteKxdHtcyqLrEy8jWa9A== X-Received: by 2002:a05:6214:2583:: with SMTP id fq3mr37341201qvb.94.1641095602064; Sat, 01 Jan 2022 19:53:22 -0800 (PST) Received: from localhost.localdomain ([37.218.244.251]) by smtp.gmail.com with ESMTPSA id bm25sm25187775qkb.4.2022.01.01.19.53.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jan 2022 19:53:21 -0800 (PST) From: Glenn Washburn To: Daniel Kiper , grub-devel@gnu.org Cc: Denis 'GNUtoo' Carikli , Patrick Steinhardt , John Lane , Glenn Washburn Subject: [PATCH v8 1/7] cryptodisk: luks: unify grub_cryptodisk_dev function names Date: Sat, 1 Jan 2022 21:52:54 -0600 Message-Id: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::f33 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::f33; envelope-from=development@efficientek.com; helo=mail-qv1-xf33.google.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Sun, 02 Jan 2022 03:53:24 -0000 From: Denis 'GNUtoo' Carikli Signed-off-by: Denis 'GNUtoo' Carikli Reviewed-by: Patrick Steinhardt Signed-off-by: Glenn Washburn --- grub-core/disk/luks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c index f0feb3844..d57257b3e 100644 --- a/grub-core/disk/luks.c +++ b/grub-core/disk/luks.c @@ -63,7 +63,7 @@ gcry_err_code_t AF_merge (const gcry_md_spec_t * hash, grub_uint8_t * src, grub_size_t blocknumbers); static grub_cryptodisk_t -configure_ciphers (grub_disk_t disk, grub_cryptomount_args_t cargs) +luks_scan (grub_disk_t disk, grub_cryptomount_args_t cargs) { grub_cryptodisk_t newdev; const char *iptr; @@ -297,7 +297,7 @@ luks_recover_key (grub_disk_t source, } struct grub_cryptodisk_dev luks_crypto = { - .scan = configure_ciphers, + .scan = luks_scan, .recover_key = luks_recover_key }; -- 2.27.0