diff options
Diffstat (limited to 'boost/asio/ssl/rfc2818_verification.hpp')
| -rw-r--r-- | boost/asio/ssl/rfc2818_verification.hpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/boost/asio/ssl/rfc2818_verification.hpp b/boost/asio/ssl/rfc2818_verification.hpp index 21b0bca317..62919d79bf 100644 --- a/boost/asio/ssl/rfc2818_verification.hpp +++ b/boost/asio/ssl/rfc2818_verification.hpp @@ -17,11 +17,9 @@ #include <boost/asio/detail/config.hpp> -#if !defined(BOOST_ASIO_ENABLE_OLD_SSL) -# include <string> -# include <boost/asio/ssl/detail/openssl_types.hpp> -# include <boost/asio/ssl/verify_context.hpp> -#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL) +#include <string> +#include <boost/asio/ssl/detail/openssl_types.hpp> +#include <boost/asio/ssl/verify_context.hpp> #include <boost/asio/detail/push_options.hpp> @@ -29,8 +27,6 @@ namespace boost { namespace asio { namespace ssl { -#if !defined(BOOST_ASIO_ENABLE_OLD_SSL) - /// Verifies a certificate against a hostname according to the rules described /// in RFC 2818. /** @@ -47,9 +43,9 @@ namespace ssl { * ctx.set_default_verify_paths(); * * // Open a socket and connect it to the remote host. - * boost::asio::io_service io_service; - * ssl_socket sock(io_service, ctx); - * tcp::resolver resolver(io_service); + * boost::asio::io_context io_context; + * ssl_socket sock(io_context, ctx); + * tcp::resolver resolver(io_context); * tcp::resolver::query query("host.name", "https"); * boost::asio::connect(sock.lowest_layer(), resolver.resolve(query)); * sock.lowest_layer().set_option(tcp::no_delay(true)); @@ -87,8 +83,6 @@ private: std::string host_; }; -#endif // defined(BOOST_ASIO_ENABLE_OLD_SSL) - } // namespace ssl } // namespace asio } // namespace boost |