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

Commit 6ad414fe authored by Steffen Klassert's avatar Steffen Klassert Committed by Herbert Xu
Browse files

crypto: Add userspace report for aead type algorithms 



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

crypto/aead.c

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

#include <linux/slab.h>

#include <linux/seq_file.h>

#include <linux/cryptouser.h>

#include <net/netlink.h>



#include "internal.h"
@@ -109,6 +111,28 @@ static int crypto_init_aead_ops(struct crypto_tfm *tfm, u32 type, u32 mask) 
	return 0;

}



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

{

	struct crypto_report_aead raead;

	struct aead_alg *aead = &alg->cra_aead;



	snprintf(raead.type, CRYPTO_MAX_ALG_NAME, "%s", "aead");

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

		 aead->geniv ?: "<built-in>");



	raead.blocksize = alg->cra_blocksize;

	raead.maxauthsize = aead->maxauthsize;

	raead.ivsize = aead->ivsize;



	NLA_PUT(skb, CRYPTOCFGA_REPORT_AEAD,

		sizeof(struct crypto_report_aead), &raead);



	return 0;



nla_put_failure:

	return -EMSGSIZE;

}



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

	__attribute__ ((unused));

static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg)
@@ -130,6 +154,7 @@ const struct crypto_type crypto_aead_type = { 
#ifdef CONFIG_PROC_FS

	.show = crypto_aead_show,

#endif

	.report = crypto_aead_report,

};

EXPORT_SYMBOL_GPL(crypto_aead_type);

include/linux/cryptouser.h

+9 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ enum crypto_attr_type_t { 
	CRYPTOCFGA_REPORT_LARVAL,	/* struct crypto_report_larval */

	CRYPTOCFGA_REPORT_HASH,		/* struct crypto_report_hash */

	CRYPTOCFGA_REPORT_BLKCIPHER,	/* struct crypto_report_blkcipher */

	CRYPTOCFGA_REPORT_AEAD,		/* struct crypto_report_aead */

	__CRYPTOCFGA_MAX



#define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1)
@@ -72,3 +73,11 @@ struct crypto_report_blkcipher { 
	unsigned int max_keysize;

	unsigned int ivsize;

};



struct crypto_report_aead {

	char type[CRYPTO_MAX_NAME];

	char geniv[CRYPTO_MAX_NAME];

	unsigned int blocksize;

	unsigned int maxauthsize;

	unsigned int ivsize;

};