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

Commit 07a5fa4a authored by Steffen Klassert's avatar Steffen Klassert Committed by Herbert Xu
Browse files

crypto: Add userspace report for cipher type algorithms 



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

crypto/crypto_user.c

+29 −0
Original line number Diff line number Diff line
@@ -70,6 +70,25 @@ static struct crypto_alg *crypto_alg_match(struct crypto_user_alg *p, int exact) 
	return alg;

}



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

{

	struct crypto_report_cipher rcipher;



	snprintf(rcipher.type, CRYPTO_MAX_ALG_NAME, "%s", "cipher");



	rcipher.blocksize = alg->cra_blocksize;

	rcipher.min_keysize = alg->cra_cipher.cia_min_keysize;

	rcipher.max_keysize = alg->cra_cipher.cia_max_keysize;



	NLA_PUT(skb, CRYPTOCFGA_REPORT_CIPHER,

		sizeof(struct crypto_report_cipher), &rcipher);



	return 0;



nla_put_failure:

	return -EMSGSIZE;

}



static int crypto_report_one(struct crypto_alg *alg,

			     struct crypto_user_alg *ualg, struct sk_buff *skb)

{
@@ -98,6 +117,16 @@ static int crypto_report_one(struct crypto_alg *alg, 
	if (alg->cra_type && alg->cra_type->report) {

		if (alg->cra_type->report(skb, alg))

			goto nla_put_failure;



		goto out;

	}



	switch (alg->cra_flags & (CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_LARVAL)) {

	case CRYPTO_ALG_TYPE_CIPHER:

		if (crypto_report_cipher(skb, alg))

			goto nla_put_failure;



		break;

	}



out:

include/linux/cryptouser.h

+8 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ enum crypto_attr_type_t { 
	CRYPTOCFGA_REPORT_AEAD,		/* struct crypto_report_aead */

	CRYPTOCFGA_REPORT_COMPRESS,	/* struct crypto_report_comp */

	CRYPTOCFGA_REPORT_RNG,		/* struct crypto_report_rng */

	CRYPTOCFGA_REPORT_CIPHER,	/* struct crypto_report_cipher */

	__CRYPTOCFGA_MAX



#define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1)
@@ -67,6 +68,13 @@ struct crypto_report_hash { 
	unsigned int digestsize;

};



struct crypto_report_cipher {

	char type[CRYPTO_MAX_ALG_NAME];

	unsigned int blocksize;

	unsigned int min_keysize;

	unsigned int max_keysize;

};



struct crypto_report_blkcipher {

	char type[CRYPTO_MAX_NAME];

	char geniv[CRYPTO_MAX_NAME];