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

Commit 50496a1f authored by Steffen Klassert's avatar Steffen Klassert Committed by Herbert Xu
Browse files

crypto: Add userspace report for blkcipher type algorithms 



Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6238cbae

crypto/blkcipher.c

+25 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include <linux/seq_file.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/cryptouser.h>

#include <net/netlink.h>



#include "internal.h"
@@ -492,6 +494,28 @@ static int crypto_init_blkcipher_ops(struct crypto_tfm *tfm, u32 type, u32 mask) 
		return crypto_init_blkcipher_ops_async(tfm);

}



static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)

{

	struct crypto_report_blkcipher rblkcipher;



	snprintf(rblkcipher.type, CRYPTO_MAX_ALG_NAME, "%s", "blkcipher");

	snprintf(rblkcipher.geniv, CRYPTO_MAX_ALG_NAME, "%s",

		 alg->cra_blkcipher.geniv ?: "<default>");



	rblkcipher.blocksize = alg->cra_blocksize;

	rblkcipher.min_keysize = alg->cra_blkcipher.min_keysize;

	rblkcipher.max_keysize = alg->cra_blkcipher.max_keysize;

	rblkcipher.ivsize = alg->cra_blkcipher.ivsize;



	NLA_PUT(skb, CRYPTOCFGA_REPORT_BLKCIPHER,

		sizeof(struct crypto_report_blkcipher), &rblkcipher);



	return 0;



nla_put_failure:

	return -EMSGSIZE;

}



static void crypto_blkcipher_show(struct seq_file *m, struct crypto_alg *alg)

	__attribute__ ((unused));

static void crypto_blkcipher_show(struct seq_file *m, struct crypto_alg *alg)
@@ -511,6 +535,7 @@ const struct crypto_type crypto_blkcipher_type = { 
#ifdef CONFIG_PROC_FS

	.show = crypto_blkcipher_show,

#endif

	.report = crypto_blkcipher_report,

};

EXPORT_SYMBOL_GPL(crypto_blkcipher_type);

include/linux/cryptouser.h

+10 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ enum crypto_attr_type_t { 
	CRYPTOCFGA_PRIORITY_VAL,	/* __u32 */

	CRYPTOCFGA_REPORT_LARVAL,	/* struct crypto_report_larval */

	CRYPTOCFGA_REPORT_HASH,		/* struct crypto_report_hash */

	CRYPTOCFGA_REPORT_BLKCIPHER,	/* struct crypto_report_blkcipher */

	__CRYPTOCFGA_MAX



#define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1)
@@ -62,3 +63,12 @@ struct crypto_report_hash { 
	unsigned int blocksize;

	unsigned int digestsize;

};



struct crypto_report_blkcipher {

	char type[CRYPTO_MAX_NAME];

	char geniv[CRYPTO_MAX_NAME];

	unsigned int blocksize;

	unsigned int min_keysize;

	unsigned int max_keysize;

	unsigned int ivsize;

};