Skip to content

Commit

Permalink
crypto: des - remove unused function
Browse files Browse the repository at this point in the history
Remove the old DES3 verification functions that are no longer used.

Signed-off-by: Ard Biesheuvel <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
  • Loading branch information
Ard Biesheuvel authored and herbertx committed Aug 22, 2019
1 parent 4fd4be0 commit 6b5c481
Showing 1 changed file with 0 additions and 41 deletions.
41 changes: 0 additions & 41 deletions include/crypto/des.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 6b5c481

Please sign in to comment.