* linux-next / s390 crypto breakage
@ 2009-09-02 11:35 Heiko Carstens
2009-09-02 17:57 ` Jan Glauber
0 siblings, 1 reply; 5+ messages in thread
From: Heiko Carstens @ 2009-09-02 11:35 UTC (permalink / raw)
To: Herbert Xu; +Cc: Jan Glauber, Martin Schwidefsky, linux-next
Hi Herbert,
your patch "crypto: shash - Export/import hash state only" causes this
on s390:
CC arch/s390/crypto/sha1_s390.o
arch/s390/crypto/sha1_s390.c: In function 'sha1_import':
arch/s390/crypto/sha1_s390.c:63: warning: initialization from incompatible pointer type
arch/s390/crypto/sha1_s390.c: At top level:
arch/s390/crypto/sha1_s390.c:78: warning: initialization from incompatible pointer type
CC arch/s390/crypto/sha_common.o
CC arch/s390/crypto/sha256_s390.o
arch/s390/crypto/sha256_s390.c: In function 'sha256_import':
arch/s390/crypto/sha256_s390.c:59: warning: initialization from incompatible pointer type
arch/s390/crypto/sha256_s390.c: At top level:
arch/s390/crypto/sha256_s390.c:74: warning: initialization from incompatible pointer type
CC arch/s390/crypto/sha512_s390.o
arch/s390/crypto/sha512_s390.c: In function 'sha512_import':
arch/s390/crypto/sha512_s390.c:58: warning: initialization from incompatible pointer type
arch/s390/crypto/sha512_s390.c: At top level:
arch/s390/crypto/sha512_s390.c:76: warning: initialization from incompatible pointer type
arch/s390/crypto/sha512_s390.c:115: warning: initialization from incompatible pointer type
Looks like you missed some conversions. Could you (or Jan?) fix this please?
Thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next / s390 crypto breakage
2009-09-02 11:35 linux-next / s390 crypto breakage Heiko Carstens
@ 2009-09-02 17:57 ` Jan Glauber
2009-09-02 22:04 ` Herbert Xu
0 siblings, 1 reply; 5+ messages in thread
From: Jan Glauber @ 2009-09-02 17:57 UTC (permalink / raw)
To: Herbert Xu; +Cc: Martin Schwidefsky, linux-next, Heiko Carstens
That patch should fix the warnings.
--Jan
diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c
index 4a94378..f6de782 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)
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));
diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c
index 2bab519..61a7db3 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)
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));
diff --git a/arch/s390/crypto/sha512_s390.c b/arch/s390/crypto/sha512_s390.c
index b4b3438..4bf73d0 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)
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;
On Wed, 2009-09-02 at 13:35 +0200, Heiko Carstens wrote:
> Hi Herbert,
>
> your patch "crypto: shash - Export/import hash state only" causes this
> on s390:
>
> CC arch/s390/crypto/sha1_s390.o
> arch/s390/crypto/sha1_s390.c: In function 'sha1_import':
> arch/s390/crypto/sha1_s390.c:63: warning: initialization from incompatible pointer type
> arch/s390/crypto/sha1_s390.c: At top level:
> arch/s390/crypto/sha1_s390.c:78: warning: initialization from incompatible pointer type
> CC arch/s390/crypto/sha_common.o
> CC arch/s390/crypto/sha256_s390.o
> arch/s390/crypto/sha256_s390.c: In function 'sha256_import':
> arch/s390/crypto/sha256_s390.c:59: warning: initialization from incompatible pointer type
> arch/s390/crypto/sha256_s390.c: At top level:
> arch/s390/crypto/sha256_s390.c:74: warning: initialization from incompatible pointer type
> CC arch/s390/crypto/sha512_s390.o
> arch/s390/crypto/sha512_s390.c: In function 'sha512_import':
> arch/s390/crypto/sha512_s390.c:58: warning: initialization from incompatible pointer type
> arch/s390/crypto/sha512_s390.c: At top level:
> arch/s390/crypto/sha512_s390.c:76: warning: initialization from incompatible pointer type
> arch/s390/crypto/sha512_s390.c:115: warning: initialization from incompatible pointer type
>
> Looks like you missed some conversions. Could you (or Jan?) fix this please?
>
> Thanks!
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: linux-next / s390 crypto breakage
2009-09-02 17:57 ` Jan Glauber
@ 2009-09-02 22:04 ` Herbert Xu
2009-09-03 15:52 ` Jan Glauber
0 siblings, 1 reply; 5+ messages in thread
From: Herbert Xu @ 2009-09-02 22:04 UTC (permalink / raw)
To: Jan Glauber; +Cc: Martin Schwidefsky, linux-next, Heiko Carstens
On Wed, Sep 02, 2009 at 05:57:25PM +0000, Jan Glauber wrote:
> That patch should fix the warnings.
Thanks, but where is the sign-off :)
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next / s390 crypto breakage
2009-09-02 22:04 ` Herbert Xu
@ 2009-09-03 15:52 ` Jan Glauber
2009-09-05 6:28 ` Herbert Xu
0 siblings, 1 reply; 5+ messages in thread
From: Jan Glauber @ 2009-09-03 15:52 UTC (permalink / raw)
To: Herbert Xu; +Cc: Martin Schwidefsky, linux-next, Heiko Carstens
On Thu, 2009-09-03 at 08:04 +1000, Herbert Xu wrote:
> On Wed, Sep 02, 2009 at 05:57:25PM +0000, Jan Glauber wrote:
> > That patch should fix the warnings.
>
> Thanks, but where is the sign-off :)
Oops. I need a script for that...
Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next / s390 crypto breakage
2009-09-03 15:52 ` Jan Glauber
@ 2009-09-05 6:28 ` Herbert Xu
0 siblings, 0 replies; 5+ messages in thread
From: Herbert Xu @ 2009-09-05 6:28 UTC (permalink / raw)
To: Jan Glauber; +Cc: Martin Schwidefsky, linux-next, Heiko Carstens
On Thu, Sep 03, 2009 at 03:52:22PM +0000, Jan Glauber wrote:
>
> Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Patch applied. Thanks!
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-09-05 6:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-09-02 11:35 linux-next / s390 crypto breakage Heiko Carstens
2009-09-02 17:57 ` Jan Glauber
2009-09-02 22:04 ` Herbert Xu
2009-09-03 15:52 ` Jan Glauber
2009-09-05 6:28 ` Herbert Xu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.