Use OpenSSL for digests

This commit is contained in:
Nik Bougalis
2015-10-13 11:58:53 -07:00
parent 97feec6b5e
commit 0e7c8ce554
5 changed files with 172 additions and 1 deletions

View File

@@ -3007,6 +3007,10 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\ripple\protocol\tests\digest_test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\protocol\tests\InnerObjectFormats.test.cpp"> <ClCompile Include="..\..\src\ripple\protocol\tests\InnerObjectFormats.test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>

View File

@@ -3726,6 +3726,9 @@
<ClCompile Include="..\..\src\ripple\protocol\tests\BuildInfo.test.cpp"> <ClCompile Include="..\..\src\ripple\protocol\tests\BuildInfo.test.cpp">
<Filter>ripple\protocol\tests</Filter> <Filter>ripple\protocol\tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\ripple\protocol\tests\digest_test.cpp">
<Filter>ripple\protocol\tests</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\protocol\tests\InnerObjectFormats.test.cpp"> <ClCompile Include="..\..\src\ripple\protocol\tests\InnerObjectFormats.test.cpp">
<Filter>ripple\protocol\tests</Filter> <Filter>ripple\protocol\tests</Filter>
</ClCompile> </ClCompile>

View File

@@ -173,7 +173,7 @@
// Uses OpenSSL instead of alternatives // Uses OpenSSL instead of alternatives
#ifndef RIPPLE_USE_OPENSSL #ifndef RIPPLE_USE_OPENSSL
#define RIPPLE_USE_OPENSSL 0 #define RIPPLE_USE_OPENSSL 1
#endif #endif
#endif #endif

View File

@@ -0,0 +1,163 @@
//------------------------------------------------------------------------------
/*
This file is part of rippled: https://github.com/ripple/rippled
Copyright (c) 2012, 2013 Ripple Labs Inc.
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.
*/
//==============================================================================
#include <BeastConfig.h>
#include <ripple/protocol/digest.h>
#include <beast/chrono/chrono_io.h>
#include <beast/random/rngfill.h>
#include <beast/random/xor_shift_engine.h>
#include <beast/unit_test/suite.h>
#include <algorithm>
#include <chrono>
#include <cmath>
#include <numeric>
#include <vector>
namespace ripple {
class digest_test : public beast::unit_test::suite
{
std::vector<uint256> dataset1;
template <class Hasher>
void test (char const* name)
{
using namespace std::chrono;
// Prime the cache
for (int i = 0; i != 4; i++)
{
for (auto const& x : dataset1)
{
Hasher h;
h (x.data (), x.size ());
auto r = static_cast<typename Hasher::result_type>(h);
}
}
std::array<nanoseconds, 128> results;
for (auto& result : results)
{
auto const start = high_resolution_clock::now ();
for (auto const& x : dataset1)
{
Hasher h;
h (x.data (), x.size ());
auto r = static_cast<typename Hasher::result_type>(h);
}
auto const d = high_resolution_clock::now () - start;
result = d;
}
log << " " << name << ":";
auto const sum = std::accumulate(
results.begin(), results.end(),
nanoseconds{0});
{
auto s = duration_cast<seconds>(sum);
auto ms = duration_cast<milliseconds>(sum) - s;
log <<
" Total Time = " << s.count() <<
"." << ms.count() << " seconds";
}
auto const mean = sum / results.size();
{
auto s = duration_cast<seconds>(mean);
auto ms = duration_cast<milliseconds>(mean) - s;
log <<
" Mean Time = " << s.count() <<
"." << ms.count() << " seconds";
}
std::vector<nanoseconds::rep> diff(results.size());
std::transform(
results.begin(), results.end(), diff.begin(),
[&mean](nanoseconds trial)
{
return (trial - mean).count();
});
auto const sq_sum = std::inner_product(
diff.begin(), diff.end(), diff.begin(), 0.0);
{
nanoseconds const stddev {
static_cast<nanoseconds::rep>(
std::sqrt(sq_sum / results.size()))
};
auto s = duration_cast<seconds>(stddev);
auto ms = duration_cast<milliseconds>(stddev) - s;
log <<
" Std Dev = " << s.count() <<
"." << ms.count() << " seconds";
}
}
public:
digest_test ()
{
beast::xor_shift_engine g(19207813);
std::uint8_t buf[32];
for (int i = 0; i < 1000000; i++)
{
beast::rngfill (buf, sizeof(buf), g);
dataset1.push_back (uint256::fromVoid (buf));
}
}
void testSHA512 ()
{
testcase ("SHA512");
test<openssl_ripemd160_hasher> ("OpenSSL");
test<beast::ripemd160_hasher> ("Beast");
pass ();
}
void testSHA256 ()
{
testcase ("SHA256");
test<openssl_sha256_hasher> ("OpenSSL");
test<beast::sha256_hasher> ("Beast");
pass ();
}
void testRIPEMD160 ()
{
testcase ("RIPEMD160");
test<openssl_ripemd160_hasher> ("OpenSSL");
test<beast::ripemd160_hasher> ("Beast");
pass ();
}
void run ()
{
testSHA512 ();
testSHA256 ();
testRIPEMD160 ();
}
};
BEAST_DEFINE_TESTSUITE_MANUAL(digest,ripple_data,ripple);
} // ripple

View File

@@ -64,6 +64,7 @@
#include <ripple/protocol/tests/BuildInfo.test.cpp> #include <ripple/protocol/tests/BuildInfo.test.cpp>
#include <ripple/protocol/tests/digest_test.cpp>
#include <ripple/protocol/tests/InnerObjectFormats.test.cpp> #include <ripple/protocol/tests/InnerObjectFormats.test.cpp>
#include <ripple/protocol/tests/IOUAmount.test.cpp> #include <ripple/protocol/tests/IOUAmount.test.cpp>
#include <ripple/protocol/tests/Issue.test.cpp> #include <ripple/protocol/tests/Issue.test.cpp>