hash/siphash: add an (ugly) siphash128 implementation

This commit is contained in:
Danny Robson 2022-07-25 11:59:13 +10:00
parent c69a508757
commit 2e0f6c6923
3 changed files with 196 additions and 47 deletions

View File

@ -12,6 +12,8 @@
#include "../debug/assert.hpp"
#include "../endian.hpp"
#include <bit>
using cruft::hash::siphash;
@ -43,6 +45,19 @@ round (u64 v[4])
}
//-----------------------------------------------------------------------------
static void
compress (int const iterations, u64 state[4], u08 const data[8])
{
u64 word = cruft::readle<u64> (data);
state[3] ^= word;
for (int c = 0; c < iterations; ++c)
round (state);
state[0] ^= word;
}
///////////////////////////////////////////////////////////////////////////////
static
std::array<u64, 2>
@ -73,23 +88,35 @@ bytes_to_u64 (std::span<u08, 16> val)
///////////////////////////////////////////////////////////////////////////////
template <int C, int D>
siphash<C,D>::siphash (std::array<u64,2> _key) noexcept:
template <int CompressionsV, int FinalisationsV, int OutputV>
siphash<
CompressionsV,
FinalisationsV,
OutputV
>::siphash (std::array<u64,2> _key) noexcept:
m_key (_key)
{ ; }
//-----------------------------------------------------------------------------
template <int C, int D>
siphash<C, D>::siphash (std::span<u08, 16> _key) noexcept
template <int CompressionsV, int FinalisationsV, int OutputV>
siphash<
CompressionsV,
FinalisationsV,
OutputV
>::siphash (std::span<u08, 16> _key) noexcept
: siphash (bytes_to_u64 (_key))
{ ; }
///////////////////////////////////////////////////////////////////////////////
template <int C, int D>
typename siphash<C,D>::digest_t
siphash<C,D>::operator() (cruft::view<u08 const*> data) const noexcept
template <int CompressionsV, int FinalisationsV, int OutputV>
typename siphash<CompressionsV, FinalisationsV, OutputV>::digest_t
siphash<
CompressionsV,
FinalisationsV,
OutputV
>::operator() (cruft::view<u08 const*> data) const noexcept
{
// init
u64 state[4] = {
@ -99,45 +126,53 @@ siphash<C,D>::operator() (cruft::view<u08 const*> data) const noexcept
m_key[1] ^ INITIALISERS[3],
};
// update
auto cursor = data.begin ();
for ( ; data.end () - cursor >= 8; cursor += sizeof (u64)) {
auto word = readle<u64> (cursor);
if (OutputV == 16)
state[1] ^= 0xee;
state[3] ^= word;
for (int c = 0; c < C; ++c)
round (state);
state[0] ^= word;
}
// update
auto const tailsize = data.size() % 8;
auto cursor = data.begin ();
for (auto const last = data.begin () + data.size () - tailsize; cursor != last; cursor += sizeof (u64))
compress (compression_rounds, state, cursor);
// drain
union {
u64 d64 = 0;
u08 d08[8];
} accum;
if (cursor != data.cend ()) {
std::copy (cursor, data.cend (), std::begin (accum.d08));
cursor = data.cend ();
}
u08 remain[8] {};
memcpy (remain, cursor, tailsize);
cursor += tailsize;
CHECK_EQ (cursor, data.cend ());
// append the length
accum.d08[7] = data.size ();
state[3] ^= accum.d64;
for (int c = 0; c < C; ++c)
round (state);
state[0] ^= accum.d64;
// append the length
remain[7] = data.size ();
compress (compression_rounds, state, remain);
// finalisation
if constexpr (OutputV == 8)
state[2] ^= 0xff;
for (int d = 0; d < D; ++d)
else
state[2] ^= 0xee;
for (int d = 0; d < FinalisationsV; ++d)
round (state);
return state[0] ^ state[1] ^ state[2] ^ state[3];
auto const res0 = cruft::htol (state[0] ^ state[1] ^ state[2] ^ state[3]);
if constexpr (OutputV == 8) {
return std::bit_cast<digest_t> (res0);
} else {
state[1] ^= 0xdd;
for (int i = 0; i < FinalisationsV; ++i)
round (state);
auto const res1 = cruft::htol (state[0] ^ state[1] ^ state[2] ^ state[3]);
std::array<u08, 16> res;
memcpy (res.data () + 0, &res0, sizeof (res0));
memcpy (res.data () + 8, &res1, sizeof (res1));
return res;
}
}
///////////////////////////////////////////////////////////////////////////////
template class cruft::hash::siphash<2,4>;
template class cruft::hash::siphash<2,4, 8>;
template class cruft::hash::siphash<2,4, 16>;

View File

@ -15,20 +15,45 @@
#include <span>
namespace cruft::hash {
template <int CompressionsV = 2, int FinalisationsV = 4>
constexpr int SIPHASH_DEFAULT_COMPRESSIONS = 2;
constexpr int SIPHASH_DEFAULT_FINALISATIONS = 4;
template <
int CompressionsV = SIPHASH_DEFAULT_COMPRESSIONS,
int FinalisationsV = SIPHASH_DEFAULT_FINALISATIONS,
int OutV = 8
>
class siphash {
public:
using digest_t = u64;
static_assert (OutV == 8 or OutV == 16);
static constexpr auto output_length = OutV;
static constexpr auto compression_rounds = CompressionsV;
static constexpr auto finalisation_rounds = FinalisationsV;
using digest_t = std::array<u08, output_length>;
siphash (std::array<u64, 2>) noexcept;
siphash (std::span<u08, 16>) noexcept;
digest_t operator() (cruft::view<u08 const*> data) const noexcept;
private:
std::array<u64,2> m_key;
std::array<u64, 2> m_key;
};
};
template <
int CompressionsV = SIPHASH_DEFAULT_COMPRESSIONS,
int FinalisationsV = SIPHASH_DEFAULT_FINALISATIONS
>
using siphash64 = siphash<CompressionsV, FinalisationsV, 8>;
template <
int CompressionsV = SIPHASH_DEFAULT_COMPRESSIONS,
int FinalisationsV = SIPHASH_DEFAULT_FINALISATIONS
>
using siphash128 = siphash<CompressionsV, FinalisationsV, 16>;
}

View File

@ -1,4 +1,3 @@
#include "tap.hpp"
#include "hash/siphash.hpp"
@ -8,7 +7,7 @@
/// Test vectors from the reference implementation:
/// https://github.com/veorq/SipHash
static constexpr u08
VECTORS128[][8] = {
VECTORS64[][8] = {
/* 0 */ { 0x31, 0x0e, 0x0e, 0xdd, 0x47, 0xdb, 0x6f, 0x72, },
/* 1 */ { 0xfd, 0x67, 0xdc, 0x93, 0xc5, 0x39, 0xf8, 0x74, },
/* 2 */ { 0x5a, 0x4f, 0xa9, 0xd9, 0x09, 0x80, 0x6c, 0x0d, },
@ -76,6 +75,76 @@ VECTORS128[][8] = {
};
//-----------------------------------------------------------------------------
static constexpr u08
VECTORS128[][16] = {
/* 0 */ { 0xa3, 0x81, 0x7f, 0x04, 0xba, 0x25, 0xa8, 0xe6, 0x6d, 0xf6, 0x72, 0x14, 0xc7, 0x55, 0x02, 0x93, },
/* 1 */ { 0xda, 0x87, 0xc1, 0xd8, 0x6b, 0x99, 0xaf, 0x44, 0x34, 0x76, 0x59, 0x11, 0x9b, 0x22, 0xfc, 0x45, },
/* 2 */ { 0x81, 0x77, 0x22, 0x8d, 0xa4, 0xa4, 0x5d, 0xc7, 0xfc, 0xa3, 0x8b, 0xde, 0xf6, 0x0a, 0xff, 0xe4, },
/* 3 */ { 0x9c, 0x70, 0xb6, 0x0c, 0x52, 0x67, 0xa9, 0x4e, 0x5f, 0x33, 0xb6, 0xb0, 0x29, 0x85, 0xed, 0x51, },
/* 4 */ { 0xf8, 0x81, 0x64, 0xc1, 0x2d, 0x9c, 0x8f, 0xaf, 0x7d, 0x0f, 0x6e, 0x7c, 0x7b, 0xcd, 0x55, 0x79, },
/* 5 */ { 0x13, 0x68, 0x87, 0x59, 0x80, 0x77, 0x6f, 0x88, 0x54, 0x52, 0x7a, 0x07, 0x69, 0x0e, 0x96, 0x27, },
/* 6 */ { 0x14, 0xee, 0xca, 0x33, 0x8b, 0x20, 0x86, 0x13, 0x48, 0x5e, 0xa0, 0x30, 0x8f, 0xd7, 0xa1, 0x5e, },
/* 7 */ { 0xa1, 0xf1, 0xeb, 0xbe, 0xd8, 0xdb, 0xc1, 0x53, 0xc0, 0xb8, 0x4a, 0xa6, 0x1f, 0xf0, 0x82, 0x39, },
/* 8 */ { 0x3b, 0x62, 0xa9, 0xba, 0x62, 0x58, 0xf5, 0x61, 0x0f, 0x83, 0xe2, 0x64, 0xf3, 0x14, 0x97, 0xb4, },
/* 9 */ { 0x26, 0x44, 0x99, 0x06, 0x0a, 0xd9, 0xba, 0xab, 0xc4, 0x7f, 0x8b, 0x02, 0xbb, 0x6d, 0x71, 0xed, },
/* 10 */ { 0x00, 0x11, 0x0d, 0xc3, 0x78, 0x14, 0x69, 0x56, 0xc9, 0x54, 0x47, 0xd3, 0xf3, 0xd0, 0xfb, 0xba, },
/* 11 */ { 0x01, 0x51, 0xc5, 0x68, 0x38, 0x6b, 0x66, 0x77, 0xa2, 0xb4, 0xdc, 0x6f, 0x81, 0xe5, 0xdc, 0x18, },
/* 12 */ { 0xd6, 0x26, 0xb2, 0x66, 0x90, 0x5e, 0xf3, 0x58, 0x82, 0x63, 0x4d, 0xf6, 0x85, 0x32, 0xc1, 0x25, },
/* 13 */ { 0x98, 0x69, 0xe2, 0x47, 0xe9, 0xc0, 0x8b, 0x10, 0xd0, 0x29, 0x93, 0x4f, 0xc4, 0xb9, 0x52, 0xf7, },
/* 14 */ { 0x31, 0xfc, 0xef, 0xac, 0x66, 0xd7, 0xde, 0x9c, 0x7e, 0xc7, 0x48, 0x5f, 0xe4, 0x49, 0x49, 0x02, },
/* 15 */ { 0x54, 0x93, 0xe9, 0x99, 0x33, 0xb0, 0xa8, 0x11, 0x7e, 0x08, 0xec, 0x0f, 0x97, 0xcf, 0xc3, 0xd9, },
/* 16 */ { 0x6e, 0xe2, 0xa4, 0xca, 0x67, 0xb0, 0x54, 0xbb, 0xfd, 0x33, 0x15, 0xbf, 0x85, 0x23, 0x05, 0x77, },
/* 17 */ { 0x47, 0x3d, 0x06, 0xe8, 0x73, 0x8d, 0xb8, 0x98, 0x54, 0xc0, 0x66, 0xc4, 0x7a, 0xe4, 0x77, 0x40, },
/* 18 */ { 0xa4, 0x26, 0xe5, 0xe4, 0x23, 0xbf, 0x48, 0x85, 0x29, 0x4d, 0xa4, 0x81, 0xfe, 0xae, 0xf7, 0x23, },
/* 19 */ { 0x78, 0x01, 0x77, 0x31, 0xcf, 0x65, 0xfa, 0xb0, 0x74, 0xd5, 0x20, 0x89, 0x52, 0x51, 0x2e, 0xb1, },
/* 20 */ { 0x9e, 0x25, 0xfc, 0x83, 0x3f, 0x22, 0x90, 0x73, 0x3e, 0x93, 0x44, 0xa5, 0xe8, 0x38, 0x39, 0xeb, },
/* 21 */ { 0x56, 0x8e, 0x49, 0x5a, 0xbe, 0x52, 0x5a, 0x21, 0x8a, 0x22, 0x14, 0xcd, 0x3e, 0x07, 0x1d, 0x12, },
/* 22 */ { 0x4a, 0x29, 0xb5, 0x45, 0x52, 0xd1, 0x6b, 0x9a, 0x46, 0x9c, 0x10, 0x52, 0x8e, 0xff, 0x0a, 0xae, },
/* 23 */ { 0xc9, 0xd1, 0x84, 0xdd, 0xd5, 0xa9, 0xf5, 0xe0, 0xcf, 0x8c, 0xe2, 0x9a, 0x9a, 0xbf, 0x69, 0x1c, },
/* 24 */ { 0x2d, 0xb4, 0x79, 0xae, 0x78, 0xbd, 0x50, 0xd8, 0x88, 0x2a, 0x8a, 0x17, 0x8a, 0x61, 0x32, 0xad, },
/* 25 */ { 0x8e, 0xce, 0x5f, 0x04, 0x2d, 0x5e, 0x44, 0x7b, 0x50, 0x51, 0xb9, 0xea, 0xcb, 0x8d, 0x8f, 0x6f, },
/* 26 */ { 0x9c, 0x0b, 0x53, 0xb4, 0xb3, 0xc3, 0x07, 0xe8, 0x7e, 0xae, 0xe0, 0x86, 0x78, 0x14, 0x1f, 0x66, },
/* 27 */ { 0xab, 0xf2, 0x48, 0xaf, 0x69, 0xa6, 0xea, 0xe4, 0xbf, 0xd3, 0xeb, 0x2f, 0x12, 0x9e, 0xeb, 0x94, },
/* 28 */ { 0x06, 0x64, 0xda, 0x16, 0x68, 0x57, 0x4b, 0x88, 0xb9, 0x35, 0xf3, 0x02, 0x73, 0x58, 0xae, 0xf4, },
/* 29 */ { 0xaa, 0x4b, 0x9d, 0xc4, 0xbf, 0x33, 0x7d, 0xe9, 0x0c, 0xd4, 0xfd, 0x3c, 0x46, 0x7c, 0x6a, 0xb7, },
/* 30 */ { 0xea, 0x5c, 0x7f, 0x47, 0x1f, 0xaf, 0x6b, 0xde, 0x2b, 0x1a, 0xd7, 0xd4, 0x68, 0x6d, 0x22, 0x87, },
/* 31 */ { 0x29, 0x39, 0xb0, 0x18, 0x32, 0x23, 0xfa, 0xfc, 0x17, 0x23, 0xde, 0x4f, 0x52, 0xc4, 0x3d, 0x35, },
/* 32 */ { 0x7c, 0x39, 0x56, 0xca, 0x5e, 0xea, 0xfc, 0x3e, 0x36, 0x3e, 0x9d, 0x55, 0x65, 0x46, 0xeb, 0x68, },
/* 33 */ { 0x77, 0xc6, 0x07, 0x71, 0x46, 0xf0, 0x1c, 0x32, 0xb6, 0xb6, 0x9d, 0x5f, 0x4e, 0xa9, 0xff, 0xcf, },
/* 34 */ { 0x37, 0xa6, 0x98, 0x6c, 0xb8, 0x84, 0x7e, 0xdf, 0x09, 0x25, 0xf0, 0xf1, 0x30, 0x9b, 0x54, 0xde, },
/* 35 */ { 0xa7, 0x05, 0xf0, 0xe6, 0x9d, 0xa9, 0xa8, 0xf9, 0x07, 0x24, 0x1a, 0x2e, 0x92, 0x3c, 0x8c, 0xc8, },
/* 36 */ { 0x3d, 0xc4, 0x7d, 0x1f, 0x29, 0xc4, 0x48, 0x46, 0x1e, 0x9e, 0x76, 0xed, 0x90, 0x4f, 0x67, 0x11, },
/* 37 */ { 0x0d, 0x62, 0xbf, 0x01, 0xe6, 0xfc, 0x0e, 0x1a, 0x0d, 0x3c, 0x47, 0x51, 0xc5, 0xd3, 0x69, 0x2b, },
/* 38 */ { 0x8c, 0x03, 0x46, 0x8b, 0xca, 0x7c, 0x66, 0x9e, 0xe4, 0xfd, 0x5e, 0x08, 0x4b, 0xbe, 0xe7, 0xb5, },
/* 39 */ { 0x52, 0x8a, 0x5b, 0xb9, 0x3b, 0xaf, 0x2c, 0x9c, 0x44, 0x73, 0xcc, 0xe5, 0xd0, 0xd2, 0x2b, 0xd9, },
/* 40 */ { 0xdf, 0x6a, 0x30, 0x1e, 0x95, 0xc9, 0x5d, 0xad, 0x97, 0xae, 0x0c, 0xc8, 0xc6, 0x91, 0x3b, 0xd8, },
/* 41 */ { 0x80, 0x11, 0x89, 0x90, 0x2c, 0x85, 0x7f, 0x39, 0xe7, 0x35, 0x91, 0x28, 0x5e, 0x70, 0xb6, 0xdb, },
/* 42 */ { 0xe6, 0x17, 0x34, 0x6a, 0xc9, 0xc2, 0x31, 0xbb, 0x36, 0x50, 0xae, 0x34, 0xcc, 0xca, 0x0c, 0x5b, },
/* 43 */ { 0x27, 0xd9, 0x34, 0x37, 0xef, 0xb7, 0x21, 0xaa, 0x40, 0x18, 0x21, 0xdc, 0xec, 0x5a, 0xdf, 0x89, },
/* 44 */ { 0x89, 0x23, 0x7d, 0x9d, 0xed, 0x9c, 0x5e, 0x78, 0xd8, 0xb1, 0xc9, 0xb1, 0x66, 0xcc, 0x73, 0x42, },
/* 45 */ { 0x4a, 0x6d, 0x80, 0x91, 0xbf, 0x5e, 0x7d, 0x65, 0x11, 0x89, 0xfa, 0x94, 0xa2, 0x50, 0xb1, 0x4c, },
/* 46 */ { 0x0e, 0x33, 0xf9, 0x60, 0x55, 0xe7, 0xae, 0x89, 0x3f, 0xfc, 0x0e, 0x3d, 0xcf, 0x49, 0x29, 0x02, },
/* 47 */ { 0xe6, 0x1c, 0x43, 0x2b, 0x72, 0x0b, 0x19, 0xd1, 0x8e, 0xc8, 0xd8, 0x4b, 0xdc, 0x63, 0x15, 0x1b, },
/* 48 */ { 0xf7, 0xe5, 0xae, 0xf5, 0x49, 0xf7, 0x82, 0xcf, 0x37, 0x90, 0x55, 0xa6, 0x08, 0x26, 0x9b, 0x16, },
/* 49 */ { 0x43, 0x8d, 0x03, 0x0f, 0xd0, 0xb7, 0xa5, 0x4f, 0xa8, 0x37, 0xf2, 0xad, 0x20, 0x1a, 0x64, 0x03, },
/* 50 */ { 0xa5, 0x90, 0xd3, 0xee, 0x4f, 0xbf, 0x04, 0xe3, 0x24, 0x7e, 0x0d, 0x27, 0xf2, 0x86, 0x42, 0x3f, },
/* 51 */ { 0x5f, 0xe2, 0xc1, 0xa1, 0x72, 0xfe, 0x93, 0xc4, 0xb1, 0x5c, 0xd3, 0x7c, 0xae, 0xf9, 0xf5, 0x38, },
/* 52 */ { 0x2c, 0x97, 0x32, 0x5c, 0xbd, 0x06, 0xb3, 0x6e, 0xb2, 0x13, 0x3d, 0xd0, 0x8b, 0x3a, 0x01, 0x7c, },
/* 53 */ { 0x92, 0xc8, 0x14, 0x22, 0x7a, 0x6b, 0xca, 0x94, 0x9f, 0xf0, 0x65, 0x9f, 0x00, 0x2a, 0xd3, 0x9e, },
/* 54 */ { 0xdc, 0xe8, 0x50, 0x11, 0x0b, 0xd8, 0x32, 0x8c, 0xfb, 0xd5, 0x08, 0x41, 0xd6, 0x91, 0x1d, 0x87, },
/* 55 */ { 0x67, 0xf1, 0x49, 0x84, 0xc7, 0xda, 0x79, 0x12, 0x48, 0xe3, 0x2b, 0xb5, 0x92, 0x25, 0x83, 0xda, },
/* 56 */ { 0x19, 0x38, 0xf2, 0xcf, 0x72, 0xd5, 0x4e, 0xe9, 0x7e, 0x94, 0x16, 0x6f, 0xa9, 0x1d, 0x2a, 0x36, },
/* 57 */ { 0x74, 0x48, 0x1e, 0x96, 0x46, 0xed, 0x49, 0xfe, 0x0f, 0x62, 0x24, 0x30, 0x16, 0x04, 0x69, 0x8e, },
/* 58 */ { 0x57, 0xfc, 0xa5, 0xde, 0x98, 0xa9, 0xd6, 0xd8, 0x00, 0x64, 0x38, 0xd0, 0x58, 0x3d, 0x8a, 0x1d, },
/* 59 */ { 0x9f, 0xec, 0xde, 0x1c, 0xef, 0xdc, 0x1c, 0xbe, 0xd4, 0x76, 0x36, 0x74, 0xd9, 0x57, 0x53, 0x59, },
/* 60 */ { 0xe3, 0x04, 0x0c, 0x00, 0xeb, 0x28, 0xf1, 0x53, 0x66, 0xca, 0x73, 0xcb, 0xd8, 0x72, 0xe7, 0x40, },
/* 61 */ { 0x76, 0x97, 0x00, 0x9a, 0x6a, 0x83, 0x1d, 0xfe, 0xcc, 0xa9, 0x1c, 0x59, 0x93, 0x67, 0x0f, 0x7a, },
/* 62 */ { 0x58, 0x53, 0x54, 0x23, 0x21, 0xf5, 0x67, 0xa0, 0x05, 0xd5, 0x47, 0xa4, 0xf0, 0x47, 0x59, 0xbd, },
/* 63 */ { 0x51, 0x50, 0xd1, 0x77, 0x2f, 0x50, 0x83, 0x4a, 0x50, 0x3e, 0x06, 0x9a, 0x97, 0x3f, 0xbd, 0x7c, },
};
///////////////////////////////////////////////////////////////////////////////
int
main ()
@ -90,13 +159,33 @@ main ()
for (int i = 0; i < std::ssize (dat); ++i) {
dat[i] = i;
u64 expected = 0;
for (int j = 0; j < 8; ++j)
expected |= u64 (VECTORS128[i][j]) << u64(j * 8);
cruft::hash::siphash<2,4> h (key);
auto const computed = h ({dat, i});
tap.expect_eq (computed, expected, "iteration {}", i);
bool const success = std::equal (
computed.begin (),
computed.end (),
std::begin (VECTORS64[i]),
std::end (VECTORS64[i])
);
tap.expect (success, "u64 iteration {}", i);
}
for (int i = 0; i < std::ssize (dat); ++i) {
dat[i] = i;
cruft::hash::siphash<2,4,16> h (key);
auto const computed = h ({dat, i});
bool const success = std::equal (
computed.begin (),
computed.end (),
std::begin (VECTORS128[i]),
std::end (VECTORS128[i])
);
tap.expect (success, "u128 iteration {}", i);
}
return tap.status ();