crypto: cpt/des - switch to new verification routines (0e1cbe97) · Commits · 戴 / test

drivers/crypto/cavium/cpt/cptvf_algs.c

+5 −21

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		#include <crypto/aes.h>
		#include <crypto/algapi.h>
		#include <crypto/authenc.h>
		#include <crypto/des.h>
		#include <crypto/internal/des.h>
		#include <crypto/xts.h>
		#include <linux/crypto.h>
		#include <linux/err.h>
		@@ -322,31 +322,15 @@ static int cvm_cfb_aes_setkey(struct crypto_ablkcipher cipher, const u8 key,
		static int cvm_cbc_des3_setkey(struct crypto_ablkcipher cipher, const u8 key,
		u32 keylen)
		{
		u32 flags = crypto_ablkcipher_get_flags(cipher);
		int err;

		err = __des3_verify_key(&flags, key);
		if (unlikely(err)) {
		crypto_ablkcipher_set_flags(cipher, flags);
		return err;
		}

		return cvm_setkey(cipher, key, keylen, DES3_CBC);
		return verify_ablkcipher_des3_key(cipher, key) ?:
		cvm_setkey(cipher, key, keylen, DES3_CBC);
		}

		static int cvm_ecb_des3_setkey(struct crypto_ablkcipher cipher, const u8 key,
		u32 keylen)
		{
		u32 flags = crypto_ablkcipher_get_flags(cipher);
		int err;

		err = __des3_verify_key(&flags, key);
		if (unlikely(err)) {
		crypto_ablkcipher_set_flags(cipher, flags);
		return err;
		}

		return cvm_setkey(cipher, key, keylen, DES3_ECB);
		return verify_ablkcipher_des3_key(cipher, key) ?:
		cvm_setkey(cipher, key, keylen, DES3_ECB);
		}

		static int cvm_enc_dec_init(struct crypto_tfm *tfm)