Commit c0f9e01d authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: api - Check CRYPTO_USER instead of NET for report 



The report function is currently conditionalised on CONFIG_NET.
As it's only used by CONFIG_CRYPTO_USER, conditionalising on that
instead of CONFIG_NET makes more sense.

This gets rid of a rarely used code-path.

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

crypto/acompress.c

+4 −8
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ static inline struct acomp_alg *crypto_acomp_alg(struct crypto_acomp *tfm) 
	return __crypto_acomp_alg(crypto_acomp_tfm(tfm)->__crt_alg);

}



#ifdef CONFIG_NET

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

static int __maybe_unused crypto_acomp_report(

	struct sk_buff *skb, struct crypto_alg *alg)

{

	struct crypto_report_acomp racomp;
@@ -44,12 +44,6 @@ static int crypto_acomp_report(struct sk_buff *skb, struct crypto_alg *alg) 


	return nla_put(skb, CRYPTOCFGA_REPORT_ACOMP, sizeof(racomp), &racomp);

}

#else

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

{

	return -ENOSYS;

}

#endif



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

	__maybe_unused;
@@ -131,7 +125,9 @@ static const struct crypto_type crypto_acomp_type = { 
#ifdef CONFIG_PROC_FS

	.show = crypto_acomp_show,

#endif

#ifdef CONFIG_CRYPTO_USER

	.report = crypto_acomp_report,

#endif

#ifdef CONFIG_CRYPTO_STATS

	.report_stat = crypto_acomp_report_stat,

#endif

crypto/aead.c

+4 −8
Original line number Diff line number Diff line
@@ -175,8 +175,8 @@ static int crypto_aead_init_tfm(struct crypto_tfm *tfm) 
	return 0;

}



#ifdef CONFIG_NET

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

static int __maybe_unused crypto_aead_report(

	struct sk_buff *skb, struct crypto_alg *alg)

{

	struct crypto_report_aead raead;

	struct aead_alg *aead = container_of(alg, struct aead_alg, base);
@@ -192,12 +192,6 @@ static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg) 


	return nla_put(skb, CRYPTOCFGA_REPORT_AEAD, sizeof(raead), &raead);

}

#else

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

{

	return -ENOSYS;

}

#endif



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

	__maybe_unused;
@@ -248,7 +242,9 @@ static const struct crypto_type crypto_aead_type = { 
#ifdef CONFIG_PROC_FS

	.show = crypto_aead_show,

#endif

#ifdef CONFIG_CRYPTO_USER

	.report = crypto_aead_report,

#endif

#ifdef CONFIG_CRYPTO_STATS

	.report_stat = crypto_aead_report_stat,

#endif

crypto/ahash.c

+4 −8
Original line number Diff line number Diff line
@@ -469,8 +469,8 @@ static void crypto_ahash_free_instance(struct crypto_instance *inst) 
	ahash->free(ahash);

}



#ifdef CONFIG_NET

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

static int __maybe_unused crypto_ahash_report(

	struct sk_buff *skb, struct crypto_alg *alg)

{

	struct crypto_report_hash rhash;
@@ -483,12 +483,6 @@ static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg) 


	return nla_put(skb, CRYPTOCFGA_REPORT_HASH, sizeof(rhash), &rhash);

}

#else

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

{

	return -ENOSYS;

}

#endif



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

	__maybe_unused;
@@ -515,7 +509,9 @@ static const struct crypto_type crypto_ahash_type = { 
#ifdef CONFIG_PROC_FS

	.show = crypto_ahash_show,

#endif

#ifdef CONFIG_CRYPTO_USER

	.report = crypto_ahash_report,

#endif

#ifdef CONFIG_CRYPTO_STATS

	.report_stat = crypto_ahash_report_stat,

#endif

crypto/akcipher.c

+4 −8
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 


#include "internal.h"



#ifdef CONFIG_NET

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

static int __maybe_unused crypto_akcipher_report(

	struct sk_buff *skb, struct crypto_alg *alg)

{

	struct crypto_report_akcipher rakcipher;
@@ -29,12 +29,6 @@ static int crypto_akcipher_report(struct sk_buff *skb, struct crypto_alg *alg) 
	return nla_put(skb, CRYPTOCFGA_REPORT_AKCIPHER,

		       sizeof(rakcipher), &rakcipher);

}

#else

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

{

	return -ENOSYS;

}

#endif



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

	__maybe_unused;
@@ -104,7 +98,9 @@ static const struct crypto_type crypto_akcipher_type = { 
#ifdef CONFIG_PROC_FS

	.show = crypto_akcipher_show,

#endif

#ifdef CONFIG_CRYPTO_USER

	.report = crypto_akcipher_report,

#endif

#ifdef CONFIG_CRYPTO_STATS

	.report_stat = crypto_akcipher_report_stat,

#endif

crypto/kpp.c

+4 −8
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 


#include "internal.h"



#ifdef CONFIG_NET

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

static int __maybe_unused crypto_kpp_report(

	struct sk_buff *skb, struct crypto_alg *alg)

{

	struct crypto_report_kpp rkpp;
@@ -28,12 +28,6 @@ static int crypto_kpp_report(struct sk_buff *skb, struct crypto_alg *alg) 


	return nla_put(skb, CRYPTOCFGA_REPORT_KPP, sizeof(rkpp), &rkpp);

}

#else

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

{

	return -ENOSYS;

}

#endif



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

	__maybe_unused;
@@ -102,7 +96,9 @@ static const struct crypto_type crypto_kpp_type = { 
#ifdef CONFIG_PROC_FS

	.show = crypto_kpp_show,

#endif

#ifdef CONFIG_CRYPTO_USER

	.report = crypto_kpp_report,

#endif

#ifdef CONFIG_CRYPTO_STATS

	.report_stat = crypto_kpp_report_stat,

#endif