From patchwork Fri Jun 28 09:34:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 168021 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3454335ilk; Fri, 28 Jun 2019 02:35:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqyilHJnSqswwkL2KYi4Wfi7fRP+efosgiUm1utQ+c0AzVsy2f0TLjQhP1mac+vHvRvfGg2K X-Received: by 2002:a17:902:583:: with SMTP id f3mr10284148plf.137.1561714542378; Fri, 28 Jun 2019 02:35:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561714542; cv=none; d=google.com; s=arc-20160816; b=q5zXBMJDBOT2F8WsIGUlPBvYlgwlTsYwSndCeKVXjjYqB1VJ5XnScT6Vau0FXQOsdr 5oWbQYEolxtbspPD26EpjO8bfyY7iok8iNGihOwYxAsrn9Uj6Jtu/EEX6aEinnx0VMDg FuvrJf2BaJkfeT6LPhk9rlxoh9Zk6GHpddRs45+cDVMj/h9hRBs/vFikt/E8YwHlQT4o PawYgtQ7pmRZSeYWnul4vtS2zjS496iJeUIGl/Zd5fCXDzDly0+3ZrCNu9+rjzq5elyb BGDssPmyfeTs8LvZQ9J/mjMClHFmz9bP33rr1h7zQqiLO7/r+5si8pCKokfckZ9PNVMv CKbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=pFEGE8zhjdIaWYrH6UvTjUKSlwoV8Vw6WrMaosyrY8Q=; b=H2UxSX4oDRhXEmePcarco8rnk4P3gahmggKBJuDMkJPZ97sPM9HFIdM4eXB6okqx2J asJVOwe1HIfz5Tz4GQrOdxlYv29PAe5f+2TPR0JEr1ArMlvS3EhpUa95Yq85Jiqz7upi fbGim6Gc1Nd1H2GNuXVZ1UQ1w2he73/zEAu6w+X3OUt4y8zGAoQwAwH6LfrmZFlBFeDB N+ebmD75te8C7Ck7J3SP59gorPbZGjPK7v3wEHNL0NyYYJ5cbPCmSy7nOCMFc7SCVpoe 1unxIfcpKfp8zDn0rttXnbDUHYdPf3VfA39IhdY4cp2X1ujYjXfKq2+RwljBJYO5P0/5 YyLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wOggOA8S; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b2si1652864pgt.270.2019.06.28.02.35.42; Fri, 28 Jun 2019 02:35:42 -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; dkim=pass header.i=@linaro.org header.s=google header.b=wOggOA8S; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726646AbfF1Jfl (ORCPT + 3 others); Fri, 28 Jun 2019 05:35:41 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:39516 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726420AbfF1Jfl (ORCPT ); Fri, 28 Jun 2019 05:35:41 -0400 Received: by mail-wm1-f66.google.com with SMTP id z23so8312286wma.4 for ; Fri, 28 Jun 2019 02:35:39 -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:mime-version :content-transfer-encoding; bh=pFEGE8zhjdIaWYrH6UvTjUKSlwoV8Vw6WrMaosyrY8Q=; b=wOggOA8Sn3aC5ZbEQljflhAjA1H7RioddELt8t5+UThBSCGgxRdj/e/sPg/HXPxbxA 5L6vxLpN5tuo4TOUNQ/1/CD0sS2KUQOY1MFtWNxESpLc1mRmWdYGqvA1SrxVcIUA4HM5 b7l5oiyMzVQQciFLq85Xl8j/bBYKA0KoXI69BIBok6RammzPUJn/AbSBwToOduXBTXXX YXLQgvnRe8VykJLIUBDNwZA0qvy9jwgMposIpomPNVhRU02/ZdTIegr/Eh5R23EyjIfG rnFEQpZF9i7uYFF8J1vd3l5nwf/cOTQvrFNkYmw6yu0p/oI7D480KDpwG9uE73jhZAxO 0ZFg== 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:mime-version :content-transfer-encoding; bh=pFEGE8zhjdIaWYrH6UvTjUKSlwoV8Vw6WrMaosyrY8Q=; b=L+cupW47GNiGohLiFD66SvrS8KmiBABwrTtv39YXtssqCiNRBJ9ay9JsCABHd8OHFS pXexfXcOpEIShcqXZLISNSQ55PjGv52h6WquWj6jTjMPYhTbIJAGZS5ZD0RH7H1ninYs tdi4u7oIvT97a9Msz1iTCGHjADIigtXpMbNL/OboNSn1EHRZkWSmUqWPO/WQtMCvjDid P6eKf8TB85sLL7BRP3PJKNx4znFjvhlR6g6jRSHPuFpyOzj6WEH1rZ1Ew6Yb3teMENIb lTZicLXcRzX58Hvt5krEaQn/sJYN1C/NY8dAW8h5f0H2RcZEAV/yPMCzxAhf769QC5z/ m8jw== X-Gm-Message-State: APjAAAUpXc9gGFPJjfVKyQ/dba+EIhamYgdswyVL5YTxKOjJKmD99Rz7 GBuumA/4qvgmSv95lyWLN17CZ+qqd/jq3g== X-Received: by 2002:a1c:345:: with SMTP id 66mr6770549wmd.8.1561714538166; Fri, 28 Jun 2019 02:35:38 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-657-1-83-120.w92-154.abo.wanadoo.fr. [92.154.90.120]) by smtp.gmail.com with ESMTPSA id m24sm1709910wmi.39.2019.06.28.02.35.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 28 Jun 2019 02:35: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 v3 00/30] crypto: DES/3DES cleanup Date: Fri, 28 Jun 2019 11:34:59 +0200 Message-Id: <20190628093529.12281-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org In my effort to remove crypto_alloc_cipher() invocations from non-crypto code, i ran into a DES call in the CIFS driver. This is addressed in patch #30. The other patches are cleanups for the quirky DES interface, and lots of duplication of the weak key checks etc. Changes since v2: - fixed another couple of build errors that I missed, apologies to the reviewers for failing to spot these - use/retain a simplified 'return verify() ?: setkey()' pattern where possible (as suggested by Horia) - ensure that the setkey() routines using the helpers return -EINVAL on weak keys when disallowed by the tfm's weak key policy - remove many pointless unlikely() annotations on ice-cold setkey() paths Changes since v1/RFC: - fix build errors in various drivers that i failed to catch in my initial testing - put all caam changes into the correct patch - fix weak key handling error flagged by the self tests, as reported by Eric. - add ack from Harald to patch #2 The KASAN error reported by Eric failed to reproduce for me, so I didn't include a fix for that. Please check if it still reproduces for you. Patch #1 adds new helpers to verify DES keys to crypto/internal.des.h The next 23 patches move all existing users of DES routines to the new interface. Patch #25 and #26 are preparatory patches for the new DES library introduced in patch #27, which replaces the various DES related functions exported to other drivers with a sane library interface. Patch #28 switches the x86 asm code to the new librar interface. Patch #29 removes code that is no longer used at this point. Ard Biesheuvel (30): crypto: des/3des_ede - add new helpers to verify key length crypto: s390/des - switch to new verification routines crypto: sparc/des - switch to new verification routines crypto: atmel/des - switch to new verification routines crypto: bcm/des - switch to new verification routines crypto: caam/des - switch to new verification routines crypto: cpt/des - switch to new verification routines crypto: nitrox/des - switch to new verification routines crypto: ccp/des - switch to new verification routines crypto: ccree/des - switch to new verification routines crypto: hifn/des - switch to new verification routines crypto: hisilicon/des - switch to new verification routines crypto: safexcel/des - switch to new verification routines crypto: ixp4xx/des - switch to new verification routines crypto: cesa/des - switch to new verification routines crypto: n2/des - switch to new verification routines crypto: omap/des - switch to new verification routines crypto: picoxcell/des - switch to new verification routines crypto: qce/des - switch to new verification routines crypto: rk3288/des - switch to new verification routines crypto: stm32/des - switch to new verification routines crypto: sun4i/des - switch to new verification routines crypto: talitos/des - switch to new verification routines crypto: ux500/des - switch to new verification routines crypto: 3des - move verification out of exported routine crypto: des - remove unused function crypto: des - split off DES library from generic DES cipher driver crypto: x86/des - switch to library interface crypto: des - remove now unused __des3_ede_setkey() fs: cifs: move from the crypto cipher API to the new DES library interface arch/s390/crypto/des_s390.c | 25 +- arch/sparc/crypto/des_glue.c | 37 +- arch/x86/crypto/des3_ede_glue.c | 38 +- crypto/Kconfig | 8 +- crypto/des_generic.c | 945 +------------------- drivers/crypto/Kconfig | 28 +- drivers/crypto/atmel-tdes.c | 28 +- drivers/crypto/bcm/cipher.c | 82 +- drivers/crypto/caam/Kconfig | 2 +- drivers/crypto/caam/caamalg.c | 38 +- drivers/crypto/caam/caamalg_qi.c | 13 +- drivers/crypto/caam/caamalg_qi2.c | 13 +- drivers/crypto/caam/compat.h | 2 +- drivers/crypto/cavium/cpt/cptvf_algs.c | 26 +- drivers/crypto/cavium/nitrox/Kconfig | 2 +- drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 4 +- drivers/crypto/ccp/ccp-crypto-des3.c | 7 +- drivers/crypto/ccree/cc_aead.c | 13 +- drivers/crypto/ccree/cc_cipher.c | 15 +- drivers/crypto/hifn_795x.c | 29 +- drivers/crypto/hisilicon/sec/sec_algs.c | 18 +- drivers/crypto/inside-secure/safexcel_cipher.c | 20 +- drivers/crypto/ixp4xx_crypto.c | 28 +- drivers/crypto/marvell/cipher.c | 22 +- drivers/crypto/n2_core.c | 26 +- drivers/crypto/omap-des.c | 25 +- drivers/crypto/picoxcell_crypto.c | 21 +- drivers/crypto/qce/ablkcipher.c | 55 +- drivers/crypto/rockchip/rk3288_crypto.h | 2 +- drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 21 +- drivers/crypto/stm32/Kconfig | 2 +- drivers/crypto/stm32/stm32-cryp.c | 30 +- drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 26 +- drivers/crypto/sunxi-ss/sun4i-ss.h | 2 +- drivers/crypto/talitos.c | 34 +- drivers/crypto/ux500/Kconfig | 2 +- drivers/crypto/ux500/cryp/cryp_core.c | 31 +- fs/cifs/Kconfig | 2 +- fs/cifs/cifsfs.c | 1 - fs/cifs/smbencrypt.c | 18 +- include/crypto/des.h | 77 +- include/crypto/internal/des.h | 106 +++ lib/crypto/Makefile | 3 + lib/crypto/des.c | 902 +++++++++++++++++++ 44 files changed, 1354 insertions(+), 1475 deletions(-) create mode 100644 include/crypto/internal/des.h create mode 100644 lib/crypto/des.c -- 2.20.1