From patchwork Thu Dec 29 20:37:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladis Dronov X-Patchwork-Id: 37504 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2581595wrt; Thu, 29 Dec 2022 12:42:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXtWvGRwAYXSzoPmtRrTqXeM4HqppfiOHwGATx1brKrGL0RruWKQHNWj2T3PTifRL+vpMKgz X-Received: by 2002:a17:903:1d0:b0:192:4f32:3ba7 with SMTP id e16-20020a17090301d000b001924f323ba7mr36863252plh.18.1672346534727; Thu, 29 Dec 2022 12:42:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672346534; cv=none; d=google.com; s=arc-20160816; b=AfluD5LCAr9dSM544m/zn51o+YZDvVxFiQ5po/r6RxO1tg1yY4Bd24K09F7EqZywGl K3W2AwFXgH6AUgNEylxu37zb4NEXAalU2kGLZTiqrOOLB2rO2ZkZfJ5x5souXfcSXv7E vxvZy9DSpG6PS2sLVM/vv3q3LywSNpjwI78bFpmEgTRwrjTjJutly2XV2qw27nEpmXx8 iGFUbqApaNquDq6FE/s/hoYXpOprPXXbvOBFKnbp5gUHZbr9b0mm7YsmlUzQRmYmcXxu Em/TFFgBERwSrPzsCM39kXVKOeiDnv9fAdsTmt5DVq2zHMlGSBECSsObVfpCZ1s7rgkg S/9A== 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=tKf9f+QOlMAS3BoVwJkZB8zyX8Ws7eszIN1kwxfiCPs=; b=QCFn51AJWV4w476kR9eeDC6W7QxuuuGA6TOQfbj37mS9yBOvYKzE9Bi3GR+0FX6+Xz D/nLZph+8yDakRlr/Tow2AjLQhZrER/TUQK8Wm3SDqjDP79vNzUtXwy5WGhRwN0t28MM BcGwATIM41tpHmGhrmFXIvno5kZMYUSkKFwti0ZBW6KL3lwPdtlkuA9XXqzWVgw9I6Qs ABveZk7MdiYUn21Vkd7BWlkUvpXVUhRpglbdWOSp78XbeI388LOT5+OG4spWFzXi1kSv U1//67zTlYeOLAorbtemdWaO03NHNVbU6AkoubXG/tfyPdR/MjjMyC8pRETvnuS1vIfX YvJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LrfjwcNI; 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 v6-20020a1709029a0600b0018981c83ffcsi468565plp.4.2022.12.29.12.42.02; Thu, 29 Dec 2022 12:42:14 -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=LrfjwcNI; 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 S234102AbiL2Ujd (ORCPT + 99 others); Thu, 29 Dec 2022 15:39:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234098AbiL2Uij (ORCPT ); Thu, 29 Dec 2022 15:38:39 -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 7E61A165B2 for ; Thu, 29 Dec 2022 12:37:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672346271; 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=tKf9f+QOlMAS3BoVwJkZB8zyX8Ws7eszIN1kwxfiCPs=; b=LrfjwcNIq/VE4GUh2Qag681zX4KBEDTUslOBaOEu8SjhU2oZbRDisorjv7s5NfeEpA2y0i wt8i1432pNjO6RdL91dXS3S0n5uA+kloOrHuYOs9zwI2QBHMYW6P3YcsdM0+g8lTYDNCLa rcKuUgxeYcRVH6HaWwQlRdjeHV49sQs= 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-132-aH7VcIvzNtyy6aed1DiV1A-1; Thu, 29 Dec 2022 15:37:48 -0500 X-MC-Unique: aH7VcIvzNtyy6aed1DiV1A-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 05F741C0513D; Thu, 29 Dec 2022 20:37:48 +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 D6BC3112132D; Thu, 29 Dec 2022 20:37:45 +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 3/6] crypto: xts - drop redundant xts key check Date: Thu, 29 Dec 2022 21:37:05 +0100 Message-Id: <20221229203708.13628-4-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=ham 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?1753582440002884415?= X-GMAIL-MSGID: =?utf-8?q?1753582440002884415?= xts_fallback_setkey() in xts_aes_set_key() will now enforce key size rule in FIPS mode when setting up the fallback algorithm keys, which makes the check in xts_aes_set_key() redundant or unreachable. So just drop this check. xts_fallback_setkey() now makes a key size check in xts_verify_key(): xts_fallback_setkey() crypto_skcipher_setkey() [ skcipher_setkey_unaligned() ] cipher->setkey() { .setkey = xts_setkey } xts_setkey() xts_verify_key() Signed-off-by: Vladis Dronov Reviewed-by: Eric Biggers --- arch/s390/crypto/aes_s390.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c index 526c3f40f6a2..c773820e4af9 100644 --- a/arch/s390/crypto/aes_s390.c +++ b/arch/s390/crypto/aes_s390.c @@ -398,10 +398,6 @@ static int xts_aes_set_key(struct crypto_skcipher *tfm, const u8 *in_key, if (err) return err; - /* In fips mode only 128 bit or 256 bit keys are valid */ - if (fips_enabled && key_len != 32 && key_len != 64) - return -EINVAL; - /* Pick the correct function code based on the key length */ fc = (key_len == 32) ? CPACF_KM_XTS_128 : (key_len == 64) ? CPACF_KM_XTS_256 : 0;