From patchwork Mon Aug 5 17:00:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 170605 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4538861ile; Mon, 5 Aug 2019 10:02:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqyS4c/4ZlnuYDn6hBuGR2LtsXZ26mSVSEKLDC41Xlypq6LQZ5zwhH5P2oNjpla9tNA1aT7Q X-Received: by 2002:a65:4205:: with SMTP id c5mr25994331pgq.267.1565024556964; Mon, 05 Aug 2019 10:02:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565024556; cv=none; d=google.com; s=arc-20160816; b=YoJ/u3YR/6FM5x0S/zXFOtEqT6OVJb5KlYXkyJnE30UMQsMdt0RFby2F0ySF5rqYsP 8wiQQGB1LNaaNcV7lLU6vZiV+3krXRMXYpF9WUpGxD1h3AatMmP/hgbnreH7QdrOxXDa t7rqlRb549oE2PE1RSrKLdN1DoXoJrKO5wKlkYd6S3g627/KWpMwQqaS7vPX5+RBmHbr 34V3D0c5DKwGuFnFmxUijh5MJJSrgEU4vvzWj0vSaa2x/jB0DTmBWlEuhlIhfT8xl9lu U+e+iIEfYmoHa9XC5kRaNwQkbXv+lbcopfm08SqdwO4D+6hzzgrFwDedBDJU6KsZ/2vP j7Rg== 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=c5DcZnW9kJbzFr8h8l1GvwYyrPYk1S8t1dXru5gcJeLeLR1JMGZiD666FV9zC5NNPU xZBJ32IxXT9jZDI9L6QTOSFy4y/k2hiRdwNBuz2PDvUHkvFvhC40WHtvs467tFfGPAR1 WvGMVZyvlwxbSeJBYPSy7eRU5/9cW3dal8n+rHoVgwKLjCWOGnknMPmNjCqTP3XdVNfI ds7rMzzTWbF92PsJK+ykBtPNb2QkREj+8k1Ir8jGUFo76NuUIU1uYOp8IU+DP1/y/6oQ v2GkcvQrR5iXqHL3rB+2zSgCo3y/hxbbA6GXX/RSVi2PEIR/0FyX5pVNzVoz0yI08HkV RJfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ve7cF51U; 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 l63si46181371pfl.41.2019.08.05.10.02.36; Mon, 05 Aug 2019 10:02:36 -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=ve7cF51U; 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 S1729962AbfHERCf (ORCPT + 3 others); Mon, 5 Aug 2019 13:02:35 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53826 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729439AbfHERCe (ORCPT ); Mon, 5 Aug 2019 13:02:34 -0400 Received: by mail-wm1-f65.google.com with SMTP id x15so75470295wmj.3 for ; Mon, 05 Aug 2019 10:02:33 -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=ve7cF51UDM8GKtpnt3c0ZOMXwuYbMzLdGmkJNZFrwyl8m2/bvpwtP5076qo7fWKvzV moI1ez+/fU3iIaRuFnFS84anGgzFD2hxYtgFxMEIcZgcXBnYDDGDOnB54WCen6g2Ezjg YG80M/DYx5Di8X8gAPZyrsQ4PWG9uRn8eoXQgAh9CpU/K93MRSuKvBywUL1PKva7SBh5 639M7HQAWH/4F4Q2ed/94+SBZuhOKIIttFa2EFBRqDjJihpj5/7FGExqXylWyMNugXw2 1lTsd8wZh+0FWUtkqEIwEO25PbHsfJvIIsCeN6UTXFGduFv/ydTm0yESQvXQ/nn1Mw7O YxcA== 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=siE6gLzSLv2iKtAmwCicPkhdhlOGzCPcqgqrSO7vArVi5IKccm0x3MkQCz9s1b/3mM dAKnwbA0cgF2kFOri+PiJF50qPbMJKJYlQ18I2zJkrZJyGe/HHFtfGNXrzIaA58sAp+o IIPT1R/ktRVrV2MvA4zbUi0C65WOKu9qiw5oJpOZgljfipWyFTWcSgSG6CeMfOKWB7JZ NfKHSB2Tk9+J58HoVjRj8DD2DN1nbqi6GUo7aj+wRfA6tfwn8gtugtWkZ/mN+MIwfQzz 69L138DLZ8tIGkKX+USC0bf0E0YCwGTlOAEGfuNBfQ544/e2VTkhEyh3M4vCWXeUAU/d WQwQ== X-Gm-Message-State: APjAAAU9nHhMxfQ0ZAaolNNpkdZf88oUD2uVkfhJIaREvFOtism5JpcA uTcFyoOP91QlOakxwyQpAFewYg0U+BtlIw== X-Received: by 2002:a1c:4054:: with SMTP id n81mr19962693wma.78.1565024552290; Mon, 05 Aug 2019 10:02:32 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:a407:da00:582f:8334:9cd9:7241]) by smtp.gmail.com with ESMTPSA id j9sm95669383wrn.81.2019.08.05.10.02.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Aug 2019 10:02:31 -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 v4 29/30] crypto: des - remove now unused __des3_ede_setkey() Date: Mon, 5 Aug 2019 20:00:36 +0300 Message-Id: <20190805170037.31330-30-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190805170037.31330-1-ard.biesheuvel@linaro.org> References: <20190805170037.31330-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 */