Remove unused 'old Beast' code (RIPD-1652)

This commit is contained in:
Nik Bougalis
2020-02-01 10:33:16 -08:00
committed by Manoj doshi
parent d224d7e404
commit 172ead8221
5 changed files with 0 additions and 133 deletions

View File

@@ -788,7 +788,6 @@ else ()
src/test/beast/beast_PropertyStream_test.cpp
src/test/beast/beast_Zero_test.cpp
src/test/beast/beast_abstract_clock_test.cpp
src/test/beast/beast_asio_error_test.cpp
src/test/beast/beast_basic_seconds_clock_test.cpp
src/test/beast/beast_io_latency_probe_test.cpp
src/test/beast/define_print.cpp

View File

@@ -1,81 +0,0 @@
//------------------------------------------------------------------------------
/*
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_ASIO_SSL_ERROR_H_INCLUDED
#define BEAST_ASIO_SSL_ERROR_H_INCLUDED
// The first two includes must come first to work around boost 1.62 asio header bugs
#ifdef _MSC_VER
# include <winsock2.h>
#endif
#include <boost/asio/ssl/detail/openssl_types.hpp>
#include <boost/asio.hpp>
//#include <boost/asio/error.hpp> // Causes error with WinSock.h
#include <boost/asio/ssl/error.hpp>
#include <boost/lexical_cast.hpp>
namespace beast {
/** Returns a human readable message if the error code is SSL related. */
template<class = void>
std::string
error_message_with_ssl(boost::system::error_code const& ec)
{
std::string error;
if (ec.category() == boost::asio::error::get_ssl_category())
{
error = " ("
+ boost::lexical_cast<std::string>(ERR_GET_LIB (ec.value ()))
+ ","
+ boost::lexical_cast<std::string>(ERR_GET_FUNC (ec.value ()))
+ ","
+ boost::lexical_cast<std::string>(ERR_GET_REASON (ec.value ()))
+ ") ";
// This buffer must be at least 120 bytes, most examples use 256.
// https://www.openssl.org/docs/crypto/ERR_error_string.html
char buf[256];
::ERR_error_string_n(ec.value (), buf, sizeof(buf));
error += buf;
}
else
{
error = ec.message();
}
return error;
}
/** Returns `true` if the error code is a SSL "short read." */
inline
bool
is_short_read(boost::system::error_code const& ec)
{
#ifdef SSL_R_SHORT_READ
return (ec.category() == boost::asio::error::get_ssl_category())
&& (ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ);
#else
return false;
#endif
}
} // beast
#endif

View File

@@ -24,7 +24,6 @@
#include <ripple/server/Session.h>
#include <ripple/server/impl/io_list.h>
#include <ripple/beast/net/IPAddressConversion.h>
#include <ripple/beast/asio/ssl_error.h> // for is_short_read?
#include <boost/beast/core/stream_traits.hpp>
#include <boost/beast/http/read.hpp>
#include <boost/beast/http/message.hpp>

View File

@@ -1,49 +0,0 @@
//------------------------------------------------------------------------------
/*
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.
*/
//==============================================================================
#include <ripple/beast/asio/ssl_error.h>
#include <ripple/beast/unit_test.h>
#include <string>
namespace beast {
class error_test : public unit_test::suite
{
public:
void run() override
{
{
boost::system::error_code ec =
boost::system::error_code (335544539,
boost::asio::error::get_ssl_category ());
std::string s = beast::error_message_with_ssl(ec);
// strip away last part of the error message since
// it can vary with openssl versions and/or compile
// flags
auto const lastColon = s.find_last_of(':');
if (lastColon != s.npos)
s = s.substr(0, lastColon);
BEAST_EXPECT(s == " (20,0,219) error:140000DB:SSL routines:SSL routines");
}
}
};
BEAST_DEFINE_TESTSUITE(error,asio,beast);
} // beast

View File

@@ -20,7 +20,6 @@
#include <test/beast/aged_associative_container_test.cpp>
#include <test/beast/beast_abstract_clock_test.cpp>
#include <test/beast/beast_asio_error_test.cpp>
#include <test/beast/beast_basic_seconds_clock_test.cpp>
#include <test/beast/beast_io_latency_probe_test.cpp>
#include <test/beast/beast_CurrentThreadName_test.cpp>