aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Glauber <jang@linux.vnet.ibm.com>2009-09-05 02:27:35 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2009-09-05 02:27:35 -0400
commit81bd5f6c966cf2f137c2759dfc78abdffcff055e (patch)
treed3ba38b886697b0690cfd6ec7712fdfbebfe986b
parentf1939f7c56456d22a559d2c75156e91912a2e97e (diff)
crypto: sha-s390 - Fix warnings in import function
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>
-rw-r--r--arch/s390/crypto/sha1_s390.c4
-rw-r--r--arch/s390/crypto/sha256_s390.c4
-rw-r--r--arch/s390/crypto/sha512_s390.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c
index 4a943789c208..f6de7826c979 100644
--- a/arch/s390/crypto/sha1_s390.c
+++ b/arch/s390/crypto/sha1_s390.c
@@ -57,10 +57,10 @@ static int sha1_export(struct shash_desc *desc, void *out)
57 return 0; 57 return 0;
58} 58}
59 59
60static int sha1_import(struct shash_desc *desc, const u8 *in) 60static int sha1_import(struct shash_desc *desc, const void *in)
61{ 61{
62 struct s390_sha_ctx *sctx = shash_desc_ctx(desc); 62 struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
63 struct sha1_state *ictx = in; 63 const struct sha1_state *ictx = in;
64 64
65 sctx->count = ictx->count; 65 sctx->count = ictx->count;
66 memcpy(sctx->state, ictx->state, sizeof(ictx->state)); 66 memcpy(sctx->state, ictx->state, sizeof(ictx->state));
diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c
index 2bab5197789f..61a7db372121 100644
--- a/arch/s390/crypto/sha256_s390.c
+++ b/arch/s390/crypto/sha256_s390.c
@@ -53,10 +53,10 @@ static int sha256_export(struct shash_desc *desc, void *out)
53 return 0; 53 return 0;
54} 54}
55 55
56static int sha256_import(struct shash_desc *desc, const u8 *in) 56static int sha256_import(struct shash_desc *desc, const void *in)
57{ 57{
58 struct s390_sha_ctx *sctx = shash_desc_ctx(desc); 58 struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
59 struct sha256_state *ictx = in; 59 const struct sha256_state *ictx = in;
60 60
61 sctx->count = ictx->count; 61 sctx->count = ictx->count;
62 memcpy(sctx->state, ictx->state, sizeof(ictx->state)); 62 memcpy(sctx->state, ictx->state, sizeof(ictx->state));
diff --git a/arch/s390/crypto/sha512_s390.c b/arch/s390/crypto/sha512_s390.c
index b4b3438ae77e..4bf73d0dc525 100644
--- a/arch/s390/crypto/sha512_s390.c
+++ b/arch/s390/crypto/sha512_s390.c
@@ -52,10 +52,10 @@ static int sha512_export(struct shash_desc *desc, void *out)
52 return 0; 52 return 0;
53} 53}
54 54
55static int sha512_import(struct shash_desc *desc, const u8 *in) 55static int sha512_import(struct shash_desc *desc, const void *in)
56{ 56{
57 struct s390_sha_ctx *sctx = shash_desc_ctx(desc); 57 struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
58 struct sha512_state *ictx = in; 58 const struct sha512_state *ictx = in;
59 59
60 if (unlikely(ictx->count[1])) 60 if (unlikely(ictx->count[1]))
61 return -ERANGE; 61 return -ERANGE;