From patchwork Sat Jun 22 00:31: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: 167452 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1376941ilk; Fri, 21 Jun 2019 17:32:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqxJ2wmYWflIqyHsZiZRIn0ENHzPMx9paZ9z1e+ft+bE3T8LoEq0gl4X/72VDuMmI6wgCPqV X-Received: by 2002:a17:90a:9a8d:: with SMTP id e13mr10151265pjp.77.1561163537867; Fri, 21 Jun 2019 17:32:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561163537; cv=none; d=google.com; s=arc-20160816; b=AJaq0IF2wBKTbtjLM9dAASCwFC9bUMNt9+f5l2d/4inV3SXuA15ibHY76+CocPpgW/ j9ZmAgRtrf9R3mI9w/VkL0sHS7E1c9UJRzYKkVlelNn8YV5imRFWIhGwAmpAVakHflRa YgR/jp+IF4EMJsVIa7a7CBNBoMDRWSN0RRc6bagLhrHuzvVTNA6+Zj5UzBCCE3kWVp9e M94JNRb/AfwR1naqNN8ZDAJJOXSIy6f+wY1OME0U8KV0xhGosy99td1NwEJ5f0Nsa7Mi TBJ/5UqDSVmwzQxhKAZ6ZgK0rB41Z+Dm8+4BX6kbExt9p8yJcPOjIO6k2IDqsHEtQC3B lzSg== 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=d98uZ13bv3wjIuUwQ08LpTEfRPRoso0kw20Awag4Gho=; b=Bdnf5JwbdFcqvkTUNxVhsWLbDGlb1IZ9UvBo0MkXg/GfzE0HAvk5wD1fz66rgrbC2h elt9VwxuPgMfKTjl/lhbYV6zJTPmi+djD6Llg2ZKxWLeyVc6Em97Vyh/d7+FPBF5nslj TWv/b6KzmMPpJwXHAQj8i2Qezdk0mj6DenKSkVHkmiIF6UFAuXlEqLtDqgIFBOzsTmIa 70Yqdgy+iL0qxPZUCGDCJeo+I2sBugZG8CQaplC5OZC5ZrUPsUggMrYmeX1CAwzaJ27M 8IhrH4poSECCW6hon6i2Y1sbjtN3XTQ85TqfZPSSzXcUn0KOCJAscHdwlOmre+LMfIk5 cfEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fJbwQOIc; 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 v10si4096271plg.320.2019.06.21.17.32.17; Fri, 21 Jun 2019 17:32:17 -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=fJbwQOIc; 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 S1726272AbfFVAcR (ORCPT + 3 others); Fri, 21 Jun 2019 20:32:17 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:40315 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726262AbfFVAcR (ORCPT ); Fri, 21 Jun 2019 20:32:17 -0400 Received: by mail-wm1-f67.google.com with SMTP id v19so8077159wmj.5 for ; Fri, 21 Jun 2019 17:32:16 -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=d98uZ13bv3wjIuUwQ08LpTEfRPRoso0kw20Awag4Gho=; b=fJbwQOIczyZUwpncHeLMRfNzg2PHy+uX6H06nCYAftifkCnZh6mEEOur+6VSyB/e8X M5G1m2D8Iixpa1oWcByzZFIXCmjSbCuTbMbVQ5FM0J20X+J3LTS4uT39lE8kSgxN60NN 7Ohud6SyOSrVcuaYL5Tnx034lpzIE7afA1qAQQcIQJOhRcvD/cRLcm5eT9aCx66X8Kw0 /nfv2z4PxJV2wYtOF+rKEbIgf6brgUQy6Tvsv0LNQ/brYRlfTRW5ruW3ZcQVCNpu0req hLvi2tM1O6FJ8uZFO+NaW9yUTZbZzD9MlQA9UMWlgUpJKCYHcTou9+N7SCph7PSsI63Z UQkA== 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=d98uZ13bv3wjIuUwQ08LpTEfRPRoso0kw20Awag4Gho=; b=XAjEJWJlA/lNHIIjVLTIDo3HRqcldhjwJl2T9kW4yhYpmW8kB9npUJqTx1hfUpw/gg oGfz47OaTWHiw0OTPJLIopmRcKXd1dVEyTLoZDHD7wLi3VL3Y0PBTalX65AfO3stt4jp +yZrIKVLRrX0M2RcFZAGOnMLsaiB93lE69F4Ngf3CR19A9SYYVZXaIc9SaizPKWc/fUM 3pCtNkIa+FMpiszsWm1fT0MQtUfV2QDH1gXA2m5YMiQSyWGkJTzQgmoREHpvCXyYNCHP dzPQ2eK3nHrnNSecJIMs4gjMKqVIQE+Supm4fSrjo+9gvuNZUaN9F3V1krhwVrNnMi7s PGiQ== X-Gm-Message-State: APjAAAVoYtWbghLQuxHS9rW8tYVNhU0c+MPZAUBgvpQdR64+An4DbsQr yQeZppjM/ahlXs52vkbXp7ZI1cvVDyipT7IX X-Received: by 2002:a05:600c:2182:: with SMTP id e2mr5580949wme.104.1561163535032; Fri, 21 Jun 2019 17:32:15 -0700 (PDT) Received: from sudo.home ([2a01:cb1d:112:6f00:99d4:1ff0:ed6:dfbb]) by smtp.gmail.com with ESMTPSA id v18sm4792019wrd.51.2019.06.21.17.32.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Jun 2019 17:32:14 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, ebiggers@google.com, Ard Biesheuvel Subject: [RFC PATCH 29/30] crypto: des - remove now unused __des3_ede_setkey() Date: Sat, 22 Jun 2019 02:31:11 +0200 Message-Id: <20190622003112.31033-30-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190622003112.31033-1-ard.biesheuvel@linaro.org> References: <20190622003112.31033-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 fd0a92a471d4..6360b14a2367 100644 --- a/crypto/des_generic.c +++ b/crypto/des_generic.c @@ -58,19 +58,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 2c9cc198b214..c3e2cd772128 100644 --- a/include/crypto/des.h +++ b/include/crypto/des.h @@ -35,7 +35,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 */