1
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-25 04:55:07 -07:00
This commit is contained in:
Frank Denis 2017-02-23 09:05:47 +01:00
parent 05349aa14d
commit c06418a382

View File

@ -1,61 +1,71 @@
#include "crypto_shorthash_siphash24.h" #include "crypto_shorthash_siphash24.h"
#include "private/common.h" #include "private/common.h"
typedef uint64_t u64;
typedef uint32_t u32;
typedef uint8_t u8;
#define ROTL(x, b) ROTL64(x, b)
#define SIPROUND \ #define SIPROUND \
do { \ do { \
v0 += v1; v1=ROTL(v1,13); v1 ^= v0; v0=ROTL(v0,32); \ v0 += v1; \
v2 += v3; v3=ROTL(v3,16); v3 ^= v2; \ v1 = ROTL64(v1, 13); \
v0 += v3; v3=ROTL(v3,21); v3 ^= v0; \ v1 ^= v0; \
v2 += v1; v1=ROTL(v1,17); v1 ^= v2; v2=ROTL(v2,32); \ v0 = ROTL64(v0, 32); \
v2 += v3; \
v3 = ROTL64(v3, 16); \
v3 ^= v2; \
v0 += v3; \
v3 = ROTL64(v3, 21); \
v3 ^= v0; \
v2 += v1; \
v1 = ROTL64(v1, 17); \
v1 ^= v2; \
v2 = ROTL64(v2, 32); \
} while (0) } while (0)
int crypto_shorthash_siphash24(unsigned char *out, const unsigned char *in, int
crypto_shorthash_siphash24(unsigned char *out, const unsigned char *in,
unsigned long long inlen, const unsigned char *k) unsigned long long inlen, const unsigned char *k)
{ {
/* "somepseudorandomlygeneratedbytes" */ /* "somepseudorandomlygeneratedbytes" */
u64 v0 = 0x736f6d6570736575ULL; uint64_t v0 = 0x736f6d6570736575ULL;
u64 v1 = 0x646f72616e646f6dULL; uint64_t v1 = 0x646f72616e646f6dULL;
u64 v2 = 0x6c7967656e657261ULL; uint64_t v2 = 0x6c7967656e657261ULL;
u64 v3 = 0x7465646279746573ULL; uint64_t v3 = 0x7465646279746573ULL;
u64 b; uint64_t b;
u64 k0 = LOAD64_LE( k ); uint64_t k0 = LOAD64_LE(k);
u64 k1 = LOAD64_LE( k + 8 ); uint64_t k1 = LOAD64_LE(k + 8);
u64 m; uint64_t m;
const u8 *end = in + inlen - ( inlen % sizeof( u64 ) ); const uint8_t *end = in + inlen - (inlen % sizeof(uint64_t));
const int left = inlen & 7; const int left = inlen & 7;
b = ( ( u64 )inlen ) << 56; b = ((uint64_t) inlen) << 56;
v3 ^= k1; v3 ^= k1;
v2 ^= k0; v2 ^= k0;
v1 ^= k1; v1 ^= k1;
v0 ^= k0; v0 ^= k0;
for ( ; in != end; in += 8 ) for (; in != end; in += 8) {
{
m = LOAD64_LE(in); m = LOAD64_LE(in);
v3 ^= m; v3 ^= m;
SIPROUND; SIPROUND;
SIPROUND; SIPROUND;
v0 ^= m; v0 ^= m;
} }
switch (left) {
switch( left ) case 7:
{ b |= ((uint64_t) in[6]) << 48;
case 7: b |= ( ( u64 )in[ 6] ) << 48; case 6:
case 6: b |= ( ( u64 )in[ 5] ) << 40; b |= ((uint64_t) in[5]) << 40;
case 5: b |= ( ( u64 )in[ 4] ) << 32; case 5:
case 4: b |= ( ( u64 )in[ 3] ) << 24; b |= ((uint64_t) in[4]) << 32;
case 3: b |= ( ( u64 )in[ 2] ) << 16; case 4:
case 2: b |= ( ( u64 )in[ 1] ) << 8; b |= ((uint64_t) in[3]) << 24;
case 1: b |= ( ( u64 )in[ 0] ); break; case 3:
case 0: break; b |= ((uint64_t) in[2]) << 16;
case 2:
b |= ((uint64_t) in[1]) << 8;
case 1:
b |= ((uint64_t) in[0]);
break;
case 0:
break;
} }
v3 ^= b; v3 ^= b;
SIPROUND; SIPROUND;
SIPROUND; SIPROUND;
@ -67,6 +77,6 @@ int crypto_shorthash_siphash24(unsigned char *out, const unsigned char *in,
SIPROUND; SIPROUND;
b = v0 ^ v1 ^ v2 ^ v3; b = v0 ^ v1 ^ v2 ^ v3;
STORE64_LE(out, b); STORE64_LE(out, b);
return 0; return 0;
} }