From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lNPHB-00040e-HT for mharc-grub-devel@gnu.org; Fri, 19 Mar 2021 20:15:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNPH7-0003z2-DB for grub-devel@gnu.org; Fri, 19 Mar 2021 20:15:29 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]:38642) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lNPH1-0002it-VJ for grub-devel@gnu.org; Fri, 19 Mar 2021 20:15:29 -0400 Received: by mail-pj1-x102d.google.com with SMTP id k23-20020a17090a5917b02901043e35ad4aso7436623pji.3 for ; Fri, 19 Mar 2021 17:15:21 -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=7GInWK5q6jcRwe2YTx66VF7Pp74jpTcltehfG/U6Yi0=; b=Yn0gZ/U329g0Fk37WLAkHabcurFzS6nEjJU5tVYVz7VIrVsBo8EvYTmnwHghLg1Zhk JFR1e/ViklZbDmiba++nZcVtehj6pKT/KFVNWWImH8yCy2258HlAPtOsckWQOh78AgS3 +eLc5TtpF9kApBc299Bub4rsZ75/vlxsaMxydZCuDWsQFf8kKP/ez8PQlpVXMBwBG57O gFC6UOwaITvGfV8cNgmHW2h6kBcTo+HHjScH/OoVM+Fxg138nHq/krYCu+37ydivhG+X tQ6HCTPrbWgAGmgOYq3ZnxCJLzyqBdY7HDUXEL21cxlkU3hV6RtNx3wrCRpiH7T35Xz2 cbbg== 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=7GInWK5q6jcRwe2YTx66VF7Pp74jpTcltehfG/U6Yi0=; b=dDd0Y7eh2IYgwbFB/4ARRxN3VLNjt8ZBjDsW4aNHxXlFXIpOS1MLjlaqFlVfRfpn6D H8CVNYI7t665iJ7olrrhELfW0L5Uw5pxD+a67D2mw4m3MBUdBYk1TZ1iyAGftH5gntVc +4kkBzpXQ138M9gJywiOLVd7INcAKHRSxo/VE6DHuTsG+QRho1Ew3AOuzuZSthWR+33v zswt+XNS8D4IFRumfHYum8bu/NqHLB1YUxm3PBsKsFHyKZPD16QpG0bLEh4IvFdCRqJh t9aUmPhh7oTjHoMoaqGxQQTTF5/baCseFxaueU7XVJvYjCRb+QiWQI23z5U8g/QW4SHk rifQ== X-Gm-Message-State: AOAM5326RzeUHAkWs2D2XSQIecLtRZ8jR4sE0FVVTnKUxIKWk4x+Asvw Wn42k/BtyVhFaecrIbGqY/2Dg6YTt48UJQ== X-Google-Smtp-Source: ABdhPJykfnhMtbQb1njxVR4Pewn6ilZLR4JmjaCTm1OzIOOkBxNAFxWgg1DCkotXCLcrMdSvv2soPw== X-Received: by 2002:a17:90a:ce0d:: with SMTP id f13mr998114pju.85.1616199319987; Fri, 19 Mar 2021 17:15:19 -0700 (PDT) Received: from localhost.localdomain ([2605:a601:ab16:db00:2328:d973:f35b:5c6b]) by smtp.gmail.com with ESMTPSA id 2sm6400218pfi.116.2021.03.19.17.15.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 17:15:19 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org, Daniel Kiper Cc: Glenn Washburn Subject: [PATCH 2/4] luks2: Add error message strings to crypto errors Date: Fri, 19 Mar 2021 19:14:49 -0500 Message-Id: <1d11d4d2ac1e39c60b3c073ea58d178af1f435c2.1616198999.git.development@efficientek.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=development@efficientek.com; helo=mail-pj1-x102d.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 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: Sat, 20 Mar 2021 00:15:29 -0000 Signed-off-by: Glenn Washburn --- grub-core/disk/luks2.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index 199e11473..4b259cbdb 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -411,7 +411,8 @@ luks2_verify_key (grub_luks2_digest_t *d, grub_uint8_t *candidate_key, d->iterations, candidate_digest, digestlen); if (gcry_ret) - return grub_crypto_gcry_error (gcry_ret); + return grub_error (grub_crypto_gcry_error (gcry_ret), + "grub_crypto_pbkdf2 failed with code %d", gcry_ret); if (grub_memcmp (candidate_digest, digest, digestlen) != 0) return grub_error (GRUB_ERR_ACCESS_DENIED, "Mismatching digests"); @@ -463,7 +464,8 @@ luks2_decrypt_key (grub_uint8_t *out_key, area_key, k->area.key_size); if (gcry_ret) { - ret = grub_crypto_gcry_error (gcry_ret); + ret = grub_error (grub_crypto_gcry_error (gcry_ret), + "grub_crypto_pbkdf2 failed with code %d", gcry_ret); goto err; } @@ -484,7 +486,8 @@ luks2_decrypt_key (grub_uint8_t *out_key, gcry_ret = grub_cryptodisk_setkey (crypt, area_key, k->area.key_size); if (gcry_ret) { - ret = grub_crypto_gcry_error (gcry_ret); + ret = grub_error (grub_crypto_gcry_error (gcry_ret), + "grub_cryptodisk_setkey failed with code %d", gcry_ret); goto err; } @@ -512,7 +515,8 @@ luks2_decrypt_key (grub_uint8_t *out_key, GRUB_LUKS1_LOG_SECTOR_SIZE); if (gcry_ret) { - ret = grub_crypto_gcry_error (gcry_ret); + ret = grub_error (grub_crypto_gcry_error (gcry_ret), + "grub_cryptodisk_decrypt failed with code %d", gcry_ret); goto err; } @@ -529,7 +533,8 @@ luks2_decrypt_key (grub_uint8_t *out_key, gcry_ret = AF_merge (hash, split_key, out_key, k->key_size, k->af.stripes); if (gcry_ret) { - ret = grub_crypto_gcry_error (gcry_ret); + ret = grub_error (grub_crypto_gcry_error (gcry_ret), + "AF_merge failed with code %d", gcry_ret); goto err; } @@ -770,7 +775,8 @@ luks2_recover_key (grub_disk_t source, gcry_ret = grub_cryptodisk_setkey (crypt, candidate_key, candidate_key_len); if (gcry_ret) { - ret = grub_crypto_gcry_error (gcry_ret); + ret = grub_error (grub_crypto_gcry_error (gcry_ret), + "grub_cryptodisk_setkey failed with code %d", gcry_ret); goto err; } -- 2.27.0