mirror of
https://github.com/strongswan/strongswan.git
synced 2025-10-06 00:00:47 -04:00
Adding chunk_mac() which calculates a 64-bit MAC using SipHash-2-4
This commit is contained in:
Tobias Brunner
parent
4e67f19528
commit
1255de5a20
@ -73,6 +73,115 @@ START_TEST(test_base64)
|
||||
}
|
||||
END_TEST
|
||||
|
||||
/*******************************************************************************
|
||||
* test for chunk_mac(), i.e. SipHash-2-4
|
||||
*/
|
||||
|
||||
/**
|
||||
* SipHash-2-4 output with
|
||||
* k = 00 01 02 ...
|
||||
* and
|
||||
* in = (empty string)
|
||||
* in = 00 (1 byte)
|
||||
* in = 00 01 (2 bytes)
|
||||
* in = 00 01 02 (3 bytes)
|
||||
* ...
|
||||
* in = 00 01 02 ... 3e (63 bytes)
|
||||
*/
|
||||
static const u_char sip_vectors[64][8] =
|
||||
{
|
||||
{ 0x31, 0x0e, 0x0e, 0xdd, 0x47, 0xdb, 0x6f, 0x72, },
|
||||
{ 0xfd, 0x67, 0xdc, 0x93, 0xc5, 0x39, 0xf8, 0x74, },
|
||||
{ 0x5a, 0x4f, 0xa9, 0xd9, 0x09, 0x80, 0x6c, 0x0d, },
|
||||
{ 0x2d, 0x7e, 0xfb, 0xd7, 0x96, 0x66, 0x67, 0x85, },
|
||||
{ 0xb7, 0x87, 0x71, 0x27, 0xe0, 0x94, 0x27, 0xcf, },
|
||||
{ 0x8d, 0xa6, 0x99, 0xcd, 0x64, 0x55, 0x76, 0x18, },
|
||||
{ 0xce, 0xe3, 0xfe, 0x58, 0x6e, 0x46, 0xc9, 0xcb, },
|
||||
{ 0x37, 0xd1, 0x01, 0x8b, 0xf5, 0x00, 0x02, 0xab, },
|
||||
{ 0x62, 0x24, 0x93, 0x9a, 0x79, 0xf5, 0xf5, 0x93, },
|
||||
{ 0xb0, 0xe4, 0xa9, 0x0b, 0xdf, 0x82, 0x00, 0x9e, },
|
||||
{ 0xf3, 0xb9, 0xdd, 0x94, 0xc5, 0xbb, 0x5d, 0x7a, },
|
||||
{ 0xa7, 0xad, 0x6b, 0x22, 0x46, 0x2f, 0xb3, 0xf4, },
|
||||
{ 0xfb, 0xe5, 0x0e, 0x86, 0xbc, 0x8f, 0x1e, 0x75, },
|
||||
{ 0x90, 0x3d, 0x84, 0xc0, 0x27, 0x56, 0xea, 0x14, },
|
||||
{ 0xee, 0xf2, 0x7a, 0x8e, 0x90, 0xca, 0x23, 0xf7, },
|
||||
{ 0xe5, 0x45, 0xbe, 0x49, 0x61, 0xca, 0x29, 0xa1, },
|
||||
{ 0xdb, 0x9b, 0xc2, 0x57, 0x7f, 0xcc, 0x2a, 0x3f, },
|
||||
{ 0x94, 0x47, 0xbe, 0x2c, 0xf5, 0xe9, 0x9a, 0x69, },
|
||||
{ 0x9c, 0xd3, 0x8d, 0x96, 0xf0, 0xb3, 0xc1, 0x4b, },
|
||||
{ 0xbd, 0x61, 0x79, 0xa7, 0x1d, 0xc9, 0x6d, 0xbb, },
|
||||
{ 0x98, 0xee, 0xa2, 0x1a, 0xf2, 0x5c, 0xd6, 0xbe, },
|
||||
{ 0xc7, 0x67, 0x3b, 0x2e, 0xb0, 0xcb, 0xf2, 0xd0, },
|
||||
{ 0x88, 0x3e, 0xa3, 0xe3, 0x95, 0x67, 0x53, 0x93, },
|
||||
{ 0xc8, 0xce, 0x5c, 0xcd, 0x8c, 0x03, 0x0c, 0xa8, },
|
||||
{ 0x94, 0xaf, 0x49, 0xf6, 0xc6, 0x50, 0xad, 0xb8, },
|
||||
{ 0xea, 0xb8, 0x85, 0x8a, 0xde, 0x92, 0xe1, 0xbc, },
|
||||
{ 0xf3, 0x15, 0xbb, 0x5b, 0xb8, 0x35, 0xd8, 0x17, },
|
||||
{ 0xad, 0xcf, 0x6b, 0x07, 0x63, 0x61, 0x2e, 0x2f, },
|
||||
{ 0xa5, 0xc9, 0x1d, 0xa7, 0xac, 0xaa, 0x4d, 0xde, },
|
||||
{ 0x71, 0x65, 0x95, 0x87, 0x66, 0x50, 0xa2, 0xa6, },
|
||||
{ 0x28, 0xef, 0x49, 0x5c, 0x53, 0xa3, 0x87, 0xad, },
|
||||
{ 0x42, 0xc3, 0x41, 0xd8, 0xfa, 0x92, 0xd8, 0x32, },
|
||||
{ 0xce, 0x7c, 0xf2, 0x72, 0x2f, 0x51, 0x27, 0x71, },
|
||||
{ 0xe3, 0x78, 0x59, 0xf9, 0x46, 0x23, 0xf3, 0xa7, },
|
||||
{ 0x38, 0x12, 0x05, 0xbb, 0x1a, 0xb0, 0xe0, 0x12, },
|
||||
{ 0xae, 0x97, 0xa1, 0x0f, 0xd4, 0x34, 0xe0, 0x15, },
|
||||
{ 0xb4, 0xa3, 0x15, 0x08, 0xbe, 0xff, 0x4d, 0x31, },
|
||||
{ 0x81, 0x39, 0x62, 0x29, 0xf0, 0x90, 0x79, 0x02, },
|
||||
{ 0x4d, 0x0c, 0xf4, 0x9e, 0xe5, 0xd4, 0xdc, 0xca, },
|
||||
{ 0x5c, 0x73, 0x33, 0x6a, 0x76, 0xd8, 0xbf, 0x9a, },
|
||||
{ 0xd0, 0xa7, 0x04, 0x53, 0x6b, 0xa9, 0x3e, 0x0e, },
|
||||
{ 0x92, 0x59, 0x58, 0xfc, 0xd6, 0x42, 0x0c, 0xad, },
|
||||
{ 0xa9, 0x15, 0xc2, 0x9b, 0xc8, 0x06, 0x73, 0x18, },
|
||||
{ 0x95, 0x2b, 0x79, 0xf3, 0xbc, 0x0a, 0xa6, 0xd4, },
|
||||
{ 0xf2, 0x1d, 0xf2, 0xe4, 0x1d, 0x45, 0x35, 0xf9, },
|
||||
{ 0x87, 0x57, 0x75, 0x19, 0x04, 0x8f, 0x53, 0xa9, },
|
||||
{ 0x10, 0xa5, 0x6c, 0xf5, 0xdf, 0xcd, 0x9a, 0xdb, },
|
||||
{ 0xeb, 0x75, 0x09, 0x5c, 0xcd, 0x98, 0x6c, 0xd0, },
|
||||
{ 0x51, 0xa9, 0xcb, 0x9e, 0xcb, 0xa3, 0x12, 0xe6, },
|
||||
{ 0x96, 0xaf, 0xad, 0xfc, 0x2c, 0xe6, 0x66, 0xc7, },
|
||||
{ 0x72, 0xfe, 0x52, 0x97, 0x5a, 0x43, 0x64, 0xee, },
|
||||
{ 0x5a, 0x16, 0x45, 0xb2, 0x76, 0xd5, 0x92, 0xa1, },
|
||||
{ 0xb2, 0x74, 0xcb, 0x8e, 0xbf, 0x87, 0x87, 0x0a, },
|
||||
{ 0x6f, 0x9b, 0xb4, 0x20, 0x3d, 0xe7, 0xb3, 0x81, },
|
||||
{ 0xea, 0xec, 0xb2, 0xa3, 0x0b, 0x22, 0xa8, 0x7f, },
|
||||
{ 0x99, 0x24, 0xa4, 0x3c, 0xc1, 0x31, 0x57, 0x24, },
|
||||
{ 0xbd, 0x83, 0x8d, 0x3a, 0xaf, 0xbf, 0x8d, 0xb7, },
|
||||
{ 0x0b, 0x1a, 0x2a, 0x32, 0x65, 0xd5, 0x1a, 0xea, },
|
||||
{ 0x13, 0x50, 0x79, 0xa3, 0x23, 0x1c, 0xe6, 0x60, },
|
||||
{ 0x93, 0x2b, 0x28, 0x46, 0xe4, 0xd7, 0x06, 0x66, },
|
||||
{ 0xe1, 0x91, 0x5f, 0x5c, 0xb1, 0xec, 0xa4, 0x6c, },
|
||||
{ 0xf3, 0x25, 0x96, 0x5c, 0xa1, 0x6d, 0x62, 0x9f, },
|
||||
{ 0x57, 0x5f, 0xf2, 0x8e, 0x60, 0x38, 0x1b, 0xe5, },
|
||||
{ 0x72, 0x45, 0x06, 0xeb, 0x4c, 0x32, 0x8a, 0x95, }
|
||||
};
|
||||
|
||||
START_TEST(test_chunk_mac)
|
||||
{
|
||||
chunk_t in;
|
||||
u_char key[16];
|
||||
u_int64_t out;
|
||||
int i, count;
|
||||
|
||||
count = countof(sip_vectors);
|
||||
in = chunk_alloca(count);
|
||||
|
||||
for (i = 0; i < 16; ++i)
|
||||
{
|
||||
key[i] = i;
|
||||
}
|
||||
|
||||
for (i = 0; i < count; ++i)
|
||||
{
|
||||
in.ptr[i] = i;
|
||||
in.len = i;
|
||||
out = chunk_mac(in, key);
|
||||
fail_unless(memeq(&out, sip_vectors[i], 8),
|
||||
"test vector failed for %d bytes", i);
|
||||
}
|
||||
}
|
||||
END_TEST
|
||||
|
||||
Suite *chunk_suite_create()
|
||||
{
|
||||
Suite *s;
|
||||
@ -84,5 +193,9 @@ Suite *chunk_suite_create()
|
||||
tcase_add_test(tc, test_base64);
|
||||
suite_add_tcase(s, tc);
|
||||
|
||||
tc = tcase_create("chunk_mac");
|
||||
tcase_add_test(tc, test_chunk_mac);
|
||||
suite_add_tcase(s, tc);
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2008-2009 Tobias Brunner
|
||||
* Copyright (C) 2008-2013 Tobias Brunner
|
||||
* Copyright (C) 2005-2006 Martin Willi
|
||||
* Copyright (C) 2005 Jan Hutter
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
@ -578,6 +578,122 @@ bool chunk_printable(chunk_t chunk, chunk_t *sane, char replace)
|
||||
return printable;
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper functions for chunk_mac()
|
||||
*/
|
||||
static inline u_int64_t sipget(u_char *in)
|
||||
{
|
||||
u_int64_t v = 0;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 64; i += 8, ++in)
|
||||
{
|
||||
v |= ((u_int64_t)*in) << i;
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
static inline u_int64_t siprotate(u_int64_t v, int shift)
|
||||
{
|
||||
return (v << shift) | (v >> (64 - shift));
|
||||
}
|
||||
|
||||
static inline void sipround(u_int64_t *v0, u_int64_t *v1, u_int64_t *v2,
|
||||
u_int64_t *v3)
|
||||
{
|
||||
*v0 += *v1;
|
||||
*v1 = siprotate(*v1, 13);
|
||||
*v1 ^= *v0;
|
||||
*v0 = siprotate(*v0, 32);
|
||||
|
||||
*v2 += *v3;
|
||||
*v3 = siprotate(*v3, 16);
|
||||
*v3 ^= *v2;
|
||||
|
||||
*v2 += *v1;
|
||||
*v1 = siprotate(*v1, 17);
|
||||
*v1 ^= *v2;
|
||||
*v2 = siprotate(*v2, 32);
|
||||
|
||||
*v0 += *v3;
|
||||
*v3 = siprotate(*v3, 21);
|
||||
*v3 ^= *v0;
|
||||
}
|
||||
|
||||
static inline void sipcompress(u_int64_t *v0, u_int64_t *v1, u_int64_t *v2,
|
||||
u_int64_t *v3, u_int64_t m)
|
||||
{
|
||||
*v3 ^= m;
|
||||
sipround(v0, v1, v2, v3);
|
||||
sipround(v0, v1, v2, v3);
|
||||
*v0 ^= m;
|
||||
}
|
||||
|
||||
static inline u_int64_t siplast(size_t len, u_char *pos)
|
||||
{
|
||||
u_int64_t b;
|
||||
int rem = len & 7;
|
||||
|
||||
b = ((u_int64_t)len) << 56;
|
||||
switch (rem)
|
||||
{
|
||||
case 7:
|
||||
b |= ((u_int64_t)pos[6]) << 48;
|
||||
case 6:
|
||||
b |= ((u_int64_t)pos[5]) << 40;
|
||||
case 5:
|
||||
b |= ((u_int64_t)pos[4]) << 32;
|
||||
case 4:
|
||||
b |= ((u_int64_t)pos[3]) << 24;
|
||||
case 3:
|
||||
b |= ((u_int64_t)pos[2]) << 16;
|
||||
case 2:
|
||||
b |= ((u_int64_t)pos[1]) << 8;
|
||||
case 1:
|
||||
b |= ((u_int64_t)pos[0]);
|
||||
break;
|
||||
case 0:
|
||||
break;
|
||||
}
|
||||
return b;
|
||||
}
|
||||
|
||||
/**
|
||||
* Described in header.
|
||||
*/
|
||||
u_int64_t chunk_mac(chunk_t chunk, u_char *key)
|
||||
{
|
||||
u_int64_t v0, v1, v2, v3, k0, k1, m;
|
||||
size_t len = chunk.len;
|
||||
u_char *pos = chunk.ptr, *end;
|
||||
|
||||
end = chunk.ptr + len - (len % 8);
|
||||
|
||||
k0 = sipget(key);
|
||||
k1 = sipget(key + 8);
|
||||
|
||||
v0 = k0 ^ 0x736f6d6570736575ULL;
|
||||
v1 = k1 ^ 0x646f72616e646f6dULL;
|
||||
v2 = k0 ^ 0x6c7967656e657261ULL;
|
||||
v3 = k1 ^ 0x7465646279746573ULL;
|
||||
|
||||
/* compression with c = 2 */
|
||||
for (; pos != end; pos += 8)
|
||||
{
|
||||
m = sipget(pos);
|
||||
sipcompress(&v0, &v1, &v2, &v3, m);
|
||||
}
|
||||
sipcompress(&v0, &v1, &v2, &v3, siplast(len, pos));
|
||||
|
||||
/* finalization with d = 4 */
|
||||
v2 ^= 0xff;
|
||||
sipround(&v0, &v1, &v2, &v3);
|
||||
sipround(&v0, &v1, &v2, &v3);
|
||||
sipround(&v0, &v1, &v2, &v3);
|
||||
sipround(&v0, &v1, &v2, &v3);
|
||||
return v0 ^ v1 ^ v2 ^ v3;
|
||||
}
|
||||
|
||||
/**
|
||||
* Described in header.
|
||||
*
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2008-2009 Tobias Brunner
|
||||
* Copyright (C) 2008-2013 Tobias Brunner
|
||||
* Copyright (C) 2005-2008 Martin Willi
|
||||
* Copyright (C) 2005 Jan Hutter
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
@ -301,7 +301,7 @@ bool chunk_printable(chunk_t chunk, chunk_t *sane, char replace);
|
||||
|
||||
/**
|
||||
* Computes a 32 bit hash of the given chunk.
|
||||
* Note: This hash is only intended for hash tables not for cryptographic purposes.
|
||||
* @note This hash is only intended for hash tables not for cryptographic purposes.
|
||||
*/
|
||||
u_int32_t chunk_hash(chunk_t chunk);
|
||||
|
||||
@ -310,6 +310,20 @@ u_int32_t chunk_hash(chunk_t chunk);
|
||||
*/
|
||||
u_int32_t chunk_hash_inc(chunk_t chunk, u_int32_t hash);
|
||||
|
||||
/**
|
||||
* Computes a quick MAC from the given chunk and key using SipHash.
|
||||
*
|
||||
* The key must have a length of 128-bit (16 bytes).
|
||||
*
|
||||
* @note While SipHash has strong features using it for cryptographic purposes
|
||||
* is not recommended (in particular because of the rather short output size).
|
||||
*
|
||||
* @param chunk data to process
|
||||
* @param key key to use
|
||||
* @return MAC for given input and key
|
||||
*/
|
||||
u_int64_t chunk_mac(chunk_t chunk, u_char *key);
|
||||
|
||||
/**
|
||||
* printf hook function for chunk_t.
|
||||
*
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user