mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 09:50:04 +00:00
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: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
parent
69d3150cfc
commit
0024dc5371
1 changed files with 0 additions and 37 deletions
|
@ -40,10 +40,6 @@
|
||||||
#include <linux/workqueue.h>
|
#include <linux/workqueue.h>
|
||||||
#include <linux/spinlock.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)
|
#if defined(CONFIG_CRYPTO_PCBC) || defined(CONFIG_CRYPTO_PCBC_MODULE)
|
||||||
#define HAS_PCBC
|
#define HAS_PCBC
|
||||||
#endif
|
#endif
|
||||||
|
@ -395,12 +391,6 @@ static int ablk_ctr_init(struct crypto_tfm *tfm)
|
||||||
return ablk_init_common(tfm, "__driver-ctr-aes-aesni");
|
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
|
#endif
|
||||||
|
|
||||||
#ifdef HAS_PCBC
|
#ifdef HAS_PCBC
|
||||||
|
@ -1158,33 +1148,6 @@ static struct crypto_alg aesni_algs[] = { {
|
||||||
.maxauthsize = 16,
|
.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
|
#endif
|
||||||
#ifdef HAS_PCBC
|
#ifdef HAS_PCBC
|
||||||
}, {
|
}, {
|
||||||
|
|
Loading…
Reference in a new issue