Commit a9cdf13e authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: crypto4xx - Remove cfb and ofb 



Remove the unused CFB/OFB implementation.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 05bd1e2a

drivers/crypto/amcc/crypto4xx_alg.c

+0 −14
Original line number Diff line number Diff line
@@ -181,13 +181,6 @@ int crypto4xx_setkey_aes_cbc(struct crypto_skcipher *cipher, 
				    CRYPTO_FEEDBACK_MODE_NO_FB);

}



int crypto4xx_setkey_aes_cfb(struct crypto_skcipher *cipher,

			     const u8 *key, unsigned int keylen)

{

	return crypto4xx_setkey_aes(cipher, key, keylen, CRYPTO_MODE_CFB,

				    CRYPTO_FEEDBACK_MODE_128BIT_CFB);

}



int crypto4xx_setkey_aes_ecb(struct crypto_skcipher *cipher,

			     const u8 *key, unsigned int keylen)

{
@@ -195,13 +188,6 @@ int crypto4xx_setkey_aes_ecb(struct crypto_skcipher *cipher, 
				    CRYPTO_FEEDBACK_MODE_NO_FB);

}



int crypto4xx_setkey_aes_ofb(struct crypto_skcipher *cipher,

			     const u8 *key, unsigned int keylen)

{

	return crypto4xx_setkey_aes(cipher, key, keylen, CRYPTO_MODE_OFB,

				    CRYPTO_FEEDBACK_MODE_64BIT_OFB);

}



int crypto4xx_setkey_rfc3686(struct crypto_skcipher *cipher,

			     const u8 *key, unsigned int keylen)

{

drivers/crypto/amcc/crypto4xx_core.c

+0 −40
Original line number Diff line number Diff line
@@ -1209,26 +1209,6 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = { 
		.init = crypto4xx_sk_init,

		.exit = crypto4xx_sk_exit,

	} },

	{ .type = CRYPTO_ALG_TYPE_SKCIPHER, .u.cipher = {

		.base = {

			.cra_name = "cfb(aes)",

			.cra_driver_name = "cfb-aes-ppc4xx",

			.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,

			.cra_flags = CRYPTO_ALG_ASYNC |

				CRYPTO_ALG_KERN_DRIVER_ONLY,

			.cra_blocksize = 1,

			.cra_ctxsize = sizeof(struct crypto4xx_ctx),

			.cra_module = THIS_MODULE,

		},

		.min_keysize = AES_MIN_KEY_SIZE,

		.max_keysize = AES_MAX_KEY_SIZE,

		.ivsize	= AES_IV_SIZE,

		.setkey	= crypto4xx_setkey_aes_cfb,

		.encrypt = crypto4xx_encrypt_iv_stream,

		.decrypt = crypto4xx_decrypt_iv_stream,

		.init = crypto4xx_sk_init,

		.exit = crypto4xx_sk_exit,

	} },

	{ .type = CRYPTO_ALG_TYPE_SKCIPHER, .u.cipher = {

		.base = {

			.cra_name = "ctr(aes)",
@@ -1289,26 +1269,6 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = { 
		.init = crypto4xx_sk_init,

		.exit = crypto4xx_sk_exit,

	} },

	{ .type = CRYPTO_ALG_TYPE_SKCIPHER, .u.cipher = {

		.base = {

			.cra_name = "ofb(aes)",

			.cra_driver_name = "ofb-aes-ppc4xx",

			.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,

			.cra_flags = CRYPTO_ALG_ASYNC |

				CRYPTO_ALG_KERN_DRIVER_ONLY,

			.cra_blocksize = 1,

			.cra_ctxsize = sizeof(struct crypto4xx_ctx),

			.cra_module = THIS_MODULE,

		},

		.min_keysize = AES_MIN_KEY_SIZE,

		.max_keysize = AES_MAX_KEY_SIZE,

		.ivsize	= AES_IV_SIZE,

		.setkey	= crypto4xx_setkey_aes_ofb,

		.encrypt = crypto4xx_encrypt_iv_stream,

		.decrypt = crypto4xx_decrypt_iv_stream,

		.init = crypto4xx_sk_init,

		.exit = crypto4xx_sk_exit,

	} },



	/* AEAD */

	{ .type = CRYPTO_ALG_TYPE_AEAD, .u.aead = {

drivers/crypto/amcc/crypto4xx_core.h

+0 −4
Original line number Diff line number Diff line
@@ -162,14 +162,10 @@ int crypto4xx_build_pd(struct crypto_async_request *req, 
		       struct scatterlist *dst_tmp);

int crypto4xx_setkey_aes_cbc(struct crypto_skcipher *cipher,

			     const u8 *key, unsigned int keylen);

int crypto4xx_setkey_aes_cfb(struct crypto_skcipher *cipher,

			     const u8 *key, unsigned int keylen);

int crypto4xx_setkey_aes_ctr(struct crypto_skcipher *cipher,

			     const u8 *key, unsigned int keylen);

int crypto4xx_setkey_aes_ecb(struct crypto_skcipher *cipher,

			     const u8 *key, unsigned int keylen);

int crypto4xx_setkey_aes_ofb(struct crypto_skcipher *cipher,

			     const u8 *key, unsigned int keylen);

int crypto4xx_setkey_rfc3686(struct crypto_skcipher *cipher,

			     const u8 *key, unsigned int keylen);

int crypto4xx_encrypt_ctr(struct skcipher_request *req);