From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1n3rvz-0000m3-Oh for mharc-grub-devel@gnu.org; Sat, 01 Jan 2022 22:53:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3rvy-0000j3-Fa for grub-devel@gnu.org; Sat, 01 Jan 2022 22:53:26 -0500 Received: from [2607:f8b0:4864:20::72a] (port=36400 helo=mail-qk1-x72a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n3rvw-0007GT-RT for grub-devel@gnu.org; Sat, 01 Jan 2022 22:53:25 -0500 Received: by mail-qk1-x72a.google.com with SMTP id i130so27256621qke.3 for ; Sat, 01 Jan 2022 19:53:24 -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=ojkds/pbzJuBsMWsK1MZaZXZeH/4B/XtIBINXXdWdGg=; b=7LIVvyKyhM6BpYTcemgo0W+hhPinlrmj0cWdoS3ARydjYXLigTf9TP8zJSeXQZGUVJ OgrhtZr4QLgaAZi2nhfZcY+GTD6UnpCPs0Hi9Q/MWL9N+yWhT0qKoEFaa8qEpHdOvIlO Ageb4ZYVu3cyK0IT2wIL91C1kndu/GqBQUgU0ZsC/95g/nYsRigGRRNh1feJZSe+Wam9 LT/VBYfvXTVH0aA+8/dMRdbnvXZ327oTpCXIeJnaRq2olXLgTV1nWRiHOOG27Ks6AnPN 4cPFA/yVFBCX6LHWyHKPcwwaf9SAvHr+qGjnMvPwXYn9epG1irf9W0xQdWXG4vtgR/+A 9uFg== 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=ojkds/pbzJuBsMWsK1MZaZXZeH/4B/XtIBINXXdWdGg=; b=7TSMIouVZRSxWRWG9BYfhxHdqdR1UGYfEKUL+0DcAgerWekOFZ+K+NGb9fBTB2BttL 6sQDgkN7zTazKwilnJOhHWKmBVU97tDbjjnqD4MAIExNte4pZ/L9QOcQBNtugivc7tLI i7lO3iYyXTqEjbKkCf0kfAL6KdN40LtZnROnYLOwUDj1wVbybczh1Owo3+6s/WOg2b1Z DXcw+FaP04Ep/TXGwu1lPDs+1qUdWkbcZuGPKW5E/wPSkvDwZe/Xc0NChGdlqnXYuVX0 JpVZmq1NAXvQXxFdCZAAYuaF9vnWMUe8b4avlpPsN+hAb7JR8eOn2ZX140eztyhTYNg2 yvrg== X-Gm-Message-State: AOAM533K0bdEMa0PUbRyoq5nItYGt0EfmclZZo7xiL67GFtHAHIUk0BS tA6Om/U9LNGZ9+GRyDa1RkwmJA== X-Google-Smtp-Source: ABdhPJwNzVwLHWH1cEzJGx9fyck0uU8whNVXUhkYSjJMho1DDXEngaaQoQMQrD4FK3ZqASgbXGg3xw== X-Received: by 2002:a05:620a:2444:: with SMTP id h4mr28561025qkn.398.1641095604018; Sat, 01 Jan 2022 19:53:24 -0800 (PST) Received: from localhost.localdomain ([37.218.244.251]) by smtp.gmail.com with ESMTPSA id bm25sm25187775qkb.4.2022.01.01.19.53.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jan 2022 19:53:23 -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 2/7] cryptodisk: geli: unify grub_cryptodisk_dev function names Date: Sat, 1 Jan 2022 21:52:55 -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::72a (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::72a; envelope-from=development@efficientek.com; helo=mail-qk1-x72a.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:26 -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 23789c43f..5b3a11881 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.27.0