QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-25 08:37:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

aes256estream: don't assume that unaligned words can be read (for the input)

Browse Source
This commit is contained in:
Frank Denis
2013-09-07 16:13:16 -07:00
parent 69641010c9
commit 82d97ce5fb
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_stream/aes256estream/hongjun/aes256-ctr.c
+5 -5
View File
@@ -121,7 +121,7 @@ static void
ECRYPT_process_bytes(int action, ECRYPT_ctx* ctx, const u8* input, u8* output,
u32 msglen)
{
u8 keystream[16];
__attribute__((aligned(32))) u8 keystream[16];
u32 i;
(void) action;
@@ -131,10 +131,10 @@ ECRYPT_process_bytes(int action, ECRYPT_ctx* ctx, const u8* input, u8* output,
for ( ; msglen >= 16; msglen -= 16, input += 16, output += 16) {
aes256_enc_block(ctx->counter, keystream, ctx);
((u32*)output)[0] = ((u32*)input)[0] ^ ((u32*)keystream)[0] ^ ctx->round_key[Nr][0];
((u32*)output)[1] = ((u32*)input)[1] ^ ((u32*)keystream)[1] ^ ctx->round_key[Nr][1];
((u32*)output)[2] = ((u32*)input)[2] ^ ((u32*)keystream)[2] ^ ctx->round_key[Nr][2];
((u32*)output)[3] = ((u32*)input)[3] ^ ((u32*)keystream)[3] ^ ctx->round_key[Nr][3];
((u32*)output)[0] = UNALIGNED_U32_READ(input, 0) ^ ((u32*)keystream)[0] ^ ctx->round_key[Nr][0];
((u32*)output)[1] = UNALIGNED_U32_READ(input, 1) ^ ((u32*)keystream)[1] ^ ctx->round_key[Nr][1];
((u32*)output)[2] = UNALIGNED_U32_READ(input, 2) ^ ((u32*)keystream)[2] ^ ctx->round_key[Nr][2];
((u32*)output)[3] = UNALIGNED_U32_READ(input, 3) ^ ((u32*)keystream)[3] ^ ctx->round_key[Nr][3];
ctx->counter[0]++;
src/libsodium/crypto_stream/aes256estream/hongjun/aes256.h
+2
View File
@@ -156,3 +156,5 @@
round(ctx,j0,j1,j2,j3,k0,k1,k2,k3,13);\
last_round(ctx,k0,k1,k2,k3,(output),14);\
}
#define UNALIGNED_U32_READ(P, I) (((const u32 *)(const void *) (P))[(I)])