Skip to content

fix: Do not override custom SSL context certificate validation settings #650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vustym wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Do not override custom SSL context certificate validation settings #650

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/asio_service.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,17 +1132,21 @@ class asio_rpc_client
#ifdef SSL_LIBRARY_NOT_FOUND
assert(0); // Should not reach here.
#else
if (_impl->get_options().skip_verification_) {
ssl_socket_.set_verify_mode(asio::ssl::verify_none);
} else {
ssl_socket_.set_verify_mode(asio::ssl::verify_peer);
}
// Custom SSL context will likely have the verification
// mode and callback configured. Do not override that.
if (!_impl->get_options().ssl_context_provider_client_) {
if (_impl->get_options().skip_verification_) {
ssl_socket_.set_verify_mode(asio::ssl::verify_none);
} else {
ssl_socket_.set_verify_mode(asio::ssl::verify_peer);
}

ssl_socket_.set_verify_callback
( std::bind( &asio_rpc_client::verify_certificate,
this,
std::placeholders::_1,
std::placeholders::_2 ) );
ssl_socket_.set_verify_callback
( std::bind( &asio_rpc_client::verify_certificate,
this,
std::placeholders::_1,
std::placeholders::_2 ) );
}
#endif
}
p_tr( "asio client created: %p. %s",
Expand Down