From patchwork Thu Dec 29 20:37:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladis Dronov X-Patchwork-Id: 37503 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2581461wrt; Thu, 29 Dec 2022 12:41:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXsMh75xwXq7FZ5ySjTaemx5zB0g/JH0lGm3zeTAGVzh+Q5aaTBQZdQW3XbR6QRyoblGqRth X-Received: by 2002:a17:902:f2ca:b0:189:86cd:d7c0 with SMTP id h10-20020a170902f2ca00b0018986cdd7c0mr36762944plc.18.1672346510945; Thu, 29 Dec 2022 12:41:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672346510; cv=none; d=google.com; s=arc-20160816; b=KEYakTz+N7uSSZ8Ial2VT5n06NroRIx40R9TUHj4Kl3+MVsseB0bfC/yP/AuupuzIy vSwwi/VwWtbVepuZjhSnsGiHzeNp51pobhOM4HE5Zja+xz3taoj1LzBvmQ3dFtqbngoU 3s2J++WxSQxemWg/zdTpmrHr8K1wvRohQ1E2gyC6WwVCOBahHQja6uEyfmP0dqF+bmI8 RdEqUW21SoQwwBGBdkI3ZQwHb8Xhh3yJprIRzjWaVVGLxLtNwiShEzDqwD4PVLbFI2G4 aA1vNkVVJn6zBJ6kRS/ifxgRSVFDr3oXv4NHa5juWEhnENvnuN2AHWZwCSQxjZlZwmYd pIsA== 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=LAKIWiSZV682XUgmCJ12HVI7AYn7q1HQMrD8FfksUtE=; b=YGGXouEAdQfJ/Wad5149/R2I04SuEetcwK3zt0sf9grbdSojpp/7u0UuTlAR8C8CUQ yxT9ivcUpErdk+hRTaqXWBYVkJ0jZ8JOewUS75OqrF6dGGTuO4XdnV2IU8gFkShi/0XV JUMv3NsWZTGrBGrzw3Ye+WJ+T6c2Ar37mgqgNc8JP6UIuy4mltO+p1Uj8z0CBztSATbo zfcOt3HHJIKLd6zktHzLx5by5+oFzVqUyhIEeGBm/oyC5kAxkZCtVzlJoiztQTDHXxZ+ XdIEVt8Vwk6OdCdZdLZ3ykUBEd875PAtOhk7myFwEHfzkMj1RKz+Yu2xajIIOaPFEc19 PDsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Zye2FqFv; 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 l17-20020a170902f69100b00186c37272a6si8488796plg.178.2022.12.29.12.41.39; Thu, 29 Dec 2022 12:41:50 -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=Zye2FqFv; 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 S234121AbiL2Ujn (ORCPT + 99 others); Thu, 29 Dec 2022 15:39:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234096AbiL2Uii (ORCPT ); Thu, 29 Dec 2022 15:38:38 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83BB6167EF for ; Thu, 29 Dec 2022 12:37:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672346268; 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=LAKIWiSZV682XUgmCJ12HVI7AYn7q1HQMrD8FfksUtE=; b=Zye2FqFv+TO1jNm0RLNjlu3H6OLWLpdY4lmOyVuwZn470SwYn40wjUObYf/uZ7ylBQNSBw nC5E6Svfuv/HNjPC5en/ZEnJ8IE3jmEAhAcjRtQJ3yhH+3F37YH/u5LfbKQQBD97LRNxnV Qf0z4WPlkc0dIx5eXRlqtiffol67W/I= 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-502-7pgl8A9fPbWcbBpmsN2aWA-1; Thu, 29 Dec 2022 15:37:43 -0500 X-MC-Unique: 7pgl8A9fPbWcbBpmsN2aWA-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 E59B38F6E80; Thu, 29 Dec 2022 20:37:42 +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 A21A5112132C; Thu, 29 Dec 2022 20:37:40 +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 1/6] crypto: xts - restrict key lengths to approved values in FIPS mode Date: Thu, 29 Dec 2022 21:37:03 +0100 Message-Id: <20221229203708.13628-2-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?1753582415193822802?= X-GMAIL-MSGID: =?utf-8?q?1753582415193822802?= 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 Reviewed-by: Eric Biggers --- 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)) &&