| 1 | Index: asio/ssl/impl/context.ipp
|
|---|
| 2 | ===================================================================
|
|---|
| 3 | --- asio/ssl/impl/context.ipp (revision 86799)
|
|---|
| 4 | +++ asio/ssl/impl/context.ipp (working copy)
|
|---|
| 5 | @@ -87,7 +87,15 @@
|
|---|
| 6 | handle_ = ::SSL_CTX_new(::SSLv2_server_method());
|
|---|
| 7 | break;
|
|---|
| 8 | #endif // defined(OPENSSL_NO_SSL2)
|
|---|
| 9 | +#if defined(OPENSSL_NO_SSL3)
|
|---|
| 10 | case context::sslv3:
|
|---|
| 11 | + case context::sslv3_client:
|
|---|
| 12 | + case context::sslv3_server:
|
|---|
| 13 | + boost::asio::detail::throw_error(
|
|---|
| 14 | + boost::asio::error::invalid_argument, "context");
|
|---|
| 15 | + break;
|
|---|
| 16 | +#else // defined(OPENSSL_NO_SSL3)
|
|---|
| 17 | + case context::sslv3:
|
|---|
| 18 | handle_ = ::SSL_CTX_new(::SSLv3_method());
|
|---|
| 19 | break;
|
|---|
| 20 | case context::sslv3_client:
|
|---|
| 21 | @@ -96,6 +104,7 @@
|
|---|
| 22 | case context::sslv3_server:
|
|---|
| 23 | handle_ = ::SSL_CTX_new(::SSLv3_server_method());
|
|---|
| 24 | break;
|
|---|
| 25 | +#endif // defined(OPENSSL_NO_SSL3)
|
|---|
| 26 | case context::tlsv1:
|
|---|
| 27 | handle_ = ::SSL_CTX_new(::TLSv1_method());
|
|---|
| 28 | break;
|
|---|
| 29 | Index: asio/ssl/old/detail/openssl_context_service.hpp
|
|---|
| 30 | ===================================================================
|
|---|
| 31 | --- asio/ssl/old/detail/openssl_context_service.hpp (revision 86799)
|
|---|
| 32 | +++ asio/ssl/old/detail/openssl_context_service.hpp (working copy)
|
|---|
| 33 | @@ -85,7 +85,14 @@
|
|---|
| 34 | impl = ::SSL_CTX_new(::SSLv2_server_method());
|
|---|
| 35 | break;
|
|---|
| 36 | #endif // defined(OPENSSL_NO_SSL2)
|
|---|
| 37 | +#if defined(OPENSSL_NO_SSL3)
|
|---|
| 38 | case context_base::sslv3:
|
|---|
| 39 | + case context_base::sslv3_client:
|
|---|
| 40 | + case context_base::sslv3_server:
|
|---|
| 41 | + boost::asio::detail::throw_error(boost::asio::error::invalid_argument);
|
|---|
| 42 | + break;
|
|---|
| 43 | +#else // defined(OPENSSL_NO_SSL3)
|
|---|
| 44 | + case context_base::sslv3:
|
|---|
| 45 | impl = ::SSL_CTX_new(::SSLv3_method());
|
|---|
| 46 | break;
|
|---|
| 47 | case context_base::sslv3_client:
|
|---|
| 48 | @@ -94,6 +101,7 @@
|
|---|
| 49 | case context_base::sslv3_server:
|
|---|
| 50 | impl = ::SSL_CTX_new(::SSLv3_server_method());
|
|---|
| 51 | break;
|
|---|
| 52 | +#endif // defined(OPENSSL_NO_SSL3)
|
|---|
| 53 | case context_base::tlsv1:
|
|---|
| 54 | impl = ::SSL_CTX_new(::TLSv1_method());
|
|---|
| 55 | break;
|
|---|
