From patchwork Thu Dec 29 20:37:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladis Dronov X-Patchwork-Id: 37506 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2582343wrt; Thu, 29 Dec 2022 12:44:30 -0800 (PST) X-Google-Smtp-Source: AMrXdXuOlclRYMvjHiuo4maGAqLNmpujdEeqBzRQA0S8EXb4hDL1aQl5GbGdD7d4xvcwuLFfDDA4 X-Received: by 2002:a17:906:9693:b0:7c1:2980:7fd8 with SMTP id w19-20020a170906969300b007c129807fd8mr20437154ejx.17.1672346670822; Thu, 29 Dec 2022 12:44:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672346670; cv=none; d=google.com; s=arc-20160816; b=M4dSzGf0ZVAjEXQ+QoT1VWtjXkxfuJYp7xLKniZKgRr89Wm7AnCbdKdkGoUxL/dy6j 8w2mNyqmFt3lMei0Y9VZuIG78eYo2S9vumlQX4X/d4WzTfJrZkGoScKk4nWAbsneg+XO NIMBv6lK20A/m8Xftu0TTAJz56Y8qlfiWsmmJJm2MdQCIDxexd22Y43i4KiWDSfe9h+r Q9sJOj7MDtpMXVJZ/cvVwAuSBmTOgEyIoXzQo60VVGWVpr4gzcSqMQor0CdKNdwebyG3 fOu7G59IttgLOHUaac5Ugfzr1TApn6SGT+ofQkAYyAKyqotDe7NCC+6LOT1S8vg7iozp 81MA== 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=HocLF/KBTVlQUJt7QQMW7FIy1E4x5xixVjqadrM9WOY=; b=HvD6fqKmaF2KMQp/rBSltbGrMdCBRizs82RJ3h0IJWQiPzj7Hnylbb2dUEDNqrGNFH Of0iC5SbR5nuaxVA3OCzpDl0yxOLccyeDl5h0Q/fwzqaUN/ppejZUHnU13nHlFAF0RjR Gjol65Y1tv5fO5HtIz4GCkBVQBfF+D6fdrfLy9aC/I0O7mvkMZdqajvVcWjjolcgKSwf TNGVYvEE0TZ5RJuoE1XkhqHqCWi5YDMRgg6PzMgal5AN2RM/dP3r5LARnElRFnDkkVMI XRVFFzHPvIFC8hY4ZZGFQOn9Wzt4dtTpwnWadylWZuzDtE+N1vVBQi2FYo00POUthhJ7 KJHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BH+d48BJ; 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 q8-20020a056402040800b0047ef7214329si14880197edv.107.2022.12.29.12.44.06; Thu, 29 Dec 2022 12:44:30 -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=BH+d48BJ; 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 S234139AbiL2Ujy (ORCPT + 99 others); Thu, 29 Dec 2022 15:39:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234119AbiL2Uis (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 BECE31704C for ; Thu, 29 Dec 2022 12:37:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672346276; 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=HocLF/KBTVlQUJt7QQMW7FIy1E4x5xixVjqadrM9WOY=; b=BH+d48BJZzUpDVJ+BGYOU8v3L6myTadiKSqYEfozLOrbLHXNacun/4w1kJWgXJUtWnYQFZ x+xofrg5D5sELp3Mz9xFZxbTyZWOhE/zmTPjM6QB0mRBb+oYTkJDPEQqPwCQwM6uH4kKcO CMFvgjO3pvRxmgGrkFvJGYjrh8odxz8= 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-649-3X_ffHm3OjeLDsUUQMHdMQ-1; Thu, 29 Dec 2022 15:37:51 -0500 X-MC-Unique: 3X_ffHm3OjeLDsUUQMHdMQ-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 96D6229ABA00; Thu, 29 Dec 2022 20:37:50 +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 61AE1112132C; Thu, 29 Dec 2022 20:37:48 +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 4/6] crypto: testmgr - disallow plain cbcmac(aes) in FIPS mode Date: Thu, 29 Dec 2022 21:37:06 +0100 Message-Id: <20221229203708.13628-5-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?1753582582658200804?= X-GMAIL-MSGID: =?utf-8?q?1753582582658200804?= From: Nicolai Stange cbcmac(aes) may be used only as part of the ccm(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 cbcmac(aes) 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 4476ac97baa5..562463a77a76 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -4501,7 +4501,6 @@ static const struct alg_test_desc alg_test_descs[] = { }, { #endif .alg = "cbcmac(aes)", - .fips_allowed = 1, .test = alg_test_hash, .suite = { .hash = __VECS(aes_cbcmac_tv_template)