kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-31 22:42:57 -07:00
Code Releases Wiki Activity

uint32 -> uint32_t

Browse Source
This commit is contained in:
Frank Denis 2016-09-30 08:26:08 +02:00
parent f6e0256d9b
commit f257413772
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c
View File

@ -35,7 +35,7 @@ int crypto_stream_aes128ctr_afternm(unsigned char *out, unsigned long long len,
unsigned char *np; unsigned char *np;
unsigned char b; unsigned char b;
uint32 tmp; uint32_t tmp;
/* Copy nonce on the stack */ /* Copy nonce on the stack */
copy2(&nonce_stack, (const int128 *) (nonce + 0)); copy2(&nonce_stack, (const int128 *) (nonce + 0));

2
src/libsodium/crypto_stream/aes128ctr/portable/int128.h
View File

@ -51,6 +51,6 @@ void toggle(int128 *r);
void xor_rcon(int128 *r); void xor_rcon(int128 *r);
#define add_uint32_big crypto_stream_aes128ctr_portable_add_uint32_big #define add_uint32_big crypto_stream_aes128ctr_portable_add_uint32_big
void add_uint32_big(int128 *r, uint32 x); void add_uint32_big(int128 *r, uint32_t x);
#endif #endif

8
src/libsodium/crypto_stream/aes128ctr/portable/int128_aes128ctr.c
View File

@ -67,7 +67,7 @@ void shufd(int128 *r, const int128 *x, const unsigned int c)
void rshift32_littleendian(int128 *r, const unsigned int n) void rshift32_littleendian(int128 *r, const unsigned int n)
{ {
unsigned char *rp = (unsigned char *)r; unsigned char *rp = (unsigned char *)r;
uint32 t; uint32_t t;
t = LOAD32_LE(rp); t = LOAD32_LE(rp);
t >>= n; t >>= n;
STORE32_LE(rp, t); STORE32_LE(rp, t);
@ -115,16 +115,16 @@ void toggle(int128 *r)
void xor_rcon(int128 *r) void xor_rcon(int128 *r)
{ {
unsigned char *rp = (unsigned char *)r; unsigned char *rp = (unsigned char *)r;
uint32 t; uint32_t t;
t = LOAD32_LE(rp+12); t = LOAD32_LE(rp+12);
t ^= 0xffffffff; t ^= 0xffffffff;
STORE32_LE(rp+12, t); STORE32_LE(rp+12, t);
} }
void add_uint32_big(int128 *r, uint32 x) void add_uint32_big(int128 *r, uint32_t x)
{ {
unsigned char *rp = (unsigned char *)r; unsigned char *rp = (unsigned char *)r;
uint32 t; uint32_t t;
t = LOAD32_LE(rp+12); t = LOAD32_LE(rp+12);
t += x; t += x;
STORE32_LE(rp+12, t); STORE32_LE(rp+12, t);

2
src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c
View File

@ -35,7 +35,7 @@ int crypto_stream_aes128ctr_xor_afternm(unsigned char *out, const unsigned char
unsigned char *np; unsigned char *np;
unsigned char b; unsigned char b;
uint32 tmp; uint32_t tmp;
/* Copy nonce on the stack */ /* Copy nonce on the stack */
copy2(&nonce_stack, (const int128 *) (nonce + 0)); copy2(&nonce_stack, (const int128 *) (nonce + 0));