Next July 16: s390 sha1 crypro build failure.

[Sachin Sant <sachinp@in.ibm.com>]

[-- Attachment #1: Type: text/plain, Size: 570 bytes --]

Today's next tree fails to build on s390 with following errors.

arch/s390/crypto/sha1_s390.c:67: error: 'struct sha1_state' has no member named 'buf'
arch/s390/crypto/sha1_s390.c:68: error: 'struct sha1_state' has no member named 'func'

arch/s390/crypto/sha256_s390.c:64: error: 'struct sha256_state' has no member named 'func'

Probably because of commit 406f104b4172de7452702c6810807c1b0132ba22.

In sha1_/sha256_import() functions struct s390_sha_ctx *sctx should be
used instead of struct sha1_state.

The following patch fixed the issue for me.

Thanks
-Sachin



[-- Attachment #2: s390-crypto-build-break-fix.patch --]
[-- Type: text/x-patch, Size: 1209 bytes --]

Use struct s390_sha_ctx instead of sha1/sha256_state struct to fix
s390 crypto build break.

Signed-off-by : Sachin Sant <sachinp@in.ibm.com>
---

diff -Naurp linux//arch/s390/crypto/sha1_s390.c new//arch/s390/crypto/sha1_s390.c
--- linux//arch/s390/crypto/sha1_s390.c	2009-07-16 05:46:31.000000000 -0400
+++ new//arch/s390/crypto/sha1_s390.c	2009-07-16 05:48:10.000000000 -0400
@@ -59,7 +59,7 @@ static int sha1_export(struct shash_desc
 
 static int sha1_import(struct shash_desc *desc, const u8 *in)
 {
-	struct sha1_state *sctx = shash_desc_ctx(desc);
+	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
 	struct sha1_state *ictx = in;
 
 	sctx->count = ictx->count;
diff -Naurp linux//arch/s390/crypto/sha256_s390.c new//arch/s390/crypto/sha256_s390.c
--- linux//arch/s390/crypto/sha256_s390.c	2009-07-16 05:47:42.000000000 -0400
+++ new//arch/s390/crypto/sha256_s390.c	2009-07-16 05:46:07.000000000 -0400
@@ -55,7 +55,7 @@ static int sha256_export(struct shash_de
 
 static int sha256_import(struct shash_desc *desc, const u8 *in)
 {
-	struct sha256_state *sctx = shash_desc_ctx(desc);
+	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
 	struct sha256_state *ictx = in;
 
 	sctx->count = ictx->count;