Skip to content

Commit

Permalink
crypto: sha-s390 - Fix warnings in import function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jan Glauber authored and Herbert Xu committed Sep 5, 2009
1 parent f1939f7 commit 81bd5f6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions arch/s390/crypto/sha1_s390.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions arch/s390/crypto/sha256_s390.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions arch/s390/crypto/sha512_s390.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 81bd5f6

Please sign in to comment.