Commit 23508e11 authored by Herbert Xu's avatar Herbert Xu
Browse files

[CRYPTO] skcipher: Added geniv field 



This patch introduces the geniv field which indicates the default IV
generator for each algorithm.  It should point to a string that is not
freed as long as the algorithm is registered.

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

crypto/ablkcipher.c

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ static void crypto_ablkcipher_show(struct seq_file *m, struct crypto_alg *alg) 
	seq_printf(m, "min keysize  : %u\n", ablkcipher->min_keysize);

	seq_printf(m, "max keysize  : %u\n", ablkcipher->max_keysize);

	seq_printf(m, "ivsize       : %u\n", ablkcipher->ivsize);

	seq_printf(m, "geniv        : %s\n", ablkcipher->geniv ?: "<default>");

}



const struct crypto_type crypto_ablkcipher_type = {
@@ -142,6 +143,7 @@ static void crypto_givcipher_show(struct seq_file *m, struct crypto_alg *alg) 
	seq_printf(m, "min keysize  : %u\n", ablkcipher->min_keysize);

	seq_printf(m, "max keysize  : %u\n", ablkcipher->max_keysize);

	seq_printf(m, "ivsize       : %u\n", ablkcipher->ivsize);

	seq_printf(m, "geniv        : %s\n", ablkcipher->geniv ?: "<built-in>");

}



const struct crypto_type crypto_givcipher_type = {

crypto/blkcipher.c

+2 −0
Original line number Diff line number Diff line
@@ -496,6 +496,8 @@ static void crypto_blkcipher_show(struct seq_file *m, struct crypto_alg *alg) 
	seq_printf(m, "min keysize  : %u\n", alg->cra_blkcipher.min_keysize);

	seq_printf(m, "max keysize  : %u\n", alg->cra_blkcipher.max_keysize);

	seq_printf(m, "ivsize       : %u\n", alg->cra_blkcipher.ivsize);

	seq_printf(m, "geniv        : %s\n", alg->cra_blkcipher.geniv ?:

					     "<default>");

}



const struct crypto_type crypto_blkcipher_type = {

include/linux/crypto.h

+4 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ struct ablkcipher_alg { 
	int (*givencrypt)(struct skcipher_givcrypt_request *req);

	int (*givdecrypt)(struct skcipher_givcrypt_request *req);



	const char *geniv;



	unsigned int min_keysize;

	unsigned int max_keysize;

	unsigned int ivsize;
@@ -209,6 +211,8 @@ struct blkcipher_alg { 
		       struct scatterlist *dst, struct scatterlist *src,

		       unsigned int nbytes);



	const char *geniv;



	unsigned int min_keysize;

	unsigned int max_keysize;

	unsigned int ivsize;