Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1ns8Ms-0004PQ-FY for mharc-grub-devel@gnu.org; Fri, 20 May 2022 15:32:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ns8Mo-0004M5-Q5 for grub-devel@gnu.org; Fri, 20 May 2022 15:32:54 -0400 Received: from mail-vk1-xa35.google.com ([2607:f8b0:4864:20::a35]:40873) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ns8Mn-0000lp-2H for grub-devel@gnu.org; Fri, 20 May 2022 15:32:54 -0400 Received: by mail-vk1-xa35.google.com with SMTP id n135so4567881vkn.7 for ; Fri, 20 May 2022 12:32:52 -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=VtxIS4SFcXXfBq4l/jpVcXSKojuTq2LFMBleNkVFZWw=; b=I5HXUixaNdTMJ683M2P6aZO9IOuWocApYEVTdlAkROybHfhK8QWbIYyzLVaeMIYkzE fauJhuorJSC5o7rOpXaKi8nq0Xd/X8YCCP+4QgeMZTo0yd1ZqjJnsuO9bENd9RB9eHt4 k81yHFTBtZ3weN4tiqm6/BGguak5H01KD4aHPd/vv0kEyfhGRsiJbWiGaW3htlgTnY7/ K3As0VWkqdu3b8hdhPy6iqfD9Uoj1AzRx3L+afPJasUIwhYKWeFA6CP89YonwxJZHLcP LRGYj7HThg10nSLIk89Bjz7K3UG7HyvahxVIivcvaLMWej1p3u9JlWD/JcfFqGujKEFN yzbQ== 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=VtxIS4SFcXXfBq4l/jpVcXSKojuTq2LFMBleNkVFZWw=; b=T5E0orYBDsaYHaKdZPbGa7+8Re45LUfI9j4AKgJ+5gur35LQ+89tgjDj2p8d3aKnl+ AYM3FxbTLz7Gg4eayMivDBqpnIVxSWA4bHfUpxBxp3qbIK3Sdfi3eMPV/m+s0KS1RFD3 r6ydEuZ9hb5tuvWUEiPbX0l8iv+lrw75JqNfa/f1RsYpD9kBu8kahEHd4PMWsQ/Rmr6y wq70ViAm+tH/oeaswkSIQbMdajWgPwBQPJpmoqELKKXAwFMSwJySYQ8BQ+vT4vjRSqVJ ZEW+rvmYDJ3Tdy8UE6Q7cV7tqncLtbzOXJatFFkmR1KshZUB7NzycyIPunDoKwC1gJnp fI8g== X-Gm-Message-State: AOAM530bP5bD+H4WbzaEJlJwDcL92UTVgtp8TXBrrFLwvjdbUnslmFkQ f0OgLMhCkPikdLcySLgL6mh0Pr4nXeRMmQ== X-Google-Smtp-Source: ABdhPJyA8olTbYDfrwJrMubNmWHriDTJettr3CHHlq/PhUkuI+lL47kIoe+lK2WKaITvQz9gSqOpuw== X-Received: by 2002:a1f:1dc4:0:b0:34d:3253:26d3 with SMTP id d187-20020a1f1dc4000000b0034d325326d3mr4886148vkd.11.1653075171800; Fri, 20 May 2022 12:32:51 -0700 (PDT) Received: from localhost.localdomain ([37.218.244.249]) by smtp.gmail.com with ESMTPSA id g27-20020a056102081b00b00335baca067dsm519143vsb.2.2022.05.20.12.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 May 2022 12:32:51 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org, Daniel Kiper Cc: Denis 'GNUtoo' Carikli , Patrick Steinhardt , John Lane , Glenn Washburn , Daniel Kiper Subject: [PATCH v3 2/5] cryptodisk: geli: Unify grub_cryptodisk_dev function names Date: Fri, 20 May 2022 14:32:16 -0500 Message-Id: <2fe43147f367462c01d9ad5e94f439d2b77bc753.1653074546.git.development@efficientek.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Fri, 20 May 2022 19:32:55 -0000 From: Denis 'GNUtoo' Carikli Signed-off-by: Denis 'GNUtoo' Carikli Reviewed-by: Patrick Steinhardt Signed-off-by: Glenn Washburn Reviewed-by: Daniel Kiper --- 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 445a66878..91eb10122 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.34.1