Re: [PATCH] crypto: fix key alignment in tcrypt

[Matt Mackall <mpm@selenic.com>]

On Sun, Mar 12, 2006 at 12:29:07AM +0100, Andreas Schwab wrote:
> Matt Mackall <mpm@selenic.com> writes:
> 
> > On Wed, Mar 08, 2006 at 11:11:55PM +0900, Atsushi Nemoto wrote:
> >> Force 32-bit alignment on keys in tcrypt test vectors.
> >> 
> >> Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
> >> 
> >> diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h
> >> index 733d07e..050f852 100644
> >> --- a/crypto/tcrypt.h
> >> +++ b/crypto/tcrypt.h
> >> @@ -31,7 +31,7 @@ struct hash_testvec {
> >>  	char digest[MAX_DIGEST_SIZE];
> >>  	unsigned char np;
> >>  	unsigned char tap[MAX_TAP];
> >> -	char key[128]; /* only used with keyed hash algorithms */
> >> +	char key[128] __attribute__((__aligned__(4))); /* only used with keyed hash algorithms */
> >>  	unsigned char ksize;
> >>  };
> >>  
> >> @@ -48,7 +48,7 @@ struct hmac_testvec {
> >>  struct cipher_testvec {
> >>  	unsigned char fail;
> >>  	unsigned char wk; /* weak key flag */
> >> -	char key[MAX_KEYLEN];
> >> +	char key[MAX_KEYLEN] __attribute__((__aligned__(4)));
> >>  	unsigned char klen;
> >>  	char iv[MAX_IVLEN];
> >>  	char input[48];
> >
> > Wouldn't it be better to simply move this to the head of the structure?
> 
> That wouldn't help, since the whole structure will still be only 8-bit
> aligned.

Ahh, hadn't noticed the struct was entirely populated by chars.

-- 
Mathematics is the supreme nostalgia of our time.