mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd synced 2024-11-13 01:20:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed few SSL errors

Browse Source
This commit is contained in:
orignal 2015-11-23 14:48:56 -05:00
parent c9d03a8094
commit 942b699bb9
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
I2PControl.cpp
View File

@ -39,9 +39,13 @@ namespace client
} }
if (!boost::filesystem::exists (path / I2P_CONTROL_KEY_FILE) || if (!boost::filesystem::exists (path / I2P_CONTROL_KEY_FILE) ||
!boost::filesystem::exists (path / I2P_CONTROL_CERT_FILE)) !boost::filesystem::exists (path / I2P_CONTROL_CERT_FILE))
{
// create new certificate // create new certificate
CreateCertificate (); CreateCertificate ();
m_SSLContext.use_certificate_chain_file ((path / I2P_CONTROL_CERT_FILE).string ()); LogPrint (eLogInfo, "I2PControl certificates created");
}
m_SSLContext.set_options (boost::asio::ssl::context::default_workarounds | boost::asio::ssl::context::no_sslv2 | boost::asio::ssl::context::single_dh_use);
m_SSLContext.use_certificate_file ((path / I2P_CONTROL_CERT_FILE).string (), boost::asio::ssl::context::pem);
m_SSLContext.use_private_key_file ((path / I2P_CONTROL_KEY_FILE).string (), boost::asio::ssl::context::pem); m_SSLContext.use_private_key_file ((path / I2P_CONTROL_KEY_FILE).string (), boost::asio::ssl::context::pem);
// handlers // handlers
@ -131,14 +135,14 @@ namespace client
{ {
LogPrint (eLogInfo, "New I2PControl request from ", socket->lowest_layer ().remote_endpoint ()); LogPrint (eLogInfo, "New I2PControl request from ", socket->lowest_layer ().remote_endpoint ());
boost::system::error_code ec; boost::system::error_code ec;
socket->handshake (boost::asio::ssl::stream_base::client, ec); socket->handshake (boost::asio::ssl::stream_base::server, ec);
if (!ec) if (!ec)
{ {
std::this_thread::sleep_for (std::chrono::milliseconds(5)); std::this_thread::sleep_for (std::chrono::milliseconds(5));
ReadRequest (socket); ReadRequest (socket);
} }
else else
LogPrint (eLogError, "I2PControl handshake error: ", ecode.message ()); LogPrint (eLogError, "I2PControl handshake error: ", ec.message ());
} }
else else
LogPrint (eLogError, "I2PControl accept error: ", ecode.message ()); LogPrint (eLogError, "I2PControl accept error: ", ecode.message ());
@ -440,7 +444,8 @@ namespace client
void I2PControlService::CreateCertificate () void I2PControlService::CreateCertificate ()
{ {
EVP_PKEY * pkey = EVP_PKEY_new (); EVP_PKEY * pkey = EVP_PKEY_new ();
RSA * rsa = RSA_generate_key (4096, RSA_F4, NULL, NULL); RSA * rsa = RSA_new ();
RSA_generate_key_ex (rsa, 4096, i2p::crypto::rsae, NULL);
if (rsa) if (rsa)
{ {
EVP_PKEY_assign_RSA (pkey, rsa); EVP_PKEY_assign_RSA (pkey, rsa);
@ -478,8 +483,8 @@ namespace client
LogPrint (eLogError, "Can't open file ", filename); LogPrint (eLogError, "Can't open file ", filename);
X509_free (x509); X509_free (x509);
RSA_free (rsa);
} }
else
LogPrint (eLogError, "Couldn't create RSA key for certificate"); LogPrint (eLogError, "Couldn't create RSA key for certificate");
EVP_PKEY_free (pkey); EVP_PKEY_free (pkey);
} }