]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
crypto: sha-s390 - Fix warnings in import function
authorJan Glauber <jang@linux.vnet.ibm.com>
Sat, 5 Sep 2009 06:27:35 +0000 (16:27 +1000)
committerHerbert Xu <herbert@gondor.apana.org.au>
Sat, 5 Sep 2009 06:27:35 +0000 (16:27 +1000)
That patch should fix the warnings.

Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
arch/s390/crypto/sha1_s390.c
arch/s390/crypto/sha256_s390.c
arch/s390/crypto/sha512_s390.c

index 4a943789c208de1739d4efc62b24844d16b728a2..f6de7826c9790a26fa96f6a4b6d6294924fdb696 100644 (file)
@@ -57,10 +57,10 @@ static int sha1_export(struct shash_desc *desc, void *out)
        return 0;
 }
 
-static int sha1_import(struct shash_desc *desc, const u8 *in)
+static int sha1_import(struct shash_desc *desc, const void *in)
 {
        struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
-       struct sha1_state *ictx = in;
+       const struct sha1_state *ictx = in;
 
        sctx->count = ictx->count;
        memcpy(sctx->state, ictx->state, sizeof(ictx->state));
index 2bab5197789fa0e9a7f6ca4da686a33ea094ef5c..61a7db372121fc382727a568800934155ddd7eb6 100644 (file)
@@ -53,10 +53,10 @@ static int sha256_export(struct shash_desc *desc, void *out)
        return 0;
 }
 
-static int sha256_import(struct shash_desc *desc, const u8 *in)
+static int sha256_import(struct shash_desc *desc, const void *in)
 {
        struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
-       struct sha256_state *ictx = in;
+       const struct sha256_state *ictx = in;
 
        sctx->count = ictx->count;
        memcpy(sctx->state, ictx->state, sizeof(ictx->state));
index b4b3438ae77edcabc059ee5faac706cf50d03e6a..4bf73d0dc525c2cd210e08d0fa0d1a5db383f18c 100644 (file)
@@ -52,10 +52,10 @@ static int sha512_export(struct shash_desc *desc, void *out)
        return 0;
 }
 
-static int sha512_import(struct shash_desc *desc, const u8 *in)
+static int sha512_import(struct shash_desc *desc, const void *in)
 {
        struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
-       struct sha512_state *ictx = in;
+       const struct sha512_state *ictx = in;
 
        if (unlikely(ictx->count[1]))
                return -ERANGE;