diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-11 23:40:02 -0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-11 23:40:02 -0200 |
| commit | 3a8e62536f9489f46ac17a6168836ac5cebeda01 (patch) | |
| tree | 36dd9a1c3edc6d28e349181f57f2a395db1317f9 /crypto/shash.c | |
| parent | f2de1c480c0c3d5fd41171b83ced4270253fa868 (diff) | |
| parent | b5f7def5dc2f3a3ab0cf0ae31a4c2501d969e5c9 (diff) | |
| download | linux-crypto-3a8e62536f9489f46ac17a6168836ac5cebeda01.tar.gz linux-crypto-3a8e62536f9489f46ac17a6168836ac5cebeda01.zip | |
Merge git://github.com/herbertx/crypto
* git://github.com/herbertx/crypto:
crypto: algapi - Fix build problem with NET disabled
crypto: user - Fix rwsem leak in crypto_user
Diffstat (limited to 'crypto/shash.c')
| -rw-r--r-- | crypto/shash.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/shash.c b/crypto/shash.c index ea8a9c6e..91009127 100644 --- a/crypto/shash.c +++ b/crypto/shash.c @@ -524,6 +524,7 @@ static unsigned int crypto_shash_extsize(struct crypto_alg *alg) return alg->cra_ctxsize; } +#ifdef CONFIG_NET static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg) { struct crypto_report_hash rhash; @@ -541,6 +542,12 @@ static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg) nla_put_failure: return -EMSGSIZE; } +#else +static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg) +{ + return -ENOSYS; +} +#endif static void crypto_shash_show(struct seq_file *m, struct crypto_alg *alg) __attribute__ ((unused)); |