From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1k1W6q-0007iY-8U for mharc-grub-devel@gnu.org; Fri, 31 Jul 2020 10:34:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1W6o-0007ff-EL for grub-devel@gnu.org; Fri, 31 Jul 2020 10:34:06 -0400 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]:39055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k1W6m-0007Yq-Tt for grub-devel@gnu.org; Fri, 31 Jul 2020 10:34:06 -0400 Received: by mail-pj1-x1042.google.com with SMTP id f9so7972436pju.4 for ; Fri, 31 Jul 2020 07:34:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=shiZRdYkFld6T1rqF70C/Hri6xIZmXDv2nn1hFG2B3s=; b=eqLMXUAtuYt4HXIpXD1j2H54CXX0a/HxyJLSK5cuSkVALW2XdIPwCit0xjJDBrSWsw UMgBQPGSnsC8XGasJVboyftYRRNjJmesLtpeJC01n14npZ31b8pKYv6a4sMDQP4ixFTs TUgFTsYMnFnOhqjIo9YI6qXGyyj2BL4SXugnOud97XP9lnF0Fe7cGfw2GAomjYAFCjdR bYOL8JQXuYcLKjGgikG82gNffm5X7K0Gt8L7sr3H+l1l4frThyCi+7S+tCz+BD2o33U5 GKDeSEjEFt4nXrKlY1VgUGNF2VfeJuzIVuMSJLB01ftH0P/7/R+Ihtk3Uz+LUMmBzX03 LBjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=shiZRdYkFld6T1rqF70C/Hri6xIZmXDv2nn1hFG2B3s=; b=LUsuOzsa0Nx2BugatxAsZIgyBbe1Mmm6LC1ZJgvx+ji3bORIlZ4M2hqwfDmZkxjoc7 gBGpegRK+pLCQLZrvX2ToRMnEDQhgnQtrJlAaIr5ejJ8KD8O3dSkoCyAKW2sGmkqaOeX CC9CjcBOoTyU0ztXKqfri9nEOc38AGey3jkA8et+EDnDeKEXwxBf8Gruo6SeGNOiVHnk 6n8teCPw9HJv/J9v7il4Tuds9pJsxY7IrnTKblkjMF5fQGMxobUkWxpazCUPx6rCi/Zl D6reLTLwluKk2ifFkauTnWte/TxdZwojIQcecUVuH7PlzIMBLoGD96UdHEl8EkK92NGj 1GGQ== X-Gm-Message-State: AOAM532SN350dNW8shlMsODULkbZABbvgQ0TNUxEG5j7CFhqszOR94aw m33XIPdcQpiIMcxxkzLn8KqvcGbz3l0= X-Google-Smtp-Source: ABdhPJwfmaHZOOeNy7tWx7EPmrP7PneuWiqR0TQgjWHg75O6WNwqfIEdQUI1kKFjNsb2YJxOKgzARQ== X-Received: by 2002:a17:90a:c917:: with SMTP id v23mr734859pjt.38.1596206043062; Fri, 31 Jul 2020 07:34:03 -0700 (PDT) Received: from localhost.localdomain ([189.216.105.24]) by smtp.gmail.com with ESMTPSA id x136sm9856240pfc.28.2020.07.31.07.34.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2020 07:34:02 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org Cc: Glenn Washburn Subject: [PATCH] cryptodisk: Use cipher name instead of object in error message. Date: Fri, 31 Jul 2020 09:33:19 -0500 Message-Id: <20200731143323.1650165-2-development@efficientek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200731143323.1650165-1-development@efficientek.com> References: <20200731143323.1650165-1-development@efficientek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::1042; envelope-from=development@efficientek.com; helo=mail-pj1-x1042.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Jul 2020 14:34:06 -0000 Signed-off-by: Glenn Washburn --- grub-core/disk/cryptodisk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index 9d2f0d635..4a35c0478 100644 --- a/grub-core/disk/cryptodisk.c +++ b/grub-core/disk/cryptodisk.c @@ -470,8 +470,8 @@ grub_cryptodisk_setcipher (grub_cryptodisk_t crypt, const char *ciphername, cons secondary_cipher = grub_crypto_cipher_open (ciph); if (!secondary_cipher) { - ret = grub_error (GRUB_ERR_FILE_NOT_FOUND, "Secondary cipher %s isn't available", - secondary_cipher); + ret = grub_error (GRUB_ERR_FILE_NOT_FOUND, + "Secondary cipher %s isn't available", ciphername); goto err; } if (cipher->cipher->blocksize != GRUB_CRYPTODISK_GF_BYTES) -- 2.25.1