mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
crypto: skcipher - remove remnants of internal IV generators
Remove dead code related to internal IV generators, which are no longer used since they've been replaced with the "seqiv" and "echainiv" templates. The removed code includes: - The "givcipher" (GIVCIPHER) algorithm type. No algorithms are registered with this type anymore, so it's unneeded. - The "const char *geniv" member of aead_alg, ablkcipher_alg, and blkcipher_alg. A few algorithms still set this, but it isn't used anymore except to show via /proc/crypto and CRYPTO_MSG_GETALG. Just hardcode "<default>" or "<none>" in those cases. - The 'skcipher_givcrypt_request' structure, which is never used. Signed-off-by: Eric Biggers <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
This commit is contained in:
parent
dec5d0db0d
commit
c79b411eaa
18 changed files with 17 additions and 182 deletions
|
|
@ -3868,7 +3868,6 @@ static struct iproc_alg_s driver_algs[] = {
|
|||
.cra_driver_name = "ctr-aes-iproc",
|
||||
.cra_blocksize = AES_BLOCK_SIZE,
|
||||
.cra_ablkcipher = {
|
||||
/* .geniv = "chainiv", */
|
||||
.min_keysize = AES_MIN_KEY_SIZE,
|
||||
.max_keysize = AES_MAX_KEY_SIZE,
|
||||
.ivsize = AES_BLOCK_SIZE,
|
||||
|
|
|
|||
|
|
@ -3816,7 +3816,6 @@ static struct chcr_alg_template driver_algs[] = {
|
|||
.setkey = chcr_aes_rfc3686_setkey,
|
||||
.encrypt = chcr_aes_encrypt,
|
||||
.decrypt = chcr_aes_decrypt,
|
||||
.geniv = "seqiv",
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1194,7 +1194,6 @@ static struct ixp_alg ixp4xx_algos[] = {
|
|||
.min_keysize = DES_KEY_SIZE,
|
||||
.max_keysize = DES_KEY_SIZE,
|
||||
.ivsize = DES_BLOCK_SIZE,
|
||||
.geniv = "eseqiv",
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -1221,7 +1220,6 @@ static struct ixp_alg ixp4xx_algos[] = {
|
|||
.min_keysize = DES3_EDE_KEY_SIZE,
|
||||
.max_keysize = DES3_EDE_KEY_SIZE,
|
||||
.ivsize = DES3_EDE_BLOCK_SIZE,
|
||||
.geniv = "eseqiv",
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -1247,7 +1245,6 @@ static struct ixp_alg ixp4xx_algos[] = {
|
|||
.min_keysize = AES_MIN_KEY_SIZE,
|
||||
.max_keysize = AES_MAX_KEY_SIZE,
|
||||
.ivsize = AES_BLOCK_SIZE,
|
||||
.geniv = "eseqiv",
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -1273,7 +1270,6 @@ static struct ixp_alg ixp4xx_algos[] = {
|
|||
.min_keysize = AES_MIN_KEY_SIZE,
|
||||
.max_keysize = AES_MAX_KEY_SIZE,
|
||||
.ivsize = AES_BLOCK_SIZE,
|
||||
.geniv = "eseqiv",
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -1287,7 +1283,6 @@ static struct ixp_alg ixp4xx_algos[] = {
|
|||
.min_keysize = AES_MIN_KEY_SIZE,
|
||||
.max_keysize = AES_MAX_KEY_SIZE,
|
||||
.ivsize = AES_BLOCK_SIZE,
|
||||
.geniv = "eseqiv",
|
||||
.setkey = ablk_rfc3686_setkey,
|
||||
.encrypt = ablk_rfc3686_crypt,
|
||||
.decrypt = ablk_rfc3686_crypt }
|
||||
|
|
|
|||
|
|
@ -159,7 +159,6 @@ struct crypto_alg nx_ctr3686_aes_alg = {
|
|||
.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,
|
||||
.geniv = "seqiv",
|
||||
.setkey = ctr3686_aes_nx_set_key,
|
||||
.encrypt = ctr3686_aes_nx_crypt,
|
||||
.decrypt = ctr3686_aes_nx_crypt,
|
||||
|
|
|
|||
|
|
@ -749,7 +749,6 @@ static struct crypto_alg algs_ctr[] = {
|
|||
.cra_u.ablkcipher = {
|
||||
.min_keysize = AES_MIN_KEY_SIZE,
|
||||
.max_keysize = AES_MAX_KEY_SIZE,
|
||||
.geniv = "eseqiv",
|
||||
.ivsize = AES_BLOCK_SIZE,
|
||||
.setkey = omap_aes_setkey,
|
||||
.encrypt = omap_aes_ctr_encrypt,
|
||||
|
|
|
|||
|
|
@ -1585,8 +1585,7 @@ static struct spacc_alg l2_engine_algs[] = {
|
|||
.cra_name = "f8(kasumi)",
|
||||
.cra_driver_name = "f8-kasumi-picoxcell",
|
||||
.cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
|
||||
.cra_flags = CRYPTO_ALG_TYPE_GIVCIPHER |
|
||||
CRYPTO_ALG_ASYNC |
|
||||
.cra_flags = CRYPTO_ALG_ASYNC |
|
||||
CRYPTO_ALG_KERN_DRIVER_ONLY,
|
||||
.cra_blocksize = 8,
|
||||
.cra_ctxsize = sizeof(struct spacc_ablk_ctx),
|
||||
|
|
|
|||
|
|
@ -3155,7 +3155,6 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev,
|
|||
alg->cra_ablkcipher.setkey = ablkcipher_setkey;
|
||||
alg->cra_ablkcipher.encrypt = ablkcipher_encrypt;
|
||||
alg->cra_ablkcipher.decrypt = ablkcipher_decrypt;
|
||||
alg->cra_ablkcipher.geniv = "eseqiv";
|
||||
break;
|
||||
case CRYPTO_ALG_TYPE_AEAD:
|
||||
alg = &t_alg->algt.alg.aead.base;
|
||||
|
|
|
|||
Loading…
Reference in a new issue