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 | 42a0ddcd484d0470d4c1b114ffb6be1d35f8ac6b (patch) | |
| tree | c1a93de1487a69c2fc0ee165b882bf4c896e0e72 /crypto/aead.c | |
| parent | 53e3ccfd153f0e71352b34a930e231ac1ae07d5e (diff) | |
| parent | 3acc84739dd5d746840f881ad4d60bd2a428f1dd (diff) | |
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/aead.c')
| -rw-r--r-- | crypto/aead.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/crypto/aead.c b/crypto/aead.c index 701556ffaae..04add3dca6f 100644 --- a/crypto/aead.c +++ b/crypto/aead.c @@ -111,6 +111,7 @@ static int crypto_init_aead_ops(struct crypto_tfm *tfm, u32 type, u32 mask) return 0; } +#ifdef CONFIG_NET static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg) { struct crypto_report_aead raead; @@ -132,6 +133,12 @@ static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg) nla_put_failure: return -EMSGSIZE; } +#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) __attribute__ ((unused)); @@ -190,6 +197,7 @@ static int crypto_init_nivaead_ops(struct crypto_tfm *tfm, u32 type, u32 mask) return 0; } +#ifdef CONFIG_NET static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg) { struct crypto_report_aead raead; @@ -210,6 +218,12 @@ static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg) nla_put_failure: return -EMSGSIZE; } +#else +static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg) +{ + return -ENOSYS; +} +#endif static void crypto_nivaead_show(struct seq_file *m, struct crypto_alg *alg) |