cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quick quirk to support unaligned input for aes256estream.

Browse Source
This commit is contained in:
Frank Denis 2013-09-07 16:40:51 -07:00
parent 82d97ce5fb
commit 05d6defd77
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/libsodium/crypto_stream/aes256estream/hongjun/aes256-ctr.c
View File

@ -117,6 +117,27 @@ partial_precompute_tworounds(ECRYPT_ctx* ctx)
/* ------------------------------------------------------------------------- */
#if defined(CPU_X86) || defined(CPU_X86_64) || defined(CPU_PPC) || defined(CPU_Z390)
# undef CPU_ALIGNED_ACCESS_REQUIRED
#else
# define CPU_ALIGNED_ACCESS_REQUIRED
#endif
#ifndef CPU_ALIGNED_ACCESS_REQUIRED
# define UNALIGNED_U32_READ(P, I) (((const u32 *)(const void *) (P))[(I)])
#else
static inline uint32_t
UNALIGNED_U32_READ(const u8 * const p, const size_t i)
{
uint32_t t;
(void) sizeof(int[sizeof(*p) == sizeof(char) ? 1 : -1]);
memcpy(&t, p + i * (sizeof t / sizeof *p), sizeof t);
return t;
}
#endif
/* ------------------------------------------------------------------------- */
static void
ECRYPT_process_bytes(int action, ECRYPT_ctx* ctx, const u8* input, u8* output,
u32 msglen)

2
src/libsodium/crypto_stream/aes256estream/hongjun/aes256.h
View File

@ -156,5 +156,3 @@
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)])