From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-crypto@vger.kernel.org
Cc: herbert@gondor.apana.org.au, Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH v5 26/30] crypto: des - remove unused function
Date: Thu, 15 Aug 2019 12:01:08 +0300 [thread overview]
Message-ID: <20190815090112.9377-27-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20190815090112.9377-1-ard.biesheuvel@linaro.org>
Remove the old DES3 verification functions that are no longer used.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
include/crypto/des.h | 41 --------------------
1 file changed, 41 deletions(-)
diff --git a/include/crypto/des.h b/include/crypto/des.h
index 72c7c8e5a5a7..31b04ba835b1 100644
--- a/include/crypto/des.h
+++ b/include/crypto/des.h
@@ -19,47 +19,6 @@
#define DES3_EDE_EXPKEY_WORDS (3 * DES_EXPKEY_WORDS)
#define DES3_EDE_BLOCK_SIZE DES_BLOCK_SIZE
-static inline int __des3_verify_key(u32 *flags, const u8 *key)
-{
- int err = -EINVAL;
- u32 K[6];
-
- memcpy(K, key, DES3_EDE_KEY_SIZE);
-
- if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||
- !((K[2] ^ K[4]) | (K[3] ^ K[5]))) &&
- (fips_enabled ||
- (*flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)))
- goto bad;
-
- if (unlikely(!((K[0] ^ K[4]) | (K[1] ^ K[5]))) && fips_enabled)
- goto bad;
-
- err = 0;
-
-out:
- memzero_explicit(K, DES3_EDE_KEY_SIZE);
-
- return err;
-
-bad:
- *flags |= CRYPTO_TFM_RES_WEAK_KEY;
- goto out;
-}
-
-static inline int des3_verify_key(struct crypto_skcipher *tfm, const u8 *key)
-{
- u32 flags;
- int err;
-
- flags = crypto_skcipher_get_flags(tfm);
- err = __des3_verify_key(&flags, key);
- crypto_skcipher_set_flags(tfm, flags);
- return err;
-}
-
-extern unsigned long des_ekey(u32 *pe, const u8 *k);
-
extern int __des3_ede_setkey(u32 *expkey, u32 *flags, const u8 *key,
unsigned int keylen);
--
2.17.1
next prev parent reply other threads:[~2019-08-15 9:02 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-15 9:00 [PATCH v5 00/30] crypto: DES/3DES cleanup Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 01/30] crypto: des/3des_ede - add new helpers to verify keys Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 02/30] crypto: s390/des - switch to new verification routines Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 03/30] crypto: sparc/des " Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 04/30] crypto: atmel/des " Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 05/30] crypto: bcm/des " Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 06/30] crypto: caam/des " Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 07/30] crypto: cpt/des " Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 08/30] crypto: nitrox/des " Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 09/30] crypto: ccp/des " Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 10/30] crypto: ccree/des " Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 11/30] crypto: hifn/des " Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 12/30] crypto: hisilicon/des " Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 13/30] crypto: safexcel/des " Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 14/30] crypto: ixp4xx/des " Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 15/30] crypto: cesa/des " Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 16/30] crypto: n2/des " Ard Biesheuvel
2019-08-15 9:00 ` [PATCH v5 17/30] crypto: omap/des " Ard Biesheuvel
2019-08-15 9:01 ` [PATCH v5 18/30] crypto: picoxcell/des " Ard Biesheuvel
2019-08-15 9:01 ` [PATCH v5 19/30] crypto: qce/des " Ard Biesheuvel
2019-08-15 9:01 ` [PATCH v5 20/30] crypto: rk3288/des " Ard Biesheuvel
2019-08-15 9:01 ` [PATCH v5 21/30] crypto: stm32/des " Ard Biesheuvel
2019-08-15 9:01 ` [PATCH v5 22/30] crypto: sun4i/des " Ard Biesheuvel
2019-08-15 9:01 ` [PATCH v5 23/30] crypto: talitos/des " Ard Biesheuvel
2019-08-15 9:01 ` [PATCH v5 24/30] crypto: ux500/des " Ard Biesheuvel
2019-08-15 9:01 ` [PATCH v5 25/30] crypto: 3des - move verification out of exported routine Ard Biesheuvel
2019-08-15 9:01 ` Ard Biesheuvel [this message]
2019-08-15 9:01 ` [PATCH v5 27/30] crypto: des - split off DES library from generic DES cipher driver Ard Biesheuvel
2019-08-15 9:01 ` [PATCH v5 28/30] crypto: x86/des - switch to library interface Ard Biesheuvel
2019-08-15 9:01 ` [PATCH v5 29/30] crypto: des - remove now unused __des3_ede_setkey() Ard Biesheuvel
2019-08-15 9:01 ` [PATCH v5 30/30] fs: cifs: move from the crypto cipher API to the new DES library interface Ard Biesheuvel
2019-08-22 5:56 ` [PATCH v5 00/30] crypto: DES/3DES cleanup Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190815090112.9377-27-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@linaro.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).