From patchwork Wed Dec 21 22:41: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: 35557 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp27221wrn; Wed, 21 Dec 2022 15:05:29 -0800 (PST) X-Google-Smtp-Source: AMrXdXvh5/lnhrGE+b8Wcs2rWnv/WZUYkV4kA99oiFO4TASFp0ItUlcN5AY2Wd4F3rUo4U1RCM1t X-Received: by 2002:a17:903:2695:b0:189:a11e:9995 with SMTP id jf21-20020a170903269500b00189a11e9995mr3692207plb.13.1671663928842; Wed, 21 Dec 2022 15:05:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671663928; cv=none; d=google.com; s=arc-20160816; b=zg6Y5ASi57YEA0MiCaZG7H9c8CQGAEnTXjab5z9ZPoF0wcyQjhXWvQkRZ+meaf/+b0 Z0d3+0fyfIUE5IXwpT9Y0SHMpVSKMbRVk3vc/e0+h+JkFtPR4Cq+5uFoz2Uv/YrOLk+V Fs6o7cUBCBH9KeKPzXYRsO5rCIdMPBCFdsIBEuTsKppzu6a8uFFi++Nwd8n94RFLNLf7 hkg0pS8Pa7EdA+beaYt+C3Evy2sRZIAjU6659N3rUOJI04f58GrLYb4jTsasnoSM1PaT kp+IQWyGj2rjJdLV3KPWuo2SgnmwyxNmKJTVHcSV6DbnroNEDwx4cVutU+ef0BSw+DoC 6OOg== 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=HInbXzTW3Cb08AWmdq+dd1m19tc/OaqTF+DjibQiGV4=; b=C2c7uB1BMASrhVGaLFgKotxdfLZB86qQWxTf9L4CTjnbPo7YeQFOu4DFpHb5osn8pN fnj4Pml/FjH7N9sTNV2hjy8R9QDaPaiuayKOl/Wab+PZYWGeUTbMVDxo721GzR/vWvkf ldLLA/ueUuqvWhjb0fq9DOWh6kJ3xC6JDNDE/fxKjf0iPy+X8UUOSKl6x6PlbEZVY9St MZpdpY+wUoon2SQ193sL6JpE6q1CUVtickxyz9qZUSxVWREP0SjsC5MWTY1WwCM/GJrO fbryUCAPFeicGsYQGRsAkxOaXQYkngY1LvIWBYmF2z4+rDa4vtBtk+M0FHuw6VKZcuAI 95aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WHu8yeTX; 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 u6-20020a170902a60600b0018c5dae06f3si16175816plq.410.2022.12.21.15.04.51; Wed, 21 Dec 2022 15:05:28 -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=WHu8yeTX; 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 S235150AbiLUWmc (ORCPT + 99 others); Wed, 21 Dec 2022 17:42:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235115AbiLUWmZ (ORCPT ); Wed, 21 Dec 2022 17:42:25 -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 8E9B3165B4 for ; Wed, 21 Dec 2022 14:41:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671662501; 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=HInbXzTW3Cb08AWmdq+dd1m19tc/OaqTF+DjibQiGV4=; b=WHu8yeTXXQlP6gZzI44dtEhALqQpCBAUk3W43/oW1QVCnoZ0ZG2JbuHp/8m8z0z7RWx7Qc nmL7fxH1OhMmfGcrb5E2ROKq5oPnLI+QjmFhe3b8Rc05i0mckRKKjCYcJZYz7KJnZe18zH 9s58xOJmTXrdepZMMBaPaSe1KfOIEqo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-365-8dHjQDtpMTyIwbTTfApP6A-1; Wed, 21 Dec 2022 17:41:36 -0500 X-MC-Unique: 8dHjQDtpMTyIwbTTfApP6A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1C521196EF88; Wed, 21 Dec 2022 22:41:36 +0000 (UTC) Received: from rules.brq.redhat.com (ovpn-208-11.brq.redhat.com [10.40.208.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 108F840C2064; Wed, 21 Dec 2022 22:41:33 +0000 (UTC) From: Vladis Dronov To: herbert@gondor.apana.org.au, davem@davemloft.net Cc: nstange@suse.de, elliott@hpe.com, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, smueller@chronox.de, vdronov@redhat.com Subject: [PATCH 1/6] crypto: xts - restrict key lengths to approved values in FIPS mode Date: Wed, 21 Dec 2022 23:41:06 +0100 Message-Id: <20221221224111.19254-2-vdronov@redhat.com> In-Reply-To: <20221221224111.19254-1-vdronov@redhat.com> References: <20221221224111.19254-1-vdronov@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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?1752866675336045104?= X-GMAIL-MSGID: =?utf-8?q?1752866675336045104?= From: Nicolai Stange According to FIPS 140-3 IG C.I., only (total) key lengths of either 256 bits or 512 bits are allowed with xts(aes). Make xts_verify_key() to reject anything else in FIPS mode. As xts(aes) is the only approved xts() template instantiation in FIPS mode, the new restriction implemented in xts_verify_key() effectively only applies to this particular construction. Signed-off-by: Nicolai Stange Signed-off-by: Vladis Dronov --- include/crypto/xts.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/crypto/xts.h b/include/crypto/xts.h index 0f8dba69feb4..a233c1054df2 100644 --- a/include/crypto/xts.h +++ b/include/crypto/xts.h @@ -35,6 +35,13 @@ static inline int xts_verify_key(struct crypto_skcipher *tfm, if (keylen % 2) return -EINVAL; + /* + * In FIPS mode only a combined key length of either 256 or + * 512 bits is allowed, c.f. FIPS 140-3 IG C.I. + */ + if (fips_enabled && keylen != 32 && keylen != 64) + return -EINVAL; + /* ensure that the AES and tweak key are not identical */ if ((fips_enabled || (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) &&