From patchwork Tue Jun 11 13:47:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 166451 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2387791ilk; Tue, 11 Jun 2019 06:48:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqxzysUauVzlXEpkBNeb7Bc41F6QEFQQDYEVMWu+4EgLQSOsuayEPmKY/HYMbunQrg9nJbPy X-Received: by 2002:a65:4c07:: with SMTP id u7mr19742642pgq.93.1560260880171; Tue, 11 Jun 2019 06:48:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560260880; cv=none; d=google.com; s=arc-20160816; b=VJfEO0fcHAhb6QKtbf/XjsTAk4wIjAtDR5SCxSBeocL5yEYoTKXlIugZNYbwaIwDsM hbf8Zw+w39aQ/7lP0QhFFLTyCAuFSD9FkOlSdIaF/Q5MhrpCPXKLhFRhMYil19pANDjM 6hJkVjUARwp+N2z+3I2aPk3fcblZ5EUX2uiW9HWz/6DptHaOSWhb99P2/Tc2iHBCSgQ7 GLuSKDwaMCsiQUbYSu9A8fC+jiebDlfr9QP8VXJR2tIU7eEsFPM/1+azQymeV6ZU9Hgs wdMMAILDZ87tsn0rfcderGkqD/5c7Y/GI2ltnpYyx9nVCR6Famp0KzSdfPNquW+y9IwL mxTg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=stBj9R470eTrFxTy8rUh9qMz0b4KHQ3ldsc1vJio+Ns=; b=fxhsAmF/J9E7DHGCxOFIK2IcLCDaSPok5w/PZH2+As0E/KxXBU6L8huU03kbNI4Skf pfUA3e3wBchES5YiDa5ODgzaPvsco+qwUZTG2gM3KTE3eQ469wNlm/iSvIPlM8KmQZKY 50bJFve70t2gD1MAXZvXtxOPSpi0VCGtsL7y93SGRlKel8sd7u2qcTE80Ax9FNCFxSrG 3nsTIYYrA5QEBEU7peLPZBLi3/Ablm+kNfyFY3FoZr5+2u8SAbiroegesxiM2JYyB+6u eOWHQbLWAzAfIiorpdSPXZpt1U17IdhDSo0b4nX9Ghu/Dwx9dccO6/uNgsgW0fhLcP4Z DOVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=m7dlklzR; 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 w127si14336788pfw.200.2019.06.11.06.47.59; Tue, 11 Jun 2019 06:48:00 -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=m7dlklzR; 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 S2389566AbfFKNr7 (ORCPT + 3 others); Tue, 11 Jun 2019 09:47:59 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:42841 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388390AbfFKNr6 (ORCPT ); Tue, 11 Jun 2019 09:47:58 -0400 Received: by mail-wr1-f66.google.com with SMTP id x17so13093596wrl.9 for ; Tue, 11 Jun 2019 06:47:56 -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 :mime-version:content-transfer-encoding; bh=stBj9R470eTrFxTy8rUh9qMz0b4KHQ3ldsc1vJio+Ns=; b=m7dlklzRB9jkFwDMixQAjKWjqH73AX7Au3V9ZrY/9/z8dZtAjwGqjCSMpnPwmTGmbC Rk/vB3tdnwzfDHr7tPZF3/gmKE1eDZj7VePgm4t2ODU28BxtBlNB3Hi/9SqDDT6YivxJ ubojpkMRyHgvAbf7mYHswU8Hi/I1P6onXpLax7S5We+MUHi+yMbUmkiTAMc7kqnXX4ls b269AdF7THrxFetBWxxfYcMklptUrbGLX9fsUhsvK/sel0Uuq07xVNofcLj3QbK5BeuB KtRvGwR60ZIGaUGhxcIEEuEqPJmYWR1E0dHwAhCQmDE3OG00+rfSUsm863AyKJOs1wP3 J30A== 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:mime-version:content-transfer-encoding; bh=stBj9R470eTrFxTy8rUh9qMz0b4KHQ3ldsc1vJio+Ns=; b=M29K02ClkIJ5C9SMLOOoskLabjbJP9XXKoJD0B+0UKWE4CHI2pnyva5/1N+La02Dpx Jq7Y2TrNjWMvFZxdYJkaVAvz4v9WLMlor6afBWLcQPocFUL1QOJOPJ6YhUQC6FE1PQ3T yvku5E+YLyx6qZ8TnVThZCb1z96ITvWGmdJbpGVXQb/0f/RP5KZscPRFvNI2lc2wykaX IggdBXB+PQTpy1wmSlkAkPRn9b8EMq5v2ENwj1B7izx23SFIQMsb6umSlLSk52nP44c6 ot8peAuVeWN/ARClIjvDAhBI972tuGpxqOYgN/jx2y16g8lsSBnolB4Bd6bhxWAYtxgh 0CHw== X-Gm-Message-State: APjAAAX4F3DXzQuvHsvK6IYHd1NZ7yNT4UNEIA+VOwX8rb6UeXcyl3TD VjHvnrpkmlQ2jY+T9YqKaglDlpNyFYqPuXfZ X-Received: by 2002:a5d:6205:: with SMTP id y5mr18654578wru.340.1560260875652; Tue, 11 Jun 2019 06:47:55 -0700 (PDT) Received: from sudo.home ([2a01:cb1d:112:6f00:24bb:7f31:25fe:43a7]) by smtp.gmail.com with ESMTPSA id o126sm3964305wmo.31.2019.06.11.06.47.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jun 2019 06:47:54 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: Ard Biesheuvel , Herbert Xu , "David S. Miller" , Eric Biggers , Johannes Berg Subject: [PATCH v3 1/7] crypto: arc4 - refactor arc4 core code into separate library Date: Tue, 11 Jun 2019 15:47:44 +0200 Message-Id: <20190611134750.2974-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190611134750.2974-1-ard.biesheuvel@linaro.org> References: <20190611134750.2974-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Refactor the core rc4 handling so we can move most users to a library interface, permitting us to drop the cipher interface entirely in a future patch. This is part of an effort to simplify the crypto API and improve its robustness against incorrect use. Signed-off-by: Ard Biesheuvel --- MAINTAINERS | 1 + crypto/Kconfig | 4 ++ crypto/arc4.c | 60 +--------------- include/crypto/arc4.h | 10 +++ lib/Makefile | 2 +- lib/crypto/Makefile | 4 ++ lib/crypto/arc4.c | 72 ++++++++++++++++++++ 7 files changed, 93 insertions(+), 60 deletions(-) -- 2.20.1 diff --git a/MAINTAINERS b/MAINTAINERS index 57f496cff999..112f21066141 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4241,6 +4241,7 @@ F: crypto/ F: drivers/crypto/ F: include/crypto/ F: include/linux/crypto* +F: lib/crypto/ CRYPTOGRAPHIC RANDOM NUMBER GENERATOR M: Neil Horman diff --git a/crypto/Kconfig b/crypto/Kconfig index 3d056e7da65f..5114b35ef3b4 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -1230,9 +1230,13 @@ config CRYPTO_ANUBIS +config CRYPTO_LIB_ARC4 + tristate + config CRYPTO_ARC4 tristate "ARC4 cipher algorithm" select CRYPTO_BLKCIPHER + select CRYPTO_LIB_ARC4 help ARC4 cipher algorithm. diff --git a/crypto/arc4.c b/crypto/arc4.c index a2120e06bf84..6974dba1b7b9 100644 --- a/crypto/arc4.c +++ b/crypto/arc4.c @@ -13,33 +13,12 @@ #include #include -struct arc4_ctx { - u32 S[256]; - u32 x, y; -}; - static int arc4_set_key(struct crypto_tfm *tfm, const u8 *in_key, unsigned int key_len) { struct arc4_ctx *ctx = crypto_tfm_ctx(tfm); - int i, j = 0, k = 0; - - ctx->x = 1; - ctx->y = 0; - for (i = 0; i < 256; i++) - ctx->S[i] = i; - - for (i = 0; i < 256; i++) { - u32 a = ctx->S[i]; - j = (j + in_key[k] + a) & 0xff; - ctx->S[i] = ctx->S[j]; - ctx->S[j] = a; - if (++k >= key_len) - k = 0; - } - - return 0; + return arc4_setkey(ctx, in_key, key_len); } static int arc4_set_key_skcipher(struct crypto_skcipher *tfm, const u8 *in_key, @@ -48,43 +27,6 @@ static int arc4_set_key_skcipher(struct crypto_skcipher *tfm, const u8 *in_key, return arc4_set_key(&tfm->base, in_key, key_len); } -static void arc4_crypt(struct arc4_ctx *ctx, u8 *out, const u8 *in, - unsigned int len) -{ - u32 *const S = ctx->S; - u32 x, y, a, b; - u32 ty, ta, tb; - - if (len == 0) - return; - - x = ctx->x; - y = ctx->y; - - a = S[x]; - y = (y + a) & 0xff; - b = S[y]; - - do { - S[y] = a; - a = (a + b) & 0xff; - S[x] = b; - x = (x + 1) & 0xff; - ta = S[x]; - ty = (y + ta) & 0xff; - tb = S[ty]; - *out++ = *in++ ^ S[a]; - if (--len == 0) - break; - y = ty; - a = ta; - b = tb; - } while (true); - - ctx->x = x; - ctx->y = y; -} - static void arc4_crypt_one(struct crypto_tfm *tfm, u8 *out, const u8 *in) { arc4_crypt(crypto_tfm_ctx(tfm), out, in, 1); diff --git a/include/crypto/arc4.h b/include/crypto/arc4.h index 5b2c24ab0139..f3c22fe01704 100644 --- a/include/crypto/arc4.h +++ b/include/crypto/arc4.h @@ -6,8 +6,18 @@ #ifndef _CRYPTO_ARC4_H #define _CRYPTO_ARC4_H +#include + #define ARC4_MIN_KEY_SIZE 1 #define ARC4_MAX_KEY_SIZE 256 #define ARC4_BLOCK_SIZE 1 +struct arc4_ctx { + u32 S[256]; + u32 x, y; +}; + +int arc4_setkey(struct arc4_ctx *ctx, const u8 *in_key, unsigned int key_len); +void arc4_crypt(struct arc4_ctx *ctx, u8 *out, const u8 *in, unsigned int len); + #endif /* _CRYPTO_ARC4_H */ diff --git a/lib/Makefile b/lib/Makefile index fb7697031a79..d3daedf93c5a 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -102,7 +102,7 @@ endif obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any) -obj-y += math/ +obj-y += math/ crypto/ obj-$(CONFIG_GENERIC_IOMAP) += iomap.o obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_iomap.o diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile new file mode 100644 index 000000000000..88195c34932d --- /dev/null +++ b/lib/crypto/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_CRYPTO_LIB_ARC4) += libarc4.o +libarc4-y := arc4.o diff --git a/lib/crypto/arc4.c b/lib/crypto/arc4.c new file mode 100644 index 000000000000..fa589eba3d50 --- /dev/null +++ b/lib/crypto/arc4.c @@ -0,0 +1,72 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Cryptographic API + * + * ARC4 Cipher Algorithm + * + * Jon Oberheide + */ + +#include +#include + +int arc4_setkey(struct arc4_ctx *ctx, const u8 *in_key, unsigned int key_len) +{ + int i, j = 0, k = 0; + + ctx->x = 1; + ctx->y = 0; + + for (i = 0; i < 256; i++) + ctx->S[i] = i; + + for (i = 0; i < 256; i++) { + u32 a = ctx->S[i]; + + j = (j + in_key[k] + a) & 0xff; + ctx->S[i] = ctx->S[j]; + ctx->S[j] = a; + if (++k >= key_len) + k = 0; + } + + return 0; +} +EXPORT_SYMBOL(arc4_setkey); + +void arc4_crypt(struct arc4_ctx *ctx, u8 *out, const u8 *in, unsigned int len) +{ + u32 *const S = ctx->S; + u32 x, y, a, b; + u32 ty, ta, tb; + + if (len == 0) + return; + + x = ctx->x; + y = ctx->y; + + a = S[x]; + y = (y + a) & 0xff; + b = S[y]; + + do { + S[y] = a; + a = (a + b) & 0xff; + S[x] = b; + x = (x + 1) & 0xff; + ta = S[x]; + ty = (y + ta) & 0xff; + tb = S[ty]; + *out++ = *in++ ^ S[a]; + if (--len == 0) + break; + y = ty; + a = ta; + b = tb; + } while (true); + + ctx->x = x; + ctx->y = y; +} +EXPORT_SYMBOL(arc4_crypt);