forked from boostorg/beast
Fix SHA1 calculation
This commit is contained in:
1 parent
63aef56942
commit
79913e6759
6 files changed
+85
-57
No files matched your search
@@ -29,6 +29,7 @@ add_executable (core-tests
|
||||
write_streambuf.cpp
|
||||
detail/base64.cpp
|
||||
detail/empty_base_optimization.cpp
|
||||
detail/sha1.cpp
|
||||
)
|
||||
|
||||
if (NOT WIN32)
|
||||
|
||||
@@ -32,6 +32,7 @@ unit-test core-tests :
|
||||
write_streambuf.cpp
|
||||
detail/base64.cpp
|
||||
detail/empty_base_optimization.cpp
|
||||
detail/sha1.cpp
|
||||
;
|
||||
|
||||
unit-test http-tests :
|
||||
|
||||
+11
-23
@@ -1,37 +1,25 @@
|
||||
//------------------------------------------------------------------------------
|
||||
/*
|
||||
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.
|
||||
*/
|
||||
//==============================================================================
|
||||
//
|
||||
// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
//
|
||||
|
||||
#include <beast/detail/base64.hpp>
|
||||
#include <beast/detail/unit_test/suite.hpp>
|
||||
|
||||
namespace beast {
|
||||
namespace test {
|
||||
namespace detail {
|
||||
|
||||
class base64_test : public detail::unit_test::suite
|
||||
class base64_test : public beast::detail::unit_test::suite
|
||||
{
|
||||
public:
|
||||
void
|
||||
check (std::string const& in, std::string const& out)
|
||||
{
|
||||
auto const encoded = detail::base64_encode (in);
|
||||
auto const encoded = base64_encode (in);
|
||||
expect (encoded == out);
|
||||
expect (detail::base64_decode (encoded) == in);
|
||||
expect (base64_decode (encoded) == in);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -49,6 +37,6 @@ public:
|
||||
|
||||
BEAST_DEFINE_TESTSUITE(base64,core,beast);
|
||||
|
||||
} // test
|
||||
} // detail
|
||||
} // beast
|
||||
|
||||
@@ -1,32 +1,15 @@
|
||||
//------------------------------------------------------------------------------
|
||||
/*
|
||||
This file is part of Beast: https://github.com/vinniefalco/Beast
|
||||
Copyright 2014, Howard Hinnant <howard.hinnant@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.
|
||||
*/
|
||||
//==============================================================================
|
||||
|
||||
#if BEAST_INCLUDE_BEASTCONFIG
|
||||
#include <BeastConfig.h>
|
||||
#endif
|
||||
//
|
||||
// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
//
|
||||
|
||||
#include <beast/detail/empty_base_optimization.hpp>
|
||||
|
||||
#include <beast/detail/unit_test/suite.hpp>
|
||||
|
||||
namespace beast {
|
||||
namespace test {
|
||||
namespace detail {
|
||||
|
||||
class empty_base_optimization_test
|
||||
: public beast::detail::unit_test::suite
|
||||
@@ -34,9 +17,9 @@ class empty_base_optimization_test
|
||||
public:
|
||||
template <class T>
|
||||
class test1
|
||||
: private detail::empty_base_optimization<T>
|
||||
: private empty_base_optimization<T>
|
||||
{
|
||||
using Base = detail::empty_base_optimization<T>;
|
||||
using Base = empty_base_optimization<T>;
|
||||
void* m_p;
|
||||
public:
|
||||
explicit test1 (T const& t)
|
||||
@@ -105,5 +88,5 @@ public:
|
||||
|
||||
BEAST_DEFINE_TESTSUITE(empty_base_optimization,core,beast);
|
||||
|
||||
} // test
|
||||
} // detail
|
||||
} // beast
|
||||
@@ -0,0 +1,56 @@
|
||||
//
|
||||
// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
//
|
||||
|
||||
#include <beast/detail/sha1.hpp>
|
||||
#include <beast/detail/unit_test/suite.hpp>
|
||||
#include <boost/algorithm/hex.hpp>
|
||||
#include <array>
|
||||
|
||||
namespace beast {
|
||||
namespace detail {
|
||||
|
||||
class sha1_test : public beast::detail::unit_test::suite
|
||||
{
|
||||
public:
|
||||
void
|
||||
check(std::string const& message, std::string const& answer)
|
||||
{
|
||||
using digest_type =
|
||||
std::array<std::uint8_t, sha1_context::digest_size>;
|
||||
digest_type digest;
|
||||
if(! expect(boost::algorithm::unhex(
|
||||
answer, digest.begin()) == digest.end()))
|
||||
return;
|
||||
sha1_context ctx;
|
||||
digest_type result;
|
||||
init(ctx);
|
||||
update(ctx, message.data(), message.size());
|
||||
finish(ctx, result.data());
|
||||
expect(result == digest);
|
||||
}
|
||||
|
||||
void
|
||||
run()
|
||||
{
|
||||
// http://www.di-mgt.com.au/sha_testvectors.html
|
||||
//
|
||||
check("abc",
|
||||
"a9993e36" "4706816a" "ba3e2571" "7850c26c" "9cd0d89d");
|
||||
check("",
|
||||
"da39a3ee" "5e6b4b0d" "3255bfef" "95601890" "afd80709");
|
||||
check("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
|
||||
"84983e44" "1c3bd26e" "baae4aa1" "f95129e5" "e54670f1");
|
||||
check("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
|
||||
"a49b2446" "a02c645b" "f419f995" "b6709125" "3a04a259");
|
||||
}
|
||||
};
|
||||
|
||||
BEAST_DEFINE_TESTSUITE(sha1,core,beast);
|
||||
|
||||
} // test
|
||||
} // beast
|
||||
|
||||
Reference in new issue
Block a user