From patchwork Mon Aug 5 17:00:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 11077551 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EABCB1399 for ; Mon, 5 Aug 2019 17:01:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D90E22894C for ; Mon, 5 Aug 2019 17:01:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD73A28956; Mon, 5 Aug 2019 17:01:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7168F2894C for ; Mon, 5 Aug 2019 17:01:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729482AbfHERBl (ORCPT ); Mon, 5 Aug 2019 13:01:41 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:38244 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728871AbfHERBk (ORCPT ); Mon, 5 Aug 2019 13:01:40 -0400 Received: by mail-wr1-f67.google.com with SMTP id g17so85135994wrr.5 for ; Mon, 05 Aug 2019 10:01:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PGua0WZIt91UEgeBUrdKZnsCkK+MXLAWZjIqwFsnjF4=; b=wdbtv22KbeZBxZoKdr9HCc1T4iV7TtabLPlVtd9NuzdQTNsrbnpSzZyUfz10PchUgE v1bhneT37HR+ItLZVXLpv61YLUpat4dKmUjxbaMdiNTsSA05yxOi3odA7Xy7h4IGpCpL nXopI1SPPJtWucbwMoLS5KvBJw/oYpViAvj2uEV4DAqLtB5IE0oKYVo6Bayf6LwPVnE1 3c+0gl/wRQtnDzPxJTy0LCcJuwCODM3pTFH6tahmSUttWRP0arKjGHhhJK/8o7DqEcvf Bnd1s6kyzlZj+XH17YA58eyPKDh9Dt3Pe+M8PPxj0hhnkl+NJefhSgHmCK7n0yYqjjC2 +Ikg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PGua0WZIt91UEgeBUrdKZnsCkK+MXLAWZjIqwFsnjF4=; b=I0iB3lmf4KoHGhAo4uOAIGGuM9AvrR7sJrWxoTrN2GrLUg8zXEAbBw3hWgdIvyy2oE Dj7/yNfmjxQQmG6L0e2HWz+G9yDO1EolBRZesNmZ1fF/kh1xSozGaTxvMkH2pHIYoDGt UOvl1XDPpL8m+OLQpFvEWLSabIqMktsPt2uv6813gKlOagazDr5am0gmyUMl0oGPihaG 89Rg+v2DNREohG5SINpZnM2r76K9RwOtOvkhfoyh7n8Zp0cBgfjjcK7e8LxrXsSq1jvk kOT7KrweWPIquuHTirs9ce20Rhwa3mfzHlctCMeIyC0nuadObUpu65vmUr30aehbuo2I b+/Q== X-Gm-Message-State: APjAAAXnHGOWObf/QqMQ+96e9rxzwV20Gq8hul+nmxjdoI3anKxZJNa/ AO9QysID1MDMJ5/HmPWiSeTAS0YhQZ6fgg== X-Google-Smtp-Source: APXvYqx5zJt2qnFv2/Jhtc1n7PSd+Ndn49QjBhPPa5PAO+lFIbDoJdYyNt918dXXtybhbiVV5cGnVQ== X-Received: by 2002:a5d:65c5:: with SMTP id e5mr25461123wrw.266.1565024498098; Mon, 05 Aug 2019 10:01:38 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:a407:da00:582f:8334:9cd9:7241]) by smtp.gmail.com with ESMTPSA id j9sm95669383wrn.81.2019.08.05.10.01.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Aug 2019 10:01:37 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, ebiggers@kernel.org, horia.geanta@nxp.com, Ard Biesheuvel Subject: [PATCH v4 10/30] crypto: ccree/des - switch to new verification routines Date: Mon, 5 Aug 2019 20:00:17 +0300 Message-Id: <20190805170037.31330-11-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190805170037.31330-1-ard.biesheuvel@linaro.org> References: <20190805170037.31330-1-ard.biesheuvel@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ard Biesheuvel --- drivers/crypto/ccree/cc_aead.c | 13 +++---------- drivers/crypto/ccree/cc_cipher.c | 15 ++++----------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/drivers/crypto/ccree/cc_aead.c b/drivers/crypto/ccree/cc_aead.c index ce302adc76c7..8174ff1d93d6 100644 --- a/drivers/crypto/ccree/cc_aead.c +++ b/drivers/crypto/ccree/cc_aead.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include "cc_driver.h" #include "cc_buffer_mgr.h" @@ -648,7 +648,6 @@ static int cc_des3_aead_setkey(struct crypto_aead *aead, const u8 *key, unsigned int keylen) { struct crypto_authenc_keys keys; - u32 flags; int err; err = crypto_authenc_extractkeys(&keys, key, keylen); @@ -659,14 +658,8 @@ static int cc_des3_aead_setkey(struct crypto_aead *aead, const u8 *key, if (keys.enckeylen != DES3_EDE_KEY_SIZE) goto badkey; - flags = crypto_aead_get_flags(aead); - err = __des3_verify_key(&flags, keys.enckey); - if (unlikely(err)) { - crypto_aead_set_flags(aead, flags); - goto out; - } - - err = cc_aead_setkey(aead, key, keylen); + err = crypto_des3_ede_verify_key(crypto_aead_tfm(aead), keys.enckey) ?: + cc_aead_setkey(aead, key, keylen); out: memzero_explicit(&keys, sizeof(keys)); diff --git a/drivers/crypto/ccree/cc_cipher.c b/drivers/crypto/ccree/cc_cipher.c index 5b58226ea24d..dc30f5aeca10 100644 --- a/drivers/crypto/ccree/cc_cipher.c +++ b/drivers/crypto/ccree/cc_cipher.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include @@ -411,16 +411,9 @@ static int cc_cipher_setkey(struct crypto_skcipher *sktfm, const u8 *key, * HW does the expansion on its own. */ if (ctx_p->flow_mode == S_DIN_to_DES) { - u32 tmp[DES3_EDE_EXPKEY_WORDS]; - if (keylen == DES3_EDE_KEY_SIZE && - __des3_ede_setkey(tmp, &tfm->crt_flags, key, - DES3_EDE_KEY_SIZE)) { - dev_dbg(dev, "weak 3DES key"); - return -EINVAL; - } else if (!des_ekey(tmp, key) && - (crypto_tfm_get_flags(tfm) & - CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) { - tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY; + if ((keylen == DES3_EDE_KEY_SIZE && + crypto_des3_ede_verify_key(tfm, key)) || + crypto_des_verify_key(tfm, key)) { dev_dbg(dev, "weak DES key"); return -EINVAL; }