Received: by 2002:a25:b794:0:0:0:0:0 with SMTP id n20csp3666035ybh; Mon, 5 Aug 2019 23:13:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqzo4Ja04E0JcdUF2k5Gh/N6kxP0OmuUmLQ3BH5pC1MkC+/Pdto8XYIAcY+bsbIpZMI1WxHM X-Received: by 2002:a17:90b:d82:: with SMTP id bg2mr1492058pjb.87.1565072005447; Mon, 05 Aug 2019 23:13:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565072005; cv=none; d=google.com; s=arc-20160816; b=jYTUnwrihtgDlrgIEFT8eWpdrWqZsN4tWY+pOylO3h3jJq+D4dJ9Eync4KkhP9+Zps 0DncLuJBpADP34Lm8qH+xtHyLf8/SliKY445ROebbOZbYpmqJgzu+6NP/fvxUpeGZF8V FcKAw1uP3ypfCITfPaOj1pHoYDumXiniaHLiu679R3hLwXzGEuR8YQtoPLpcGCpC60cT mZQeBkW6JJndkBnj8RqOOXGc7D6XfYfevGeDLLLQDVL8aS53fipHijN+lzOnV2bthgPU dOL0HQ2BtMIfZ0qoyxr7W0S1BkvYmDCKbWEUu913+UWZiEr+QLlqF3UynXa77mVVerZE I7hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:content-language :content-transfer-encoding:in-reply-to:mime-version:user-agent:date :from:references:cc:to:subject; bh=3nhPcpADdp8XrHzjYPLduptzvZxhzc6D3gBpz5JWiHY=; b=Z/4ncx5c0/rzoAB0giQrkzT7YgfGkeyXfAzYP4mQB7GD4GYvbxjo+DWsvu0vhbR6ju 1uGq+1omlWR5LObeUMVoSCYQx6r094XDSeJWoOqGzymw3C7i5R+Q0H3wtUix4PORpTZr X+77Q9iqLrD1vwem81eQsyv5qLVLztr114b9biBoqROZT0z+9NuVj7YtXNES632qXrPP 0HNYJHHubihpkelaWokSR6Xz0IF0+2qIuKW8YfSJBXjlV5x1pT1xJWbPGfFvFb5E6j+P 5RwupPhnb5Fo1Kn6j1Qkkmrwp5LbU28PTZYHjojWm+fEO5t827xiaFwS+EqjknsfsJru W6Lw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f32si14321539pje.70.2019.08.05.23.12.59; Mon, 05 Aug 2019 23:13:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731594AbfHFGM6 (ORCPT + 99 others); Tue, 6 Aug 2019 02:12:58 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:5464 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731560AbfHFGM6 (ORCPT ); Tue, 6 Aug 2019 02:12:58 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x766CNMI038798 for ; Tue, 6 Aug 2019 02:12:57 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 2u732g9wjy-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 06 Aug 2019 02:12:56 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 6 Aug 2019 07:12:54 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 6 Aug 2019 07:12:51 +0100 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x766CoDv23199800 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 6 Aug 2019 06:12:50 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BAB654204B; Tue, 6 Aug 2019 06:12:50 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7383A4203F; Tue, 6 Aug 2019 06:12:50 +0000 (GMT) Received: from [10.0.2.15] (unknown [9.152.224.114]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 6 Aug 2019 06:12:50 +0000 (GMT) Subject: Re: [PATCH v4 02/30] crypto: s390/des - switch to new verification routines To: Ard Biesheuvel , linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, ebiggers@kernel.org, horia.geanta@nxp.com References: <20190805170037.31330-1-ard.biesheuvel@linaro.org> <20190805170037.31330-3-ard.biesheuvel@linaro.org> From: Harald Freudenberger Date: Tue, 6 Aug 2019 08:12:51 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190805170037.31330-3-ard.biesheuvel@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US X-TM-AS-GCONF: 00 x-cbid: 19080606-0008-0000-0000-00000305AC71 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19080606-0009-0000-0000-0000A17FB431 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-08-06_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908060074 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org On 05.08.19 19:00, Ard Biesheuvel wrote: > Acked-by: Harald Freudenberger > Signed-off-by: Ard Biesheuvel > --- > arch/s390/crypto/des_s390.c | 25 +++++++++----------- > 1 file changed, 11 insertions(+), 14 deletions(-) > > diff --git a/arch/s390/crypto/des_s390.c b/arch/s390/crypto/des_s390.c > index 374b42fc7637..f56a84751fdb 100644 > --- a/arch/s390/crypto/des_s390.c > +++ b/arch/s390/crypto/des_s390.c > @@ -16,7 +16,7 @@ > #include > #include > #include > -#include > +#include > #include > > #define DES3_KEY_SIZE (3 * DES_KEY_SIZE) > @@ -35,27 +35,24 @@ static int des_setkey(struct crypto_tfm *tfm, const u8 *key, > unsigned int key_len) > { > struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm); > - u32 tmp[DES_EXPKEY_WORDS]; > + int err; > > - /* check for weak keys */ > - if (!des_ekey(tmp, key) && > - (tfm->crt_flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) { > - tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY; > - return -EINVAL; > - } > + err = crypto_des_verify_key(tfm, key); > + if (err) > + return err; > > memcpy(ctx->key, key, key_len); > return 0; > } > > -static void des_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) > +static void crypto_des_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) > { > struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm); > > cpacf_km(CPACF_KM_DEA, ctx->key, out, in, DES_BLOCK_SIZE); > } > > -static void des_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) > +static void crypto_des_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) > { > struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm); > > @@ -76,8 +73,8 @@ static struct crypto_alg des_alg = { > .cia_min_keysize = DES_KEY_SIZE, > .cia_max_keysize = DES_KEY_SIZE, > .cia_setkey = des_setkey, > - .cia_encrypt = des_encrypt, > - .cia_decrypt = des_decrypt, > + .cia_encrypt = crypto_des_encrypt, > + .cia_decrypt = crypto_des_decrypt, > } > } > }; > @@ -227,8 +224,8 @@ static int des3_setkey(struct crypto_tfm *tfm, const u8 *key, > struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm); > int err; > > - err = __des3_verify_key(&tfm->crt_flags, key); > - if (unlikely(err)) > + err = crypto_des3_ede_verify_key(tfm, key); > + if (err) > return err; > > memcpy(ctx->key, key, key_len); add my reviewed-by Harald Freudenberger however, could you please choose another prefix when there's a symbol collision instead of the "crypto_" maybe "s390_" or something like "des_s390_xxx". Thanks