From patchwork Mon Oct 30 12:05:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 159701 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp2157573vqb; Mon, 30 Oct 2023 05:06:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmY2cUwzSMocB7ymOpOVUn60yjFvyZb3yMZZpvKnuJneMDLBnLYcdYiaL//quQhuMm0VCQ X-Received: by 2002:a05:6a21:3d94:b0:180:7df:76ca with SMTP id bj20-20020a056a213d9400b0018007df76camr2557618pzc.62.1698667591487; Mon, 30 Oct 2023 05:06:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698667591; cv=none; d=google.com; s=arc-20160816; b=KMxTbQB4ukxeUlws3NcLl8SywQxJd1SaCVSrQzoW1jWN8ZCU/ImHfFsm4J3+kh5Qr4 7s6Y/RFRDWwVO7sPpl3XnLmuBq7+TuDzYn4hB+iEUzexIzMhaYi8sheCnZB1SlR8T6NZ HTxuaPDLBIudgCjRFS1N/OvH8pty+hSjqp8zQlMZAbSTyE0sJ1blX0NZW2mNyqS0rm2g a4gl1k9OG8SzKWfDPSfOTwNvtX7yhWz9IvF2PGegdR3PcdiN7fWA7wzVZiuHVn2Er/z2 E7Oxo2VRfxNMQzk9ARzZRqDA3RkXf6Wdzw9MuN08R0hpbIPL9uZH3FSQLWS/pksZkypB MpXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4wJ5Tm/61E15gRGj85phh+y3C3KRS+lk2/KYpXu5K6Q=; fh=f7rGv/lZUKYPSVW4vmZTSpKGS2MqhLr4JDXhUskr9eQ=; b=gdGSLRuJgB5KfcY5tBvpfy0LsP3GAlBlNCvC+imvXz+ZwubdqDfB7AvcZfQ2pbJnJE z/542JlyNswsHK+wyqsU8yUwGRR3Fx2zHGzv0HWLqcvEBADetAjteXlHVLOktbKzMQmj YE0pbpYymdzFA5J8Mh9iOaepRVFqNPpMtXI8P1njoeFmsrvnORQcWeTdmOUYefghfoA2 2XvgQHDiNNKTV5QPUD2aeTozmzXr9+5RrV/3M2YN7198tD3CKuQ9sjRmPGDaQ0vQM/hD LohxyzdML7wOjTP9A44h4UsnOgSb47IZxDT6RKqsCvuJ5bv8Y4/zG0i/SCpzgD3DlF0p qgFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b="W/Q4n9W/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id w4-20020a056a0014c400b0069347c30c78si4834040pfu.230.2023.10.30.05.06.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 05:06:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b="W/Q4n9W/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 7DE8380ACC4B; Mon, 30 Oct 2023 05:06:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233172AbjJ3MF4 (ORCPT + 31 others); Mon, 30 Oct 2023 08:05:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233158AbjJ3MFv (ORCPT ); Mon, 30 Oct 2023 08:05:51 -0400 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DADF3DE for ; Mon, 30 Oct 2023 05:05:47 -0700 (PDT) Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 732B73FADC for ; Mon, 30 Oct 2023 12:05:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1698667546; bh=4wJ5Tm/61E15gRGj85phh+y3C3KRS+lk2/KYpXu5K6Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=W/Q4n9W/NmSxaLgatHw0Bsf43yi4d1jVl81pjqLpDPJrMLtXDK1oZUnK5eFoBWfz3 nNJl+xp6RZYyYDOMFBcMHY88k3P703DNTUgJ5ZVQhujVV7gHylWj2HqZiLzHF2vd5M IT/kWmfAPkm55jrbErlEc2a11iE0Q59n48gnZsKg8JCRicpd8yt5okLTL9PH0ag+IJ aupZQ7THKVtxfstbv4d6YfTd69ZZYRjSxzvA9qf8HECKU6XqNCXWnBRAVOglbwjpBe 9m+GOTfX3zHA4Objnf2EhhKXNSXBuuuPY9CNNRFmoV2x+YtlwmF6UQUhafWTs2qrgC cl8aIpwG5oFBg== Received: by mail-lj1-f198.google.com with SMTP id 38308e7fff4ca-2c50255b905so46859451fa.0 for ; Mon, 30 Oct 2023 05:05:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698667545; x=1699272345; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4wJ5Tm/61E15gRGj85phh+y3C3KRS+lk2/KYpXu5K6Q=; b=LCXYNIiWIeRmyeM9yM4YrL4ol8m5DgxxSjD1+kymCdzb34Lguju8xfxxSF1vEwVanc di1KMVSgHHedy4svvi+H7gjXgXMK4CrIQb30qblcVAagi2bOP88MegdC4uub7OwbH8mb XcHJgGIFaRfD09WNyjvOlEv9oiZDv9qx0EniJ+BiUvtmugJcWzgWswcUmwfKUBvl5IWY 5AJNs8T6iT/HUJ2nksX9iAYsZo4ohdy0dk59TqxuoYGEfHe4VQJ/dHxapIzQeK17nn5/ b9StuV8pMjYKOomX1o5hFLeiEhx1oLMjExrKK+vpRAL17WbUj9EYHvLuNU8EV9AF9SWa OBfw== X-Gm-Message-State: AOJu0YwLTCup7hQ8FFSdOQwyBMkX/0zG22ype3D4EO8BuF+trMxJbmre vhybvvYR9D5V35NJlKDT7ieA6Sz7jdKKD98c03wWCxpBFfHbZI14mc6wxCrMs8WwtbFqSfXgUbq h5eBq/AblbLICLN4ZbLQjgNiMJBRwIi+qbhO+ACIxcA== X-Received: by 2002:ac2:4546:0:b0:507:9fe7:f321 with SMTP id j6-20020ac24546000000b005079fe7f321mr6505778lfm.54.1698667545669; Mon, 30 Oct 2023 05:05:45 -0700 (PDT) X-Received: by 2002:ac2:4546:0:b0:507:9fe7:f321 with SMTP id j6-20020ac24546000000b005079fe7f321mr6505764lfm.54.1698667545433; Mon, 30 Oct 2023 05:05:45 -0700 (PDT) Received: from localhost ([159.148.223.140]) by smtp.gmail.com with ESMTPSA id er15-20020a05651248cf00b005031774a51fsm1418994lfb.225.2023.10.30.05.05.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 05:05:45 -0700 (PDT) From: Dimitri John Ledkov To: Herbert Xu , "David S. Miller" Cc: smueller@chronox.de, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/4] crypto: drbg - update FIPS CTR self-checks to aes256 Date: Mon, 30 Oct 2023 14:05:14 +0200 Message-Id: <20231030120517.39424-3-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231030120517.39424-1-dimitri.ledkov@canonical.com> References: <20231029204823.663930-1-dimitri.ledkov@canonical.com> <20231030120517.39424-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 30 Oct 2023 05:06:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781124354645458897 X-GMAIL-MSGID: 1781182068332612537 When originally drbg was introduced FIPS self-checks for all types but CTR were using the most preferred parameters for each type of DRBG. Update CTR self-check to use aes256. This patch updates code from 541af946fe ("crypto: drbg - SP800-90A Deterministic Random Bit Generator"), but is not interesting to cherry-pick for stable updates, because it doesn't affect regular builds, nor has any tangible effect on FIPS certifcation. Signed-off-by: Dimitri John Ledkov Reviewed-by: Stephan Mueller --- crypto/drbg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/drbg.c b/crypto/drbg.c index 2cce18dcfc..b120e2866b 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c @@ -1478,8 +1478,8 @@ static int drbg_generate(struct drbg_state *drbg, err = alg_test("drbg_pr_hmac_sha256", "drbg_pr_hmac_sha256", 0, 0); else if (drbg->core->flags & DRBG_CTR) - err = alg_test("drbg_pr_ctr_aes128", - "drbg_pr_ctr_aes128", 0, 0); + err = alg_test("drbg_pr_ctr_aes256", + "drbg_pr_ctr_aes256", 0, 0); else err = alg_test("drbg_pr_sha256", "drbg_pr_sha256", 0, 0); @@ -2017,7 +2017,7 @@ static inline int __init drbg_healthcheck_sanity(void) return 0; #ifdef CONFIG_CRYPTO_DRBG_CTR - drbg_convert_tfm_core("drbg_nopr_ctr_aes128", &coreref, &pr); + drbg_convert_tfm_core("drbg_nopr_ctr_aes256", &coreref, &pr); #endif #ifdef CONFIG_CRYPTO_DRBG_HASH drbg_convert_tfm_core("drbg_nopr_sha256", &coreref, &pr);