Received: by 2002:a05:7412:a9a2:b0:e2:908c:2ebd with SMTP id o34csp2688436rdh; Mon, 30 Oct 2023 05:06:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFQizGI8li66kmTNEoA5TWBLi9SQKyIlEPIGgNZIxufP4JMFQ81BbQrgxAJF3RnOSC/2QBE X-Received: by 2002:a05:6a00:93a0:b0:6bb:def8:b09c with SMTP id ka32-20020a056a0093a000b006bbdef8b09cmr8194654pfb.1.1698667572599; Mon, 30 Oct 2023 05:06:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698667572; cv=none; d=google.com; s=arc-20160816; b=TiLc3qebXVZU31FQejceKU80spmsHcsAnSQr7MmMjmbOeOfEE0RpbUiD75P8+dbYW5 tz1B2Iaxy1ISWLW/rCWm5+0evVp0y96Dx/Dw2OexgyJT0OgsokWtydk8wd2RMSmfNIVA z1wiOtvK6HLD1Bf+aWdLzyje8ZOE0uVdBUjqKVt6BGyMCKs7xmVWn8toIfRU6Gc0TkKd PWslb3k34JfLvz+Vh5t2S4+yUZVCBVTq9qnVxVlSjYdsR2oqTLxqovbWsXOEIMIQnDoD MGeXUyn+8/lm54y3EuMDnu9LNcqz2LLMxcEcmcEMasIc5Hp7bsQRo3qHkoQvwc1OoAd9 zSgg== 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=B6bgM0cZV4H2gq1b+4PL2FnM2K5mlpXTqb2xq+24SQTZ3/09r/IvENTibGBgzKfxYw Q/Fxf8Ho1H/k0aUL9mvzr2zZXwmKl16vulAni/JDNo8q8bVBvx+xsiQiqy7jv3VfWW8f jEXI2rSH51WUmqmRmXfZAjitBDoGWC2ANL832L4ORNuGnNZ8eEb8a5N3dEH6bbX1ANhk EPKjNprlIECoD9veYStqmLwAHVWyxwa3tmWFexrjWZSkol6aFs3HiddYZfW2Ti6CRVbA +mYaRJircotAeje92qvo2CHCd41QsG/DQ6TUZnyKYSk3kGFo90qOa2eG67xjRbK/D5qi FKEg== 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-crypto-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id s9-20020a63d049000000b0058990e98429si4909886pgi.146.2023.10.30.05.06.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 05:06:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; 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-crypto-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-crypto-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 agentk.vger.email (Postfix) with ESMTP id 0B16A8054EF7; Mon, 30 Oct 2023 05:06:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233146AbjJ3MFy (ORCPT + 99 others); Mon, 30 Oct 2023 08:05:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233121AbjJ3MFv (ORCPT ); Mon, 30 Oct 2023 08:05:51 -0400 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17BC0E1 for ; Mon, 30 Oct 2023 05:05:48 -0700 (PDT) Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) (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-1.canonical.com (Postfix) with ESMTPS id 4C72D3F213 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-f199.google.com with SMTP id 38308e7fff4ca-2c504f93c4eso46471501fa.3 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=LShh8Fj+13Anm085e9eNinfo28ox9JFbWozK4n0tJHf23jyv625tIbkARm/qQBLct7 33VcUdlqrjtuKqJRv/oX6m0IK8vWJtrvW+hnmbEKH8WBoeMMPHgzLG0s8cVunh/2bL4A sqYlBuSyaSnv4EMLP+wSrHFQFKCsxizU+O6N5oHjoCeBhdqjb6tY5oGEBfgYPvVq0CjX L8NLq1r1fSMJO7Cs1ouLr+BxY8pQNudnFtUYyOv35NSWnbzb7OqzIIdo0mVHoJR0XFa0 X/C22C56L9QU7zu4Qz/HAoD/iFL15gFRsCr0kQTdl4yL4hvSc26Oy7GCN0BaKYSrI9hk v7Ew== X-Gm-Message-State: AOJu0Yz2wCKfoPuo+Lt5GbaGgVp5twGWykATZCCmpKWbH1p6UjKEST0X PbP2PWeOVzcchBcziUx9Nxy3L8urRx3cJ78V9Nu3aAeeFVgfmc49gwXIYG5HWWuxcqR9m085fLb iA69r5KPQOrCkqzcLcZmxUEBqO/1cnZR22qQc9FMzlg== X-Received: by 2002:ac2:4546:0:b0:507:9fe7:f321 with SMTP id j6-20020ac24546000000b005079fe7f321mr6505774lfm.54.1698667545662; 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 Content-Transfer-Encoding: 8bit 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 agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 30 Oct 2023 05:06:08 -0700 (PDT) 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); -- 2.34.1