Move hardened_hash to container/

This commit is contained in:
Vinnie Falco
2014-03-25 12:18:36 -07:00
parent d64f5a387c
commit 6b467e7e59
7 changed files with 22 additions and 13 deletions

View File

@@ -23,3 +23,4 @@
#include "tests/aged_associative_container.test.cpp"
#include "tests/buffer_view.test.cpp"
#include "tests/hardened_hash.test.cpp"

View File

@@ -0,0 +1,168 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
//==============================================================================
#ifndef BEAST_CONTAINER_HARDENED_HASH_H_INCLUDED
#define BEAST_CONTAINER_HARDENED_HASH_H_INCLUDED
#include "../utility/is_call_possible.h"
#include "../utility/noexcept.h"
#include <functional>
#include <mutex>
#include <random>
#include "../cxx14/utility.h" // <utility>
// When set to 1, makes the seed per-process instead
// of per default-constructed instance of hardened_hash
//
#ifndef BEAST_NO_HARDENED_HASH_INSTANCE_SEED
# ifdef __GLIBCXX__
# define BEAST_NO_HARDENED_HASH_INSTANCE_SEED 1
# else
# define BEAST_NO_HARDENED_HASH_INSTANCE_SEED 0
# endif
#endif
namespace beast {
namespace detail {
template <class Result>
class hardened_hash_base
{
public:
typedef Result result_type;
private:
static
result_type
next_seed() noexcept
{
static std::mutex mutex;
static std::random_device rng;
static std::mt19937_64 gen (rng());
std::lock_guard <std::mutex> lock (mutex);
std::uniform_int_distribution <result_type> dist;
result_type value;
for(;;)
{
value = dist (gen);
// VFALCO Do we care if 0 is picked?
if (value != 0)
break;
}
return value;
}
#if BEAST_NO_HARDENED_HASH_INSTANCE_SEED
protected:
result_type
seed() const noexcept
{
static result_type const value (next_seed());
return value;
}
#else
protected:
hardened_hash_base() noexcept
: m_seed (next_seed())
{
}
result_type
seed() const noexcept
{
return m_seed;
}
private:
// VFALCO Should seed be per process or per hash function?
result_type m_seed;
#endif
};
}
/** A std compatible hash adapter that resists adversarial inputs.
For this to work, one of the following must exist:
* A member function of `T` called `hash_combine` with
this signature:
@code
void hash_combine (std::size_t&) const noexcept;
@endcode
* A free function called `hash_combine`, found via argument
dependent lookup, callable with this signature:
@code
void hash_combine (std::size_t, T const& t) noexcept;
@endcode
*/
template <class T>
class hardened_hash
: public detail::hardened_hash_base <std::size_t>
{
public:
typedef T argument_type;
using detail::hardened_hash_base <std::size_t>::result_type;
private:
BEAST_DEFINE_IS_CALL_POSSIBLE(has_hash_combine,hash_combine);
typedef detail::hardened_hash_base <std::size_t> base;
// Called when hash_combine is a member function
result_type
operator() (argument_type const& key, std::true_type) const noexcept
{
result_type result (base::seed());
key.hash_combine (result);
return result;
}
result_type
operator() (argument_type const& key, std::false_type) const noexcept
{
result_type result (base::seed());
hash_combine (result, key);
return result;
}
public:
hardened_hash() = default;
result_type
operator() (argument_type const& key) const noexcept
{
return operator() (key, std::integral_constant <bool,
has_hash_combine <T,void(result_type&)>::value>());
}
};
}
#endif

View File

@@ -0,0 +1,313 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
//==============================================================================
// MODULES: ../../crypto/impl/Sha256.cpp
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../../BeastConfig.h"
#endif
#include "../hardened_hash.h"
#include "../../unit_test/suite.h"
#include "../../crypto/Sha256.h"
#include <boost/functional/hash.hpp>
#include <array>
#include <cstdint>
#include <iomanip>
#include <functional>
#include <unordered_map>
#include <unordered_set>
namespace beast {
namespace detail {
template <class T>
class test_user_type_member
{
private:
T t;
public:
explicit test_user_type_member (T const& t_ = T())
: t (t_)
{
}
void
hash_combine (std::size_t& seed) const noexcept
{
boost::hash_combine (seed, t);
}
};
template <class T>
class test_user_type_free
{
private:
T t;
public:
explicit test_user_type_free (T const& t_ = T())
: t (t_)
{
}
friend
void
hash_combine (std::size_t& seed,
test_user_type_free const& v) noexcept
{
boost::hash_combine (seed, v.t);
}
};
} // detail
} // beast
//------------------------------------------------------------------------------
namespace beast {
namespace detail {
template <class T>
using test_hardened_unordered_set =
std::unordered_set <T, hardened_hash <T>>;
template <class T>
using test_hardened_unordered_map =
std::unordered_map <T, int, hardened_hash <T>>;
template <class T>
using test_hardened_unordered_multiset =
std::unordered_multiset <T, hardened_hash <T>>;
template <class T>
using test_hardened_unordered_multimap =
std::unordered_multimap <T, int, hardened_hash <T>>;
} // beast
template <std::size_t Bits, class UInt = std::uint64_t>
class unsigned_integer
{
private:
static_assert (std::is_integral<UInt>::value &&
std::is_unsigned <UInt>::value,
"UInt must be an unsigned integral type");
static_assert (Bits%(8*sizeof(UInt))==0,
"Bits must be a multiple of 8*sizeof(UInt)");
static_assert (Bits >= (8*sizeof(UInt)),
"Bits must be at least 8*sizeof(UInt)");
static std::size_t const size = Bits/(8*sizeof(UInt));
std::array <UInt, size> m_vec;
public:
typedef UInt value_type;
static std::size_t const bits = Bits;
static std::size_t const bytes = bits / 8;
template <class Int>
static
unsigned_integer
from_number (Int v)
{
unsigned_integer result;
for (std::size_t i (1); i < size; ++i)
result.m_vec [i] = 0;
result.m_vec[0] = v;
return result;
}
void*
data() noexcept
{
return &m_vec[0];
}
void const*
data() const noexcept
{
return &m_vec[0];
}
void
hash_combine (std::size_t& seed) const noexcept
{
for (std::size_t i (0); i < size; ++i)
boost::hash_combine (seed, m_vec[i]);
}
friend
std::ostream&
operator<< (std::ostream& s, unsigned_integer const& v)
{
for (std::size_t i (0); i < size; ++i)
s <<
std::hex <<
std::setfill ('0') <<
std::setw (2*sizeof(UInt)) <<
v.m_vec[i]
;
return s;
}
};
typedef unsigned_integer <256, std::size_t> sha256_t;
static_assert (sha256_t::bits == 256,
"sha256_t must have 256 bits");
} // beast
//------------------------------------------------------------------------------
namespace beast {
class hardened_hash_test
: public unit_test::suite
{
public:
template <class T>
void
check ()
{
T t{};
hardened_hash <T>() (t);
pass();
}
template <template <class T> class U>
void
check_user_type()
{
check <U <bool>> ();
check <U <char>> ();
check <U <signed char>> ();
check <U <unsigned char>> ();
// These cause trouble for boost
//check <U <char16_t>> ();
//check <U <char32_t>> ();
check <U <wchar_t>> ();
check <U <short>> ();
check <U <unsigned short>> ();
check <U <int>> ();
check <U <unsigned int>> ();
check <U <long>> ();
check <U <long long>> ();
check <U <unsigned long>> ();
check <U <unsigned long long>> ();
check <U <float>> ();
check <U <double>> ();
check <U <long double>> ();
}
template <template <class T> class C >
void
check_container()
{
{
C <detail::test_user_type_member <std::string>> c;
}
pass();
{
C <detail::test_user_type_free <std::string>> c;
}
pass();
}
void
test_user_types()
{
testcase ("user types");
check_user_type <detail::test_user_type_member> ();
check_user_type <detail::test_user_type_free> ();
}
void
test_containers()
{
testcase ("containers");
check_container <detail::test_hardened_unordered_set>();
check_container <detail::test_hardened_unordered_map>();
check_container <detail::test_hardened_unordered_multiset>();
check_container <detail::test_hardened_unordered_multimap>();
}
void
run ()
{
test_user_types();
test_containers();
}
};
class hardened_hash_sha256_test
: public unit_test::suite
{
public:
void
testSHA256()
{
testcase ("sha256");
log <<
"sizeof(std::size_t) == " << sizeof(std::size_t);
hardened_hash <sha256_t> h;
for (int i = 0; i < 100; ++i)
{
sha256_t v (sha256_t::from_number (i));
Sha256::digest_type d;
Sha256::hash (v.data(), sha256_t::bytes, d);
sha256_t d_;
memcpy (d_.data(), d.data(), sha256_t::bytes);
std::size_t result (h (d_));
log <<
"i=" << std::setw(2) << i << " " <<
"sha256=0x" << d_ << " " <<
"hash=0x" <<
std::setfill ('0') <<
std::setw (2*sizeof(std::size_t)) << result
;
pass();
}
}
void
run ()
{
testSHA256();
}
};
BEAST_DEFINE_TESTSUITE(hardened_hash,utility,beast);
BEAST_DEFINE_TESTSUITE_MANUAL(hardened_hash_sha256,utility,beast);
} // beast