Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0024dc53 authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by Steffen Klassert
Browse files

crypto: aesni-intel - remove rfc3686(ctr(aes)), utilize rfc3686 from ctr-module instead 



rfc3686 in CTR module is now able of using asynchronous ctr(aes) from
aesni-intel, so rfc3686(ctr(aes)) in aesni-intel is no longer needed.

Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 69d3150c

arch/x86/crypto/aesni-intel_glue.c

+0 −37
Original line number Diff line number Diff line
@@ -40,10 +40,6 @@ 
#include <linux/workqueue.h>

#include <linux/spinlock.h>



#if defined(CONFIG_CRYPTO_CTR) || defined(CONFIG_CRYPTO_CTR_MODULE)

#define HAS_CTR

#endif



#if defined(CONFIG_CRYPTO_PCBC) || defined(CONFIG_CRYPTO_PCBC_MODULE)

#define HAS_PCBC

#endif
@@ -395,12 +391,6 @@ static int ablk_ctr_init(struct crypto_tfm *tfm) 
	return ablk_init_common(tfm, "__driver-ctr-aes-aesni");

}



#ifdef HAS_CTR

static int ablk_rfc3686_ctr_init(struct crypto_tfm *tfm)

{

	return ablk_init_common(tfm, "rfc3686(__driver-ctr-aes-aesni)");

}

#endif

#endif



#ifdef HAS_PCBC
@@ -1158,33 +1148,6 @@ static struct crypto_alg aesni_algs[] = { { 
			.maxauthsize	= 16,

		},

	},

#ifdef HAS_CTR

}, {

	.cra_name		= "rfc3686(ctr(aes))",

	.cra_driver_name	= "rfc3686-ctr-aes-aesni",

	.cra_priority		= 400,

	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,

	.cra_blocksize		= 1,

	.cra_ctxsize		= sizeof(struct async_helper_ctx),

	.cra_alignmask		= 0,

	.cra_type		= &crypto_ablkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_init		= ablk_rfc3686_ctr_init,

	.cra_exit		= ablk_exit,

	.cra_u = {

		.ablkcipher = {

			.min_keysize = AES_MIN_KEY_SIZE +

				       CTR_RFC3686_NONCE_SIZE,

			.max_keysize = AES_MAX_KEY_SIZE +

				       CTR_RFC3686_NONCE_SIZE,

			.ivsize	     = CTR_RFC3686_IV_SIZE,

			.setkey	     = ablk_set_key,

			.encrypt     = ablk_encrypt,

			.decrypt     = ablk_decrypt,

			.geniv	     = "seqiv",

		},

	},

#endif

#endif

#ifdef HAS_PCBC

}, {