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

Commit d912bb76 authored by Nikos Mavrogiannopoulos's avatar Nikos Mavrogiannopoulos Committed by Herbert Xu
Browse files

crypto: Add CRYPTO_ALG_KERN_DRIVER_ONLY flag 



The added CRYPTO_ALG_KERN_DRIVER_ONLY indicates whether a cipher
is only available via a kernel driver. If the cipher implementation
might be available by using an instruction set or by porting the
kernel code, then it must not be set.

Signed-off-by: default avatarNikos Mavrogiannopoulos <nmav@gnutls.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d0b03c5f

drivers/crypto/caam/caamalg.c

+2 −1
Original line number Diff line number Diff line
@@ -2205,7 +2205,8 @@ static struct caam_crypto_alg *caam_alg_alloc(struct device *ctrldev, 
	alg->cra_blocksize = template->blocksize;

	alg->cra_alignmask = 0;

	alg->cra_ctxsize = sizeof(struct caam_ctx);

	alg->cra_flags = CRYPTO_ALG_ASYNC | template->type;

	alg->cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY |

			 template->type;

	switch (template->type) {

	case CRYPTO_ALG_TYPE_ABLKCIPHER:

		alg->cra_type = &crypto_ablkcipher_type;

drivers/crypto/geode-aes.c

+4 −2
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ static struct crypto_alg geode_cbc_alg = { 
	.cra_driver_name	=	"cbc-aes-geode",

	.cra_priority		=	400,

	.cra_flags			=	CRYPTO_ALG_TYPE_BLKCIPHER |

						CRYPTO_ALG_KERN_DRIVER_ONLY |

						CRYPTO_ALG_NEED_FALLBACK,

	.cra_init			=	fallback_init_blk,

	.cra_exit			=	fallback_exit_blk,
@@ -479,6 +480,7 @@ static struct crypto_alg geode_ecb_alg = { 
	.cra_driver_name	=	"ecb-aes-geode",

	.cra_priority		=	400,

	.cra_flags			=	CRYPTO_ALG_TYPE_BLKCIPHER |

						CRYPTO_ALG_KERN_DRIVER_ONLY |

						CRYPTO_ALG_NEED_FALLBACK,

	.cra_init			=	fallback_init_blk,

	.cra_exit			=	fallback_exit_blk,

drivers/crypto/hifn_795x.c

+2 −1
Original line number Diff line number Diff line
@@ -2494,7 +2494,8 @@ static int hifn_alg_alloc(struct hifn_device *dev, struct hifn_alg_template *t) 
		 t->drv_name, dev->name);



	alg->alg.cra_priority = 300;

	alg->alg.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC;

	alg->alg.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |

				CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC;

	alg->alg.cra_blocksize = t->bsize;

	alg->alg.cra_ctxsize = sizeof(struct hifn_context);

	alg->alg.cra_alignmask = 0;

drivers/crypto/ixp4xx_crypto.c

+2 −0
Original line number Diff line number Diff line
@@ -1449,6 +1449,7 @@ static int __init ixp_module_init(void) 
			/* block ciphers */

			cra->cra_type = &crypto_ablkcipher_type;

			cra->cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |

					 CRYPTO_ALG_KERN_DRIVER_ONLY |

					 CRYPTO_ALG_ASYNC;

			if (!cra->cra_ablkcipher.setkey)

				cra->cra_ablkcipher.setkey = ablk_setkey;
@@ -1461,6 +1462,7 @@ static int __init ixp_module_init(void) 
			/* authenc */

			cra->cra_type = &crypto_aead_type;

			cra->cra_flags = CRYPTO_ALG_TYPE_AEAD |

					 CRYPTO_ALG_KERN_DRIVER_ONLY |

					 CRYPTO_ALG_ASYNC;

			cra->cra_aead.setkey = aead_setkey;

			cra->cra_aead.setauthsize = aead_setauthsize;

drivers/crypto/mv_cesa.c

+8 −4
Original line number Diff line number Diff line
@@ -898,7 +898,8 @@ struct crypto_alg mv_aes_alg_ecb = { 
	.cra_name		= "ecb(aes)",

	.cra_driver_name	= "mv-ecb-aes",

	.cra_priority	= 300,

	.cra_flags	= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,

	.cra_flags	= CRYPTO_ALG_TYPE_ABLKCIPHER |

			  CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,

	.cra_blocksize	= 16,

	.cra_ctxsize	= sizeof(struct mv_ctx),

	.cra_alignmask	= 0,
@@ -920,7 +921,8 @@ struct crypto_alg mv_aes_alg_cbc = { 
	.cra_name		= "cbc(aes)",

	.cra_driver_name	= "mv-cbc-aes",

	.cra_priority	= 300,

	.cra_flags	= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,

	.cra_flags	= CRYPTO_ALG_TYPE_ABLKCIPHER |

			  CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,

	.cra_blocksize	= AES_BLOCK_SIZE,

	.cra_ctxsize	= sizeof(struct mv_ctx),

	.cra_alignmask	= 0,
@@ -952,7 +954,8 @@ struct ahash_alg mv_sha1_alg = { 
			  .cra_driver_name = "mv-sha1",

			  .cra_priority = 300,

			  .cra_flags =

			  CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK,

			  CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY |

			  CRYPTO_ALG_NEED_FALLBACK,

			  .cra_blocksize = SHA1_BLOCK_SIZE,

			  .cra_ctxsize = sizeof(struct mv_tfm_hash_ctx),

			  .cra_init = mv_cra_hash_sha1_init,
@@ -976,7 +979,8 @@ struct ahash_alg mv_hmac_sha1_alg = { 
			  .cra_driver_name = "mv-hmac-sha1",

			  .cra_priority = 300,

			  .cra_flags =

			  CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK,

			  CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY |

			  CRYPTO_ALG_NEED_FALLBACK,

			  .cra_blocksize = SHA1_BLOCK_SIZE,

			  .cra_ctxsize = sizeof(struct mv_tfm_hash_ctx),

			  .cra_init = mv_cra_hash_hmac_sha1_init,