vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make rijndael.c respect aliasing rules.

Browse source 
Trivial backport of dfb4673da8ee52d95e0a62c9f49ca8599943f22e.
This commit is contained in:
Vladimir Serbinenko 2013-12-24 16:57:28 +01:00
parent f7c7c4d4ad
commit 4127206896
2 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-12-24 Vladimir Serbinenko <phcoder@gmail.com>
Make rijndael.c respect aliasing rules.
Trivial backport of dfb4673da8ee52d95e0a62c9f49ca8599943f22e.
2013-12-24 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-24 Vladimir Serbinenko <phcoder@gmail.com>
Make grub_util_device_is_mapped_stat available in grub-emu core. Make grub_util_device_is_mapped_stat available in grub-emu core.

36
grub-core/lib/libgcrypt/cipher/rijndael.c
View file

@ -357,7 +357,7 @@ do_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
for (j = KC-1; j >= 0; j--) for (j = KC-1; j >= 0; j--)
{ {
*((u32*)tk[j]) = *((u32*)k[j]); *((u32_a_t*)tk[j]) = *((u32_a_t*)k[j]);
} }
r = 0; r = 0;
t = 0; t = 0;
@ -366,7 +366,7 @@ do_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
{ {
for (; (j < KC) && (t < 4); j++, t++) for (; (j < KC) && (t < 4); j++, t++)
{ {
*((u32*)W[r][t]) = *((u32*)tk[j]); *((u32_a_t*)W[r][t]) = *((u32_a_t*)tk[j]);
} }
if (t == 4) if (t == 4)
{ {
@ -389,14 +389,14 @@ do_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
{ {
for (j = 1; j < KC; j++) for (j = 1; j < KC; j++)
{ {
*((u32*)tk[j]) ^= *((u32*)tk[j-1]); *((u32_a_t*)tk[j]) ^= *((u32_a_t*)tk[j-1]);
} }
} }
else else
{ {
for (j = 1; j < KC/2; j++) for (j = 1; j < KC/2; j++)
{ {
*((u32*)tk[j]) ^= *((u32*)tk[j-1]); *((u32_a_t*)tk[j]) ^= *((u32_a_t*)tk[j-1]);
} }
tk[KC/2][0] ^= S[tk[KC/2 - 1][0]]; tk[KC/2][0] ^= S[tk[KC/2 - 1][0]];
tk[KC/2][1] ^= S[tk[KC/2 - 1][1]]; tk[KC/2][1] ^= S[tk[KC/2 - 1][1]];
@ -404,7 +404,7 @@ do_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
tk[KC/2][3] ^= S[tk[KC/2 - 1][3]]; tk[KC/2][3] ^= S[tk[KC/2 - 1][3]];
for (j = KC/2 + 1; j < KC; j++) for (j = KC/2 + 1; j < KC; j++)
{ {
*((u32*)tk[j]) ^= *((u32*)tk[j-1]); *((u32_a_t*)tk[j]) ^= *((u32_a_t*)tk[j-1]);
} }
} }
@ -413,7 +413,7 @@ do_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
{ {
for (; (j < KC) && (t < 4); j++, t++) for (; (j < KC) && (t < 4); j++, t++)
{ {
*((u32*)W[r][t]) = *((u32*)tk[j]); *((u32_a_t*)W[r][t]) = *((u32_a_t*)tk[j]);
} }
if (t == 4) if (t == 4)
{ {
@ -483,29 +483,29 @@ prepare_decryption( RIJNDAEL_context *ctx )
for (r=0; r < MAXROUNDS+1; r++ ) for (r=0; r < MAXROUNDS+1; r++ )
{ {
*((u32*)ctx->keyschdec[r][0]) = *((u32*)ctx->keyschenc[r][0]); *((u32_a_t*)ctx->keyschdec[r][0]) = *((u32_a_t*)ctx->keyschenc[r][0]);
*((u32*)ctx->keyschdec[r][1]) = *((u32*)ctx->keyschenc[r][1]); *((u32_a_t*)ctx->keyschdec[r][1]) = *((u32_a_t*)ctx->keyschenc[r][1]);
*((u32*)ctx->keyschdec[r][2]) = *((u32*)ctx->keyschenc[r][2]); *((u32_a_t*)ctx->keyschdec[r][2]) = *((u32_a_t*)ctx->keyschenc[r][2]);
*((u32*)ctx->keyschdec[r][3]) = *((u32*)ctx->keyschenc[r][3]); *((u32_a_t*)ctx->keyschdec[r][3]) = *((u32_a_t*)ctx->keyschenc[r][3]);
} }
#define W (ctx->keyschdec) #define W (ctx->keyschdec)
for (r = 1; r < ctx->rounds; r++) for (r = 1; r < ctx->rounds; r++)
{ {
w = W[r][0]; w = W[r][0];
*((u32*)w) = *((u32*)U1[w[0]]) ^ *((u32*)U2[w[1]]) *((u32_a_t*)w) = *((u32_a_t*)U1[w[0]]) ^ *((u32_a_t*)U2[w[1]])
^ *((u32*)U3[w[2]]) ^ *((u32*)U4[w[3]]); ^ *((u32_a_t*)U3[w[2]]) ^ *((u32_a_t*)U4[w[3]]);
w = W[r][1]; w = W[r][1];
*((u32*)w) = *((u32*)U1[w[0]]) ^ *((u32*)U2[w[1]]) *((u32_a_t*)w) = *((u32_a_t*)U1[w[0]]) ^ *((u32_a_t*)U2[w[1]])
^ *((u32*)U3[w[2]]) ^ *((u32*)U4[w[3]]); ^ *((u32_a_t*)U3[w[2]]) ^ *((u32_a_t*)U4[w[3]]);
w = W[r][2]; w = W[r][2];
*((u32*)w) = *((u32*)U1[w[0]]) ^ *((u32*)U2[w[1]]) *((u32_a_t*)w) = *((u32_a_t*)U1[w[0]]) ^ *((u32_a_t*)U2[w[1]])
^ *((u32*)U3[w[2]]) ^ *((u32*)U4[w[3]]); ^ *((u32_a_t*)U3[w[2]]) ^ *((u32_a_t*)U4[w[3]]);
w = W[r][3]; w = W[r][3];
*((u32*)w) = *((u32*)U1[w[0]]) ^ *((u32*)U2[w[1]]) *((u32_a_t*)w) = *((u32_a_t*)U1[w[0]]) ^ *((u32_a_t*)U2[w[1]])
^ *((u32*)U3[w[2]]) ^ *((u32*)U4[w[3]]); ^ *((u32_a_t*)U3[w[2]]) ^ *((u32_a_t*)U4[w[3]]);
} }
#undef W #undef W
#undef w #undef w