From patchwork Thu Dec 29 20:37:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladis Dronov X-Patchwork-Id: 37508 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2582486wrt; Thu, 29 Dec 2022 12:44:58 -0800 (PST) X-Google-Smtp-Source: AMrXdXvq5oFPGiIqSsaDxOnByoULRy310uWv/8KUG34f57P/GE9Txibg99VlKZI9CDem0LtP1tGl X-Received: by 2002:a05:6a00:1d09:b0:581:254d:caa0 with SMTP id a9-20020a056a001d0900b00581254dcaa0mr15739875pfx.6.1672346698126; Thu, 29 Dec 2022 12:44:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672346698; cv=none; d=google.com; s=arc-20160816; b=Swl1FaCm5vMzwupz7VPuGU6snfi11ziT6yFBCU5NCGwQfBcXwM6TLQCmXqNWXrD9gc VzTMAT4MVzqHp89H+X7bPb5vfgoUGDH9Z5fj/e4iet7NTWGWPh14YsLSbfIaU4h+jDL+ c65IkSV4chiNpSl1/zx37bGOtwUbNgNRgXGof/HfTReRhfqNoFIBDSfO3zznUydVw5Ua ZKhLKH2pn8+F+HNeva2Pv7oNdAjtIKO7+MrhqvGoWVxsJ3jeqq2YGEdWuXjH4GQkw4jw 9yoCo9TYg7bLOgfDXkNsvyYdsdPehA4vjX5FbdssMSBxEoG1owc8hn9GrU1beoLrwUP4 LDqA== 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=5DvSnehV36VU/oOzzLcli5gwI8QWk8eQIWnhStrPh7c=; b=s5VH3M7R5n7BV1yLoBgFmXXHYhjgr8OQOLy6LN60OZDx134tebVgGHunps73OrK1ZD gfGTODo1BJ9Oyx9tZPOKMrEfWcl2rk//N7bNEn1XmqPiHSyLW+NG7VQQf2xBB+XrzbBj IlNyyI/vgxTjDh6x7Zr4d73efs6xdmlHEgjGpt21fv5cX4MREWFArtHwS9+8IITo8nYG wuoQ84jH8VSGAFajlN1m82XhQyJVPnAssZSjjdCFZPf3n6tGonlLSo6RSf/Erw3y9xm5 sq1uoXlM2C8J9BQNomyaNbtv75MYzn3i8So2XD3lMlun/OiERMa+8j7jIX2AHu4y4tkd 8RlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="JYrPcG/9"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bd9-20020a056a00278900b00574d06d6a4fsi21374432pfb.56.2022.12.29.12.44.45; Thu, 29 Dec 2022 12:44:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="JYrPcG/9"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234129AbiL2Ujq (ORCPT + 99 others); Thu, 29 Dec 2022 15:39:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234118AbiL2Uis (ORCPT ); Thu, 29 Dec 2022 15:38:48 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C641A17408 for ; Thu, 29 Dec 2022 12:37:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672346278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5DvSnehV36VU/oOzzLcli5gwI8QWk8eQIWnhStrPh7c=; b=JYrPcG/94A9vxex83SkOfbM6pAbl6INi7cEnHMpW0XXLZXiTgQonJFoyK8B+ZnxFYod/8A BnJKK07egJqX8SOK6r3Q9stq2vDDXYa9kYtfYKXxC/FRIU1ON5FSvQLNFL3Yr7W7dhnQxq rm4KflqAV/I2t9RDSAXkmaFz68mXqSM= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-125-EGcJBK5tNIC3JtoYLF_WqQ-1; Thu, 29 Dec 2022 15:37:53 -0500 X-MC-Unique: EGcJBK5tNIC3JtoYLF_WqQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2C64B1C05131; Thu, 29 Dec 2022 20:37:53 +0000 (UTC) Received: from rules.brq.redhat.com (ovpn-208-2.brq.redhat.com [10.40.208.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA295112132C; Thu, 29 Dec 2022 20:37:50 +0000 (UTC) From: Vladis Dronov To: Herbert Xu , "David S . Miller" Cc: Nicolai Stange , Elliott Robert , Stephan Mueller , Eric Biggers , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Vladis Dronov Subject: [PATCH v2 5/6] crypto: testmgr - disallow plain ghash in FIPS mode Date: Thu, 29 Dec 2022 21:37:07 +0100 Message-Id: <20221229203708.13628-6-vdronov@redhat.com> In-Reply-To: <20221229203708.13628-1-vdronov@redhat.com> References: <20221229203708.13628-1-vdronov@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753582611065249595?= X-GMAIL-MSGID: =?utf-8?q?1753582611065249595?= From: Nicolai Stange ghash may be used only as part of the gcm(aes) construction in FIPS mode. Since commit d6097b8d5d55 ("crypto: api - allow algs only in specific constructions in FIPS mode") there's support for using spawns which by itself are marked as non-approved from approved template instantiations. So simply mark plain ghash as non-approved in testmgr to block any attempts of direct instantiations in FIPS mode. Signed-off-by: Nicolai Stange Signed-off-by: Vladis Dronov Reviewed-by: Eric Biggers --- crypto/testmgr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 562463a77a76..a223cf5f3626 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -5125,7 +5125,6 @@ static const struct alg_test_desc alg_test_descs[] = { }, { .alg = "ghash", .test = alg_test_hash, - .fips_allowed = 1, .suite = { .hash = __VECS(ghash_tv_template) }