Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6FE2AC433F5 for ; Wed, 9 Mar 2022 13:57:53 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8EA1F839B5; Wed, 9 Mar 2022 14:57:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Jrd/jUMs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4FEBC801B2; Wed, 9 Mar 2022 10:28:46 +0100 (CET) Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CDF09839B1 for ; Wed, 9 Mar 2022 10:28:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=giojahermann@gmail.com Received: by mail-wr1-x42e.google.com with SMTP id i8so2006304wrr.8 for ; Wed, 09 Mar 2022 01:28:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BI/YOEWD+DkX+qyCX1ZaLnt4k66vrP6XKDDxUJjPYPw=; b=Jrd/jUMsX9LER4YkeTpC4i0SmP+dxtJJ3GkIzoB5NDL9s1Id8S5wieAlOLB30ZX1aG MsDy+UHuc0FujV7KBYR+BBU2oFkXIpNUHkh2R/xUbkZx+9peD09+r/VXYJl6H25AGO0r hyh2E5aKe/Zgs6tNb8spadOITX42Uax+u092ab4Wa4nTnjgVeRBas17q85LtZTwWKgiZ MsoRSckaQD0QYnhZEJkghd8UBJuBkfnTv9r+s/uoiKKpCUZrYUyECNpHBAp66ix9/z3K rVbL/RydyWFQKkdgSmoehDRk51DLXchjiOp8YdHiW4xtdIB0cM2XeeFp0NivyHkCUPYm e1cw== 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=BI/YOEWD+DkX+qyCX1ZaLnt4k66vrP6XKDDxUJjPYPw=; b=q7YmOaHaEsuHDu12IKcp23b+7JVdOdRdw3IMBDmCLF1vmsEfP5lQVa666P6NDjZNVH t5rrEoilsWumnQN1C1c5OuMakSnBDSww6cMqatiselIS51V9sfeExmuS6RFJue2cyZE6 vy+yoLwSzsrEO/xdg4Gcs2pn7WVkWrDQ3znpZp5PgqWXJ9R9mO9GtwWaVgc7P6F2UPLs bIVjuP/qFjCcIUMJjojRvEQweM6ug3sB0Ly79jQaVkuyh4zzMHBxFxSLQkUD4nT/S3+P cj1oDZj644lBwBYODlnJaxivLcukb8zre5J77B3ERIjxdMFEwntgugi0aBqEUPe3rkEn e2Ag== X-Gm-Message-State: AOAM530qlWkIFNI8uwMpihWOj8TBJ4eZhu1iANO5b6xxlqcsh89QfdAr EUJm0YN1HlDwFCMmZJB4WxE= X-Google-Smtp-Source: ABdhPJxdHJr+x0jQ/w333s0HZ9fugBW9mxSwi6CEyRwTt2J9ZwiNn8gBo2JLSz5RLZZVP152cvW9iA== X-Received: by 2002:a5d:624c:0:b0:1f7:4b77:becb with SMTP id m12-20020a5d624c000000b001f74b77becbmr8620684wrv.594.1646818120355; Wed, 09 Mar 2022 01:28:40 -0800 (PST) Received: from localhost.localdomain ([185.228.230.0]) by smtp.gmail.com with ESMTPSA id v13-20020adfe28d000000b0020375f27a5asm1221771wri.4.2022.03.09.01.28.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 01:28:40 -0800 (PST) From: SESA644425 X-Google-Original-From: SESA644425 To: sjg@chromium.org Cc: gioja.hermann@non.se.com, mr.nuke.me@gmail.com, jamin_lin@aspeedtech.com, xypron.glpk@gmx.de, philippe.reynes@softathome.com, thomas.perrot@bootlin.com, u-boot@lists.denx.de, giojahermann@gmail.com Subject: [PATCH 3/3] lib: rsa: Update function padding_pss_verify (any-salt) Date: Wed, 9 Mar 2022 01:27:17 -0800 Message-Id: <20220309092717.4203-4-gioja.hermann@non.se.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220309092717.4203-1-gioja.hermann@non.se.com> References: <20220309092717.4203-1-gioja.hermann@non.se.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Wed, 09 Mar 2022 14:57:21 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Modify function to support any salt length instead of max length only. Function now detects salt length by parsing the content of db buffer. Note that it works with (but is not limited to) zero-length, digest-length and max-length Signed-off-by: SESA644425 --- Despite checkpath.pl recommendation, it is not possible to use u8 instead of uint8_t. Proceeding with u8 breaks build with error: unknown type name u8 lib/rsa/rsa-verify.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c index de71234cfb..1d95cfbdee 100644 --- a/lib/rsa/rsa-verify.c +++ b/lib/rsa/rsa-verify.c @@ -204,9 +204,7 @@ out: /* * padding_pss_verify() - verify the pss padding of a signature * - * Only works with a rsa_pss_saltlen:-2 (default value) right now - * saltlen:-1 "set the salt length to the digest length" is currently - * not supported. + * Works with any salt length * * msg is a concatenation of : masked_db + h + 0xbc * Once unmasked, db is a concatenation of : [0x00]* + 0x01 + salt @@ -229,8 +227,8 @@ int padding_pss_verify(struct image_sign_info *info, const uint8_t *h = NULL; uint8_t *hprime = NULL; int h_len = hash_len; - uint8_t *salt = NULL; - int salt_len = msg_len - hash_len - 2; + uint8_t *db_nopad = NULL, *salt = NULL; + int db_padlen, salt_len; uint8_t pad_zero[8] = { 0 }; int ret, i, leftmost_bits = 1; uint8_t leftmost_mask; @@ -277,15 +275,20 @@ int padding_pss_verify(struct image_sign_info *info, db[0] &= 0xff >> leftmost_bits; /* step 10 */ - if (db[0] != 0x01) { + db_padlen = 0; + while (db[db_padlen] == 0x00 && db_padlen < (db_len - 1)) + db_padlen++; + db_nopad = &db[db_padlen]; + if (db_nopad[0] != 0x01) { printf("%s: invalid pss padding ", __func__); - printf("(leftmost byte of db isn't 0x01)\n"); + printf("(leftmost byte of db after 0-padding isn't 0x01)\n"); ret = EINVAL; goto out; } /* step 11 */ - salt = &db[1]; + salt_len = db_len - db_padlen - 1; + salt = &db_nopad[1]; /* step 12 & 13 */ compute_hash_prime(checksum, pad_zero, 8, -- 2.25.1