Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1ndnly-0005su-To for mharc-grub-devel@gnu.org; Mon, 11 Apr 2022 02:43:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndnls-0005s0-W5 for grub-devel@gnu.org; Mon, 11 Apr 2022 02:43:33 -0400 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]:34378) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ndnlr-0004iQ-Bs for grub-devel@gnu.org; Mon, 11 Apr 2022 02:43:32 -0400 Received: by mail-qk1-x736.google.com with SMTP id g11so8794431qke.1 for ; Sun, 10 Apr 2022 23:43:30 -0700 (PDT) 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=gGPiFVRzsyY/xKnNBoxvrvbc/gMwDTYF/gbBCg1PelI=; b=riavcoGQUZeC2qRra598Cp1rhn8h0VD8PHbbcNo+/n10djRpJ3i8f9WwQHHESRi7eg 0n/YWQyQgr0b4JV7LXR+VU5a/+KfLAunzpF/juy/lS+Y5zyLildHl7pQOdPvhSkmt4E6 /FsxIhQ4TyoAiAh90X7Rw5UvjmZ1tp0hpRtJaBeLCHA4/k1gt8+snf5qX0fZONmx4XDG E3qbr21E2VhI1ioqrj7eh1VUrKHr3LKKOrfnK4txmUfZwYX7dtszGLBSTfwdJGtjscYk 5Ny8QhuKULoTu/gsBXEDjlWYOYgwk7bDGpCvezBuiJkrZPy9DSJ1R/LOUA6V7pGg4XhX 1BhQ== 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=gGPiFVRzsyY/xKnNBoxvrvbc/gMwDTYF/gbBCg1PelI=; b=mNi91tECvXV+NGECx8MprOeVHqnrKUROtd1mmHJj2BVyoPwE3dpUsiSnYx7tN1Vl0R ypAj/T/1sbdsqBHCA+3kaYm1lhGj81b1AKtphbMrIvCf7VvFTimNwIN40790WDKQMegI M3sqXXu3CSpHw52bYWNGCT2bFRpNw3KRubwlMVE/l4VEWdikdT1/Y1IljMfhE3BZ2wrB rPpl4nHw0M9FK5JfrMjLYNkOANMZ3r44gV2faFImtsYoPUFEEtkSv0YMPhGk5i/L0PuJ oFcOQ5UjSdIKMoTS18RwYMlhDRnfGF3wnFCbfRot16vuSipjnnX6Fws5DwbgXqCIwRqN OSoA== X-Gm-Message-State: AOAM533RMg1QKS9VNMUsppFQ8cwJ+QAEXroGhDm2QPRVsK6+nbjiXzy2 ehBHd4tqMNZbb9iKrWWjq/SbiJSh73apWg== X-Google-Smtp-Source: ABdhPJzpQ2oQvZrKVhVUFn266UFHTYvgqhhuPWgSBogo1TrdLB6b/e1RbYycU77AIFoyyTIKS0/BOQ== X-Received: by 2002:a05:620a:40ce:b0:69c:2e41:bd0d with SMTP id g14-20020a05620a40ce00b0069c2e41bd0dmr478120qko.200.1649659409410; Sun, 10 Apr 2022 23:43:29 -0700 (PDT) Received: from localhost.localdomain (yal.riseup.net. [199.58.83.9]) by smtp.gmail.com with ESMTPSA id i19-20020a05620a27d300b0069c1c7986eesm1662307qkp.89.2022.04.10.23.43.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 23:43:29 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org, Daniel Kiper Cc: Denis 'GNUtoo' Carikli , Patrick Steinhardt , John Lane , Glenn Washburn Subject: [PATCH v9 1/7] cryptodisk: luks: Unify grub_cryptodisk_dev function names Date: Mon, 11 Apr 2022 06:40:22 +0000 Message-Id: <40941ee45cb787ba8e6f08064070d57116f4c50b.1649658484.git.development@efficientek.com> 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::736; envelope-from=development@efficientek.com; helo=mail-qk1-x736.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: Mon, 11 Apr 2022 06:43:33 -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 46ae734efa..7f837d52c4 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.25.1