comparison DEPENDENCIES/generic/include/boost/asio/ssl/impl/context.ipp @ 101:c530137014c0

Update Boost headers (1.58.0)

 //
 // ssl/impl/context.ipp
 // ~~~~~~~~~~~~~~~~~~~~
 //
 // Copyright (c) 2005 Voipster / Indrek dot Juhani at voipster dot com
-// Copyright (c) 2005-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2005-2015 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 

 };
 
 context::context(context::method m)
   : handle_(0)
 {
+  ::ERR_clear_error();
+
   switch (m)
   {
 #if defined(OPENSSL_NO_SSL2)
   case context::sslv2:
   case context::sslv2_client:

 }
 
 boost::system::error_code context::load_verify_file(
     const std::string& filename, boost::system::error_code& ec)
 {
+  ::ERR_clear_error();
+
   if (::SSL_CTX_load_verify_locations(handle_, filename.c_str(), 0) != 1)
   {
     ec = boost::system::error_code(
         static_cast<int>(::ERR_get_error()),
         boost::asio::error::get_ssl_category());

 }
 
 boost::system::error_code context::set_default_verify_paths(
     boost::system::error_code& ec)
 {
+  ::ERR_clear_error();
+
   if (::SSL_CTX_set_default_verify_paths(handle_) != 1)
   {
     ec = boost::system::error_code(
         static_cast<int>(::ERR_get_error()),
         boost::asio::error::get_ssl_category());

 }
 
 boost::system::error_code context::add_verify_path(
     const std::string& path, boost::system::error_code& ec)
 {
+  ::ERR_clear_error();
+
   if (::SSL_CTX_load_verify_locations(handle_, 0, path.c_str()) != 1)
   {
     ec = boost::system::error_code(
         static_cast<int>(::ERR_get_error()),
         boost::asio::error::get_ssl_category());

       ec = boost::asio::error::invalid_argument;
       return ec;
     }
   }
 
+  ::ERR_clear_error();
+
   if (::SSL_CTX_use_certificate_file(handle_, filename.c_str(), file_type) != 1)
   {
     ec = boost::system::error_code(
         static_cast<int>(::ERR_get_error()),
         boost::asio::error::get_ssl_category());

 }
 
 boost::system::error_code context::use_certificate_chain_file(
     const std::string& filename, boost::system::error_code& ec)
 {
+  ::ERR_clear_error();
+
   if (::SSL_CTX_use_certificate_chain_file(handle_, filename.c_str()) != 1)
   {
     ec = boost::system::error_code(
         static_cast<int>(::ERR_get_error()),
         boost::asio::error::get_ssl_category());

     {
     case context_base::asn1:
       evp_private_key.p = ::d2i_PrivateKey_bio(bio.p, 0);
       break;
     case context_base::pem:
-      evp_private_key.p = ::PEM_read_bio_PrivateKey(bio.p, 0, 0, 0);
+      evp_private_key.p = ::PEM_read_bio_PrivateKey(
+          bio.p, 0, handle_->default_passwd_callback,
+          handle_->default_passwd_callback_userdata);
       break;
     default:
       {
         ec = boost::asio::error::invalid_argument;
         return ec;

     {
     case context_base::asn1:
       rsa_private_key.p = ::d2i_RSAPrivateKey_bio(bio.p, 0);
       break;
     case context_base::pem:
-      rsa_private_key.p = ::PEM_read_bio_RSAPrivateKey(bio.p, 0, 0, 0);
+      rsa_private_key.p = ::PEM_read_bio_RSAPrivateKey(
+          bio.p, 0, handle_->default_passwd_callback,
+          handle_->default_passwd_callback_userdata);
       break;
     default:
       {
         ec = boost::asio::error::invalid_argument;
         return ec;

       ec = boost::asio::error::invalid_argument;
       return ec;
     }
   }
 
+  ::ERR_clear_error();
+
   if (::SSL_CTX_use_PrivateKey_file(handle_, filename.c_str(), file_type) != 1)
   {
     ec = boost::system::error_code(
         static_cast<int>(::ERR_get_error()),
         boost::asio::error::get_ssl_category());

       ec = boost::asio::error::invalid_argument;
       return ec;
     }
   }
 
+  ::ERR_clear_error();
+
   if (::SSL_CTX_use_RSAPrivateKey_file(
         handle_, filename.c_str(), file_type) != 1)
   {
     ec = boost::system::error_code(
         static_cast<int>(::ERR_get_error()),

 }
 
 boost::system::error_code context::use_tmp_dh(
     const const_buffer& dh, boost::system::error_code& ec)
 {
+  ::ERR_clear_error();
+
   bio_cleanup bio = { make_buffer_bio(dh) };
   if (bio.p)
   {
     return do_use_tmp_dh(bio.p, ec);
   }

 }
 
 boost::system::error_code context::use_tmp_dh_file(
     const std::string& filename, boost::system::error_code& ec)
 {
+  ::ERR_clear_error();
+
   bio_cleanup bio = { ::BIO_new_file(filename.c_str(), "r") };
   if (bio.p)
   {
     return do_use_tmp_dh(bio.p, ec);
   }