From patchwork Fri Jun 28 09:35:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 168047 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3454884ilk; Fri, 28 Jun 2019 02:36:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqyV0wg/ZugPi8bpdoYhMEa8U1vJc41tjPsmBe3ISYPnCKohlYKvHQRstzeAJ6NVHoScDLLj X-Received: by 2002:a63:61cb:: with SMTP id v194mr7813473pgb.95.1561714573859; Fri, 28 Jun 2019 02:36:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561714573; cv=none; d=google.com; s=arc-20160816; b=i643R5SFcWzbEX3KqLWmCkTn3l91aS4lRvTUF+l4+7k9oqHA5ceiqyJo/YSqzFgkSb vB/8+LxQiYQ/8doj4P/9GrOveDP2n/sA/sWELmiLz90cV9WU0wR/EuvrzmuVqQTUOyoM mCFZ4s0km6YnmEXIJY04uxUCmKCoxBLgrql1sCkyFxJwJJ5TP3MS+mosA76trJx5BILY FpAN0RwnWs6IlroYqibV8UB+nEKFZHtOC2fC0DCO67lOXACcoA9wIFQPp2umGP09yghv gWgdPzGOFEi19MeEhd/1XrGeb41D90yf7VwY0PGb0TGAq3xOsix5HVvflVm2sAZmDcWg wyuw== 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=HMxEFfI7tJ6A3Lxij+jWi/muPaKRgiRph4XGCcI4O/0=; b=CtQt5zfLGpALBfzeouGxxz7eYKMZKS3mB9Md62dEw+mLyagQG0VfhndUlhkxSc3Tkx lyeCFKu6Su2FNcAJOeuhE3Wpi2iJS+NlPQkixsy29MikH2+JRyfNyk2DRbjTh17l3ane fYXoiuqxAJ4cHLGk8S9+sQcqsnHucIirn0FnAv2JjbiROajkK6l/txXxjFQUJpZSrvDk 3kZb9r0Zgb/ITQge0cG4X9l4qeIc/j0i5ykrVUgWeMd9XSLH+2HbLikUoq4aua3Nfaz1 CgE3bHkDWdhF8peoC4MJ65pMF9u6UOX6uTeC6RTkVsko2fcn/LGyf8Q6uwgg7bL2si95 SX7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hkJMEkt+; 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 j7si2015771pfi.10.2019.06.28.02.36.13; Fri, 28 Jun 2019 02:36:13 -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=hkJMEkt+; 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 S1726596AbfF1JgM (ORCPT + 3 others); Fri, 28 Jun 2019 05:36:12 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:55736 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726774AbfF1JgM (ORCPT ); Fri, 28 Jun 2019 05:36:12 -0400 Received: by mail-wm1-f66.google.com with SMTP id a15so8407873wmj.5 for ; Fri, 28 Jun 2019 02:36:10 -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=HMxEFfI7tJ6A3Lxij+jWi/muPaKRgiRph4XGCcI4O/0=; b=hkJMEkt+H6i2GmbO0KSCljhk9WVAf2BXDctigWeQ1kzI9sUe9awEpQyg9L36u4NDYM MrNtMjMo/8jgjhiLzauGPpOFXGbtnEH4X6RAZtvCoHm57z88aOMc/JSic8oYds5TFSx9 RgcSBof/gCpKR6G/+SQEp1SDAVGjIM7Zo2uvuFVGyq5Ui3xfAct9YlZUWOgo2CxzVXb6 YHgVjS1hx4BJlCfjtvmnqvztz5Z5sgWHNOzg0RB0fNcSpoAGVShjLXVArkCVyR05BHnE 1KJzpKItbZe9VrwZuI/8sYRAQ44hoTqQuYDTz+U3BEJZmfR6QSEHlr1L8D090O5meDk+ 59WA== 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=HMxEFfI7tJ6A3Lxij+jWi/muPaKRgiRph4XGCcI4O/0=; b=JpZp68CpvH25cmyqc1J8Dl/GKpaRtJ+FCNT3Dh7UmDEqqtY+kHTqRn+60YXPCgzsB5 lAvW8571DjDsruy2rD3WqVEbQOJ6UExEFg0d2qdt6VuNI9JPPJojdJ90yS/HmJHOvMU7 ZayPZafH1Y1JpGvgFlQad9TlOTSdRxL5xjku7737Of/mUPmvCdnVkmpolSkb8xDi94QM FI79n66s1CC8ddMU4hJEW+S2mAWKYEq2RqISmVG7S2GA2/W589T9xQapArDAgGb0zPsZ Ibm0bQPWPo8iiaDJaBoxKyotbzHToeIyXwEOSOgM8qSQTefxOgZ5ftyyqZRVhgEytFfM NM2w== X-Gm-Message-State: APjAAAWC+eXKxUi3l0UkPfmTKGF65wCe1VNizRE579HFye84LMmLS2Wc jqsoBv/i2lyj0sxtGsB187214OEu0AWQOg== X-Received: by 2002:a1c:f009:: with SMTP id a9mr6285584wmb.32.1561714569805; Fri, 28 Jun 2019 02:36:09 -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.36.08 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 28 Jun 2019 02:36:08 -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 29/30] crypto: des - remove now unused __des3_ede_setkey() Date: Fri, 28 Jun 2019 11:35:28 +0200 Message-Id: <20190628093529.12281-30-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190628093529.12281-1-ard.biesheuvel@linaro.org> References: <20190628093529.12281-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 Signed-off-by: Ard Biesheuvel --- crypto/des_generic.c | 13 ------------- include/crypto/des.h | 3 --- 2 files changed, 16 deletions(-) -- 2.20.1 diff --git a/crypto/des_generic.c b/crypto/des_generic.c index 8669423886aa..201caf22b881 100644 --- a/crypto/des_generic.c +++ b/crypto/des_generic.c @@ -56,19 +56,6 @@ static void crypto_des_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) des_decrypt(dctx, dst, src); } -int __des3_ede_setkey(u32 *expkey, u32 *flags, const u8 *key, - unsigned int keylen) -{ - int err; - - des_ekey(expkey, key); expkey += DES_EXPKEY_WORDS; key += DES_KEY_SIZE; - dkey(expkey, key); expkey += DES_EXPKEY_WORDS; key += DES_KEY_SIZE; - des_ekey(expkey, key); - - return 0; -} -EXPORT_SYMBOL_GPL(__des3_ede_setkey); - static int des3_ede_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) { diff --git a/include/crypto/des.h b/include/crypto/des.h index 2c864a4e6707..7812b4331ae4 100644 --- a/include/crypto/des.h +++ b/include/crypto/des.h @@ -54,7 +54,4 @@ int des_expand_key(struct des_ctx *ctx, const u8 *key, unsigned int keylen); int des3_ede_expand_key(struct des3_ede_ctx *ctx, const u8 *key, unsigned int keylen); -extern int __des3_ede_setkey(u32 *expkey, u32 *flags, const u8 *key, - unsigned int keylen); - #endif /* __CRYPTO_DES_H */