Commit07aa9fd

committed

Merge pull request#481 from trent33/0.11-devel

Peer verification using OpenSSL environment variables

2 parents7287548 +a3102e9 commit07aa9fdCopy full SHA for 07aa9fd

File tree

-1

lines changed

boost/network/protocol/http/client
- connection
  - ssl_delegate.ipp
- options.hpp

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,10 @@ void boost::network::http::impl::ssl_delegate::connect(`
`34`	`34`	`context_->load_verify_file(*certificate_filename_);`
`35`	`35`	`if (verify_path_) context_->add_verify_path(*verify_path_);`
`36`	`36`	`}else {`
`37`		`-if (always_verify_peer_)`
	`37`	`+if (always_verify_peer_) {`
`38`	`38`	`context_->set_verify_mode(asio::ssl::context::verify_peer);`
	`39`	`+ context_->set_default_verify_paths();// use openssl default verify paths. uses openssl environment variables SSL_CERT_DIR, SSL_CERT_FILE`
	`40`	`+}`
`39`	`41`	`else`
`40`	`42`	`context_->set_verify_mode(asio::ssl::context::verify_none);`
`41`	`43`	`}`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,11 @@ struct client_options {`
`95`	`95`	`return *this;`
`96`	`96`	`}`
`97`	`97`
	`98`	`+ client_options&always_verify_peer(bool v) {`
	`99`	`+ always_verify_peer_ = v;`
	`100`	`+return *this;`
	`101`	`+ }`
	`102`	`+`
`98`	`103`	`client_options&timeout(int v) {`
`99`	`104`	`timeout_ = v;`
`100`	`105`	`return *this;`

Comments

(0)