Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1ndnmM-0005zl-Nc for mharc-grub-devel@gnu.org; Mon, 11 Apr 2022 02:44:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndnlt-0005s1-EK for grub-devel@gnu.org; Mon, 11 Apr 2022 02:43:33 -0400 Received: from mail-qt1-x836.google.com ([2607:f8b0:4864:20::836]:41492) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ndnlr-0004iY-ST for grub-devel@gnu.org; Mon, 11 Apr 2022 02:43:33 -0400 Received: by mail-qt1-x836.google.com with SMTP id r25so2242231qtp.8 for ; Sun, 10 Apr 2022 23:43:31 -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=xrodVXbu1h80Nx33gwif4vyk4PvCJ8GGfJmUVqPWIyQ=; b=1ZbmhlEgbgjPEciph8HwL7QLQymRdSFXKhL9mtmKD8aOVWyYkbDhqdIM80qQQuCh8O MiUr/kSoxabhCOr2x6PzZZturkT9HcNDCblnByOC4gy1jP+W34UDAkx5ObD+OZtm7y50 JDIH2ZTsOOrq4dDTjDGOIupwebu14z4TUzuOCsqmExKjmklB6xoaBFBKpo5FdiZFngWo 5YBbx2woEQmijw82cc2kfDqYSqFh1iUG5Eyjo25y1Y0G1AGlGLsWktWU1Y022XM/SC+n Iyo6oKMrkjL3WEv+a/c3GXAk7DUS6e5fK7+d/Kgzid6lG8D4Y9Rrg7Rgd17bD9+IVV6X 4Sng== 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=xrodVXbu1h80Nx33gwif4vyk4PvCJ8GGfJmUVqPWIyQ=; b=ffyKoUhTp1h2cixzXFy9NitStSxg2EcvnfT5Ju5FY+wHaPyHqqBfjgOj2j5kAms6mo vOfvKZS9K1cUK3XhBmZqFgmgbLJyu+IUsRaPSHuKrPyQIw/AngUFmMmzQiK6HEocAAXu u+GulqtQmlZxnxVebDcl2SjOhRNIpZyH0vTPntDSzzorczbkD2QlIplN6o8ZoRH5Dn7N R2sCsdfSvNY1bgSkVgX/Y5CSIrknmTk3GemCFAGQ/lyFGbYskBJQztSBr6zOlqs4hwMh yRfCIR5iwz6/RRNRHJn0CQ3vRq3k60mj39NaBaKmtqIsbfS5umKFwvtVc+wXXZUw/6t5 Yt/A== X-Gm-Message-State: AOAM530ls4GxV8yweSdzj1PWyk5kfXFrJcXGGcFsL/IFOS6B0Ri0giaN ubkQUadAv41++62VYfA3vaIEkLXzlykxyw== X-Google-Smtp-Source: ABdhPJxYXTZbxnjL4eWZr+ml83c6bNQzu8bJNVvxvQW1efq0arSp+5QipyQf4hSEC/jAKF3qHNM1Sw== X-Received: by 2002:a05:622a:50d:b0:2e2:1006:35b6 with SMTP id l13-20020a05622a050d00b002e2100635b6mr24670587qtx.536.1649659410973; Sun, 10 Apr 2022 23:43:30 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 23:43:30 -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 2/7] cryptodisk: geli: Unify grub_cryptodisk_dev function names Date: Mon, 11 Apr 2022 06:40:23 +0000 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::836; envelope-from=development@efficientek.com; helo=mail-qt1-x836.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:35 -0000 X-List-Received-Date: Mon, 11 Apr 2022 06:43:35 -0000 From: Denis 'GNUtoo' Carikli Signed-off-by: Denis 'GNUtoo' Carikli Reviewed-by: Patrick Steinhardt Signed-off-by: Glenn Washburn --- grub-core/disk/geli.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c index 445a668781..91eb101224 100644 --- a/grub-core/disk/geli.c +++ b/grub-core/disk/geli.c @@ -240,7 +240,7 @@ grub_util_get_geli_uuid (const char *dev) #endif static grub_cryptodisk_t -configure_ciphers (grub_disk_t disk, grub_cryptomount_args_t cargs) +geli_scan (grub_disk_t disk, grub_cryptomount_args_t cargs) { grub_cryptodisk_t newdev; struct grub_geli_phdr header; @@ -395,7 +395,7 @@ configure_ciphers (grub_disk_t disk, grub_cryptomount_args_t cargs) } static grub_err_t -recover_key (grub_disk_t source, grub_cryptodisk_t dev, grub_cryptomount_args_t cargs) +geli_recover_key (grub_disk_t source, grub_cryptodisk_t dev, grub_cryptomount_args_t cargs) { grub_size_t keysize; grub_uint8_t digest[GRUB_CRYPTO_MAX_MDLEN]; @@ -567,8 +567,8 @@ recover_key (grub_disk_t source, grub_cryptodisk_t dev, grub_cryptomount_args_t } struct grub_cryptodisk_dev geli_crypto = { - .scan = configure_ciphers, - .recover_key = recover_key + .scan = geli_scan, + .recover_key = geli_recover_key }; GRUB_MOD_INIT (geli) -- 2.25.1