summaryrefslogtreecommitdiff
path: root/boost/asio/ssl/impl/rfc2818_verification.ipp
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2019-12-05 15:11:01 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2019-12-05 15:11:01 +0900
commit3fdc3e5ee96dca5b11d1694975a65200787eab86 (patch)
tree5c1733853892b8397d67706fa453a9bd978d2102 /boost/asio/ssl/impl/rfc2818_verification.ipp
parent88e602c57797660ebe0f9e15dbd64c1ff16dead3 (diff)
downloadboost-3fdc3e5ee96dca5b11d1694975a65200787eab86.tar.gz
boost-3fdc3e5ee96dca5b11d1694975a65200787eab86.tar.bz2
boost-3fdc3e5ee96dca5b11d1694975a65200787eab86.zip
Imported Upstream version 1.66.0upstream/1.66.0
Diffstat (limited to 'boost/asio/ssl/impl/rfc2818_verification.ipp')
-rw-r--r--boost/asio/ssl/impl/rfc2818_verification.ipp18
1 files changed, 6 insertions, 12 deletions
diff --git a/boost/asio/ssl/impl/rfc2818_verification.ipp b/boost/asio/ssl/impl/rfc2818_verification.ipp
index 7f22806735..d759ce567c 100644
--- a/boost/asio/ssl/impl/rfc2818_verification.ipp
+++ b/boost/asio/ssl/impl/rfc2818_verification.ipp
@@ -17,13 +17,11 @@
#include <boost/asio/detail/config.hpp>
-#if !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-# include <cctype>
-# include <cstring>
-# include <boost/asio/ip/address.hpp>
-# include <boost/asio/ssl/rfc2818_verification.hpp>
-# include <boost/asio/ssl/detail/openssl_types.hpp>
-#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL)
+#include <cctype>
+#include <cstring>
+#include <boost/asio/ip/address.hpp>
+#include <boost/asio/ssl/rfc2818_verification.hpp>
+#include <boost/asio/ssl/detail/openssl_types.hpp>
#include <boost/asio/detail/push_options.hpp>
@@ -31,8 +29,6 @@ namespace boost {
namespace asio {
namespace ssl {
-#if !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-
bool rfc2818_verification::operator()(
bool preverified, verify_context& ctx) const
{
@@ -50,7 +46,7 @@ bool rfc2818_verification::operator()(
// Try converting the host name to an address. If it is an address then we
// need to look for an IP address in the certificate rather than a host name.
boost::system::error_code ec;
- ip::address address = ip::address::from_string(host_, ec);
+ ip::address address = ip::make_address(host_, ec);
bool is_address = !ec;
X509* cert = X509_STORE_CTX_get_current_cert(ctx.native_handle());
@@ -157,8 +153,6 @@ bool rfc2818_verification::match_pattern(const char* pattern,
return p == p_end && !*h;
}
-#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-
} // namespace ssl
} // namespace asio
} // namespace boost