From patchwork Thu Aug 15 09:01:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 171428 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1918763ily; Thu, 15 Aug 2019 02:02:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqz+OPV0jZnkrYPYCg2tulyFX9Ilj6aLS/wBbmsapQci3z1MuUOgYZbzkK2KdgEC9Gfj+nPV X-Received: by 2002:a17:90a:71ca:: with SMTP id m10mr1312252pjs.27.1565859741079; Thu, 15 Aug 2019 02:02:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565859741; cv=none; d=google.com; s=arc-20160816; b=w8y5kf2+tgrpeHL4EJiw7q3UQyEDuBkek9Xi7brpmxcOJp4xGcEVDjG1LshhW62lgJ XOAedZ14CoaMhsC1+8R2KpcakxUgn5ttdwFoXUMmO3TC/UChC3bw5sGx4EVmCcjOTaji eJPthZP4JlCl8I74taoTEPhKmz1GEhdPT1CSlM9XQ2pMewAVojCC3Ljs1XsrCwhVydXT aOa+3sOHEBoB0mH8mdGd91I70GLw6TBSIHJmgA9b4Xd6eMJx0jfbcjpw8PbtoeZv1Biz FFprq1GUqAc+d/0rxdEzltL48TGq6d82wZTBYnMKEpjKxen9LoHMsTLsaMC2pbsV2zK+ 0coQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=6OhjbF2M4HRdeN0EH1XAkAXt0Z8G30cJBFEK1XTbAV0=; b=nBO9cPZuGdpOnsSWrtfiCNEZD2nN5OJ+dFWPMquA0B8vN72h+z62GNaqQ8D8uHbQyj 2scuII1gDyCFlJ9ZUkDpPNz7RqyWVC5Su7JUnDsuZ52V6Uwqac5VjCQWYh4YNQkQS1FN VcYCS2YMS8srOQRy4H8jQshr4jQp7Gfp4ehb7Np1qAWGwJwpgrr0Qas8hbK71bODkiUj //pDHXB7AA2J/BafsIKx/yNIhINKjaw0xRaQo/I3Zsb5qaqLM/fXWjGO9dy8RsWPgKMj COF3ETf696rvA3BvbZ/TqJWSxteBTIGEwhqteBQZ1fcb3AxnVtXm2PI4wTMSglzDJl+7 ia0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dYD58Uvi; 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 k11si1650459pfi.3.2019.08.15.02.02.20; Thu, 15 Aug 2019 02:02:21 -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=dYD58Uvi; 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 S1730867AbfHOJCU (ORCPT + 3 others); Thu, 15 Aug 2019 05:02:20 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:39266 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730213AbfHOJCT (ORCPT ); Thu, 15 Aug 2019 05:02:19 -0400 Received: by mail-wm1-f66.google.com with SMTP id i63so678112wmg.4 for ; Thu, 15 Aug 2019 02:02:18 -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=6OhjbF2M4HRdeN0EH1XAkAXt0Z8G30cJBFEK1XTbAV0=; b=dYD58UviyQoaqUX0Ufh5LH392urYuVBmdfTxlfeu4vZIhEPoJieDnCAHjViHnMA96Q 1LFZ+a9mTb30FunM54tEir8xdwB6AxzpZrS0YuF1wZNyQAuYvlUYbOwvXy5nMS1hdxNW gek5jdntD6WcQbQgLS0TfLeP2sA6YH7ModgaZ9y/BWS3YxiWUq65wQ2R9XkOgXPidsGX F4/3shClIptKCYbkurnxGkGxgpufK04bT+UHDkqfOAGfaPncGJHOBEZTaoJT7Pm1+NJB gZm5OPLJMuKDRlxU/qaBQfXHPOQDlvU/pmKRJ0rHoXqJgDq2NBmtsbojCvxDjIKC7oEy iWRQ== 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=6OhjbF2M4HRdeN0EH1XAkAXt0Z8G30cJBFEK1XTbAV0=; b=BKYTSyF/bP3A5SwIRUbJS98j/qlnBif7nUnTWmIFYcXe7PxRANQ3Q1rxQkDiYMe+Of YprmIcE8sXEeEitBZiJ6hCMPa6sOoopgUHXvnWFINpQNiICHJ7Ps6SEoHajUY6HxMd6o SGPxqfHVizrGOx8BewNOB9si22HkmvSdrUURJliyPLHWtGHA+QakyEaPjeYc2MOzu5t3 pYc7l9et5yjrwYaEG9XS9P9ztGPtRLCZnb467WVIaHebJe2QUFqubFnQzex+TAtjncbS 6gxEuRP2Hubb/fm1AI+OKtEc8IAcI++Ns5oNeoMDAterZCfBCaFFGJFUGnFAncA4WXJp B0og== X-Gm-Message-State: APjAAAUMPpnD0p3a9G0Z2ghfSawGC33EeAfuUesgi/LEMosXF6wgytR7 U3uOAo7g9Lcy5nfxX8vOMBEU0FWG6gILJzt6 X-Received: by 2002:a7b:c157:: with SMTP id z23mr1699974wmi.104.1565859737719; Thu, 15 Aug 2019 02:02:17 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:a407:da00:f1b5:e68c:5f7f:79e7]) by smtp.gmail.com with ESMTPSA id x20sm3857533wrg.10.2019.08.15.02.02.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Aug 2019 02:02:17 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, Ard Biesheuvel Subject: [PATCH v5 29/30] crypto: des - remove now unused __des3_ede_setkey() Date: Thu, 15 Aug 2019 12:01:11 +0300 Message-Id: <20190815090112.9377-30-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190815090112.9377-1-ard.biesheuvel@linaro.org> References: <20190815090112.9377-1-ard.biesheuvel@linaro.org> 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.17.1 diff --git a/crypto/des_generic.c b/crypto/des_generic.c index e021a321f584..6e13a4a29ecb 100644 --- a/crypto/des_generic.c +++ b/crypto/des_generic.c @@ -51,19 +51,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 */