Commit b286e003 authored by Kim Phillips's avatar Kim Phillips Committed by Herbert Xu
Browse files

crypto: talitos - consolidate common cra_* assignments 



the entry points and geniv definitions for all aead,
ablkcipher, and hash algorithms are all common; move them to a
single assignment in talitos_alg_alloc().

This assumes it's ok to assign a setkey() on non-hmac algs.

Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d4cd3283

drivers/crypto/talitos.c

+17 −146
Original line number Diff line number Diff line
@@ -1910,12 +1910,6 @@ static struct talitos_alg_template driver_algs[] = { 
			.cra_blocksize = AES_BLOCK_SIZE,

			.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,

			.cra_aead = {

				.setkey = aead_setkey,

				.setauthsize = aead_setauthsize,

				.encrypt = aead_encrypt,

				.decrypt = aead_decrypt,

				.givencrypt = aead_givencrypt,

				.geniv = "<built-in>",

				.ivsize = AES_BLOCK_SIZE,

				.maxauthsize = SHA1_DIGEST_SIZE,

			}
@@ -1935,12 +1929,6 @@ static struct talitos_alg_template driver_algs[] = { 
			.cra_blocksize = DES3_EDE_BLOCK_SIZE,

			.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,

			.cra_aead = {

				.setkey = aead_setkey,

				.setauthsize = aead_setauthsize,

				.encrypt = aead_encrypt,

				.decrypt = aead_decrypt,

				.givencrypt = aead_givencrypt,

				.geniv = "<built-in>",

				.ivsize = DES3_EDE_BLOCK_SIZE,

				.maxauthsize = SHA1_DIGEST_SIZE,

			}
@@ -1961,12 +1949,6 @@ static struct talitos_alg_template driver_algs[] = { 
			.cra_blocksize = AES_BLOCK_SIZE,

			.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,

			.cra_aead = {

				.setkey = aead_setkey,

				.setauthsize = aead_setauthsize,

				.encrypt = aead_encrypt,

				.decrypt = aead_decrypt,

				.givencrypt = aead_givencrypt,

				.geniv = "<built-in>",

				.ivsize = AES_BLOCK_SIZE,

				.maxauthsize = SHA224_DIGEST_SIZE,

			}
@@ -1986,12 +1968,6 @@ static struct talitos_alg_template driver_algs[] = { 
			.cra_blocksize = DES3_EDE_BLOCK_SIZE,

			.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,

			.cra_aead = {

				.setkey = aead_setkey,

				.setauthsize = aead_setauthsize,

				.encrypt = aead_encrypt,

				.decrypt = aead_decrypt,

				.givencrypt = aead_givencrypt,

				.geniv = "<built-in>",

				.ivsize = DES3_EDE_BLOCK_SIZE,

				.maxauthsize = SHA224_DIGEST_SIZE,

			}
@@ -2012,12 +1988,6 @@ static struct talitos_alg_template driver_algs[] = { 
			.cra_blocksize = AES_BLOCK_SIZE,

			.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,

			.cra_aead = {

				.setkey = aead_setkey,

				.setauthsize = aead_setauthsize,

				.encrypt = aead_encrypt,

				.decrypt = aead_decrypt,

				.givencrypt = aead_givencrypt,

				.geniv = "<built-in>",

				.ivsize = AES_BLOCK_SIZE,

				.maxauthsize = SHA256_DIGEST_SIZE,

			}
@@ -2037,12 +2007,6 @@ static struct talitos_alg_template driver_algs[] = { 
			.cra_blocksize = DES3_EDE_BLOCK_SIZE,

			.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,

			.cra_aead = {

				.setkey = aead_setkey,

				.setauthsize = aead_setauthsize,

				.encrypt = aead_encrypt,

				.decrypt = aead_decrypt,

				.givencrypt = aead_givencrypt,

				.geniv = "<built-in>",

				.ivsize = DES3_EDE_BLOCK_SIZE,

				.maxauthsize = SHA256_DIGEST_SIZE,

			}
@@ -2063,12 +2027,6 @@ static struct talitos_alg_template driver_algs[] = { 
			.cra_blocksize = AES_BLOCK_SIZE,

			.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,

			.cra_aead = {

				.setkey = aead_setkey,

				.setauthsize = aead_setauthsize,

				.encrypt = aead_encrypt,

				.decrypt = aead_decrypt,

				.givencrypt = aead_givencrypt,

				.geniv = "<built-in>",

				.ivsize = AES_BLOCK_SIZE,

				.maxauthsize = SHA384_DIGEST_SIZE,

			}
@@ -2088,12 +2046,6 @@ static struct talitos_alg_template driver_algs[] = { 
			.cra_blocksize = DES3_EDE_BLOCK_SIZE,

			.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,

			.cra_aead = {

				.setkey = aead_setkey,

				.setauthsize = aead_setauthsize,

				.encrypt = aead_encrypt,

				.decrypt = aead_decrypt,

				.givencrypt = aead_givencrypt,

				.geniv = "<built-in>",

				.ivsize = DES3_EDE_BLOCK_SIZE,

				.maxauthsize = SHA384_DIGEST_SIZE,

			}
@@ -2114,12 +2066,6 @@ static struct talitos_alg_template driver_algs[] = { 
			.cra_blocksize = AES_BLOCK_SIZE,

			.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,

			.cra_aead = {

				.setkey = aead_setkey,

				.setauthsize = aead_setauthsize,

				.encrypt = aead_encrypt,

				.decrypt = aead_decrypt,

				.givencrypt = aead_givencrypt,

				.geniv = "<built-in>",

				.ivsize = AES_BLOCK_SIZE,

				.maxauthsize = SHA512_DIGEST_SIZE,

			}
@@ -2139,12 +2085,6 @@ static struct talitos_alg_template driver_algs[] = { 
			.cra_blocksize = DES3_EDE_BLOCK_SIZE,

			.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,

			.cra_aead = {

				.setkey = aead_setkey,

				.setauthsize = aead_setauthsize,

				.encrypt = aead_encrypt,

				.decrypt = aead_decrypt,

				.givencrypt = aead_givencrypt,

				.geniv = "<built-in>",

				.ivsize = DES3_EDE_BLOCK_SIZE,

				.maxauthsize = SHA512_DIGEST_SIZE,

			}
@@ -2165,12 +2105,6 @@ static struct talitos_alg_template driver_algs[] = { 
			.cra_blocksize = AES_BLOCK_SIZE,

			.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,

			.cra_aead = {

				.setkey = aead_setkey,

				.setauthsize = aead_setauthsize,

				.encrypt = aead_encrypt,

				.decrypt = aead_decrypt,

				.givencrypt = aead_givencrypt,

				.geniv = "<built-in>",

				.ivsize = AES_BLOCK_SIZE,

				.maxauthsize = MD5_DIGEST_SIZE,

			}
@@ -2190,12 +2124,6 @@ static struct talitos_alg_template driver_algs[] = { 
			.cra_blocksize = DES3_EDE_BLOCK_SIZE,

			.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,

			.cra_aead = {

				.setkey = aead_setkey,

				.setauthsize = aead_setauthsize,

				.encrypt = aead_encrypt,

				.decrypt = aead_decrypt,

				.givencrypt = aead_givencrypt,

				.geniv = "<built-in>",

				.ivsize = DES3_EDE_BLOCK_SIZE,

				.maxauthsize = MD5_DIGEST_SIZE,

			}
@@ -2218,10 +2146,6 @@ static struct talitos_alg_template driver_algs[] = { 
			.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |

                                     CRYPTO_ALG_ASYNC,

			.cra_ablkcipher = {

				.setkey = ablkcipher_setkey,

				.encrypt = ablkcipher_encrypt,

				.decrypt = ablkcipher_decrypt,

				.geniv = "eseqiv",

				.min_keysize = AES_MIN_KEY_SIZE,

				.max_keysize = AES_MAX_KEY_SIZE,

				.ivsize = AES_BLOCK_SIZE,
@@ -2239,10 +2163,6 @@ static struct talitos_alg_template driver_algs[] = { 
			.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |

                                     CRYPTO_ALG_ASYNC,

			.cra_ablkcipher = {

				.setkey = ablkcipher_setkey,

				.encrypt = ablkcipher_encrypt,

				.decrypt = ablkcipher_decrypt,

				.geniv = "eseqiv",

				.min_keysize = DES3_EDE_KEY_SIZE,

				.max_keysize = DES3_EDE_KEY_SIZE,

				.ivsize = DES3_EDE_BLOCK_SIZE,
@@ -2256,11 +2176,6 @@ static struct talitos_alg_template driver_algs[] = { 
	/* AHASH algorithms. */

	{	.type = CRYPTO_ALG_TYPE_AHASH,

		.alg.hash = {

			.init = ahash_init,

			.update = ahash_update,

			.final = ahash_final,

			.finup = ahash_finup,

			.digest = ahash_digest,

			.halg.digestsize = MD5_DIGEST_SIZE,

			.halg.base = {

				.cra_name = "md5",
@@ -2276,11 +2191,6 @@ static struct talitos_alg_template driver_algs[] = { 
	},

	{	.type = CRYPTO_ALG_TYPE_AHASH,

		.alg.hash = {

			.init = ahash_init,

			.update = ahash_update,

			.final = ahash_final,

			.finup = ahash_finup,

			.digest = ahash_digest,

			.halg.digestsize = SHA1_DIGEST_SIZE,

			.halg.base = {

				.cra_name = "sha1",
@@ -2296,11 +2206,6 @@ static struct talitos_alg_template driver_algs[] = { 
	},

	{	.type = CRYPTO_ALG_TYPE_AHASH,

		.alg.hash = {

			.init = ahash_init,

			.update = ahash_update,

			.final = ahash_final,

			.finup = ahash_finup,

			.digest = ahash_digest,

			.halg.digestsize = SHA224_DIGEST_SIZE,

			.halg.base = {

				.cra_name = "sha224",
@@ -2316,11 +2221,6 @@ static struct talitos_alg_template driver_algs[] = { 
	},

	{	.type = CRYPTO_ALG_TYPE_AHASH,

		.alg.hash = {

			.init = ahash_init,

			.update = ahash_update,

			.final = ahash_final,

			.finup = ahash_finup,

			.digest = ahash_digest,

			.halg.digestsize = SHA256_DIGEST_SIZE,

			.halg.base = {

				.cra_name = "sha256",
@@ -2336,11 +2236,6 @@ static struct talitos_alg_template driver_algs[] = { 
	},

	{	.type = CRYPTO_ALG_TYPE_AHASH,

		.alg.hash = {

			.init = ahash_init,

			.update = ahash_update,

			.final = ahash_final,

			.finup = ahash_finup,

			.digest = ahash_digest,

			.halg.digestsize = SHA384_DIGEST_SIZE,

			.halg.base = {

				.cra_name = "sha384",
@@ -2356,11 +2251,6 @@ static struct talitos_alg_template driver_algs[] = { 
	},

	{	.type = CRYPTO_ALG_TYPE_AHASH,

		.alg.hash = {

			.init = ahash_init,

			.update = ahash_update,

			.final = ahash_final,

			.finup = ahash_finup,

			.digest = ahash_digest,

			.halg.digestsize = SHA512_DIGEST_SIZE,

			.halg.base = {

				.cra_name = "sha512",
@@ -2376,12 +2266,6 @@ static struct talitos_alg_template driver_algs[] = { 
	},

	{	.type = CRYPTO_ALG_TYPE_AHASH,

		.alg.hash = {

			.init = ahash_init,

			.update = ahash_update,

			.final = ahash_final,

			.finup = ahash_finup,

			.digest = ahash_digest,

			.setkey = ahash_setkey,

			.halg.digestsize = MD5_DIGEST_SIZE,

			.halg.base = {

				.cra_name = "hmac(md5)",
@@ -2397,12 +2281,6 @@ static struct talitos_alg_template driver_algs[] = { 
	},

	{	.type = CRYPTO_ALG_TYPE_AHASH,

		.alg.hash = {

			.init = ahash_init,

			.update = ahash_update,

			.final = ahash_final,

			.finup = ahash_finup,

			.digest = ahash_digest,

			.setkey = ahash_setkey,

			.halg.digestsize = SHA1_DIGEST_SIZE,

			.halg.base = {

				.cra_name = "hmac(sha1)",
@@ -2418,12 +2296,6 @@ static struct talitos_alg_template driver_algs[] = { 
	},

	{	.type = CRYPTO_ALG_TYPE_AHASH,

		.alg.hash = {

			.init = ahash_init,

			.update = ahash_update,

			.final = ahash_final,

			.finup = ahash_finup,

			.digest = ahash_digest,

			.setkey = ahash_setkey,

			.halg.digestsize = SHA224_DIGEST_SIZE,

			.halg.base = {

				.cra_name = "hmac(sha224)",
@@ -2439,12 +2311,6 @@ static struct talitos_alg_template driver_algs[] = { 
	},

	{	.type = CRYPTO_ALG_TYPE_AHASH,

		.alg.hash = {

			.init = ahash_init,

			.update = ahash_update,

			.final = ahash_final,

			.finup = ahash_finup,

			.digest = ahash_digest,

			.setkey = ahash_setkey,

			.halg.digestsize = SHA256_DIGEST_SIZE,

			.halg.base = {

				.cra_name = "hmac(sha256)",
@@ -2460,12 +2326,6 @@ static struct talitos_alg_template driver_algs[] = { 
	},

	{	.type = CRYPTO_ALG_TYPE_AHASH,

		.alg.hash = {

			.init = ahash_init,

			.update = ahash_update,

			.final = ahash_final,

			.finup = ahash_finup,

			.digest = ahash_digest,

			.setkey = ahash_setkey,

			.halg.digestsize = SHA384_DIGEST_SIZE,

			.halg.base = {

				.cra_name = "hmac(sha384)",
@@ -2481,12 +2341,6 @@ static struct talitos_alg_template driver_algs[] = { 
	},

	{	.type = CRYPTO_ALG_TYPE_AHASH,

		.alg.hash = {

			.init = ahash_init,

			.update = ahash_update,

			.final = ahash_final,

			.finup = ahash_finup,

			.digest = ahash_digest,

			.setkey = ahash_setkey,

			.halg.digestsize = SHA512_DIGEST_SIZE,

			.halg.base = {

				.cra_name = "hmac(sha512)",
@@ -2652,16 +2506,33 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev, 
		alg = &t_alg->algt.alg.crypto;

		alg->cra_init = talitos_cra_init;

		alg->cra_type = &crypto_ablkcipher_type;

		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.crypto;

		alg->cra_init = talitos_cra_init_aead;

		alg->cra_type = &crypto_aead_type;

		alg->cra_aead.setkey = aead_setkey;

		alg->cra_aead.setauthsize = aead_setauthsize;

		alg->cra_aead.encrypt = aead_encrypt;

		alg->cra_aead.decrypt = aead_decrypt;

		alg->cra_aead.givencrypt = aead_givencrypt;

		alg->cra_aead.geniv = "<built-in>";

		break;

	case CRYPTO_ALG_TYPE_AHASH:

		alg = &t_alg->algt.alg.hash.halg.base;

		alg->cra_init = talitos_cra_init_ahash;

		alg->cra_type = &crypto_ahash_type;

		t_alg->algt.alg.hash.init = ahash_init;

		t_alg->algt.alg.hash.update = ahash_update;

		t_alg->algt.alg.hash.final = ahash_final;

		t_alg->algt.alg.hash.finup = ahash_finup;

		t_alg->algt.alg.hash.digest = ahash_digest;

		t_alg->algt.alg.hash.setkey = ahash_setkey;



		if (!(priv->features & TALITOS_FTR_HMAC_OK) &&

		    !strncmp(alg->cra_name, "hmac", 4)) {

			kfree(t_alg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE