summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2011-08-16 14:03:05 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2011-08-16 14:03:05 +0800
commit4619b6bdb71362d95810f475cc61a6de9d0b1904 (patch)
tree3b272a8c9ea37b5e71193f5ee51094f7b192c254
parente27303b25611e9a9ba78c0b5614abeb173d6cc74 (diff)
downloadlinux-stable-4619b6bdb71362d95810f475cc61a6de9d0b1904.tar.gz
linux-stable-4619b6bdb71362d95810f475cc61a6de9d0b1904.tar.bz2
linux-stable-4619b6bdb71362d95810f475cc61a6de9d0b1904.zip
crypto: sha - Fix build error due to crypto_sha1_update
On Tue, Aug 16, 2011 at 03:22:34PM +1000, Stephen Rothwell wrote: > > After merging the final tree, today's linux-next build (powerpc > allyesconfig) produced this warning: > > In file included from security/integrity/ima/../integrity.h:16:0, > from security/integrity/ima/ima.h:27, > from security/integrity/ima/ima_policy.c:20: > include/crypto/sha.h:86:10: warning: 'struct shash_desc' declared inside parameter list > include/crypto/sha.h:86:10: warning: its scope is only this definition or declaration, which is probably not what you want > > Introduced by commit 7c390170b493 ("crypto: sha1 - export sha1_update for > reuse"). I guess you need to include crypto/hash.h in crypto/sha.h. This patch fixes this by providing a declaration for struct shash_desc. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--include/crypto/sha.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/crypto/sha.h b/include/crypto/sha.h
index 83e6be5e2707..c6c9c1fe460c 100644
--- a/include/crypto/sha.h
+++ b/include/crypto/sha.h
@@ -82,6 +82,8 @@ struct sha512_state {
u8 buf[SHA512_BLOCK_SIZE];
};
+struct shash_desc;
+
extern int crypto_sha1_update(struct shash_desc *desc, const u8 *data,
unsigned int len);