Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Bnet: Support password protected private keys

Browse Source
This commit is contained in:
Shauren
2023-07-26 20:59:15 +02:00
parent fb7bf0bfec
commit f94e341a03
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/bnetserver/Server/SslContext.cpp
View File

@@ -16,8 +16,8 @@
*/
#include "SslContext.h"
#include "Log.h"
#include "Config.h"
#include "Log.h"
bool Battlenet::SslContext::Initialize()
{
@@ -33,7 +33,12 @@ bool Battlenet::SslContext::Initialize()
std::string certificateChainFile = sConfigMgr->GetStringDefault("CertificatesFile", "./bnetserver.cert.pem");
std::string privateKeyFile = sConfigMgr->GetStringDefault("PrivateKeyFile", "./bnetserver.key.pem");
LOAD_CHECK(instance().set_options(boost::asio::ssl::context::no_sslv3, err));
auto passwordCallback = [](std::size_t /*max_length*/, boost::asio::ssl::context::password_purpose /*purpose*/) -> std::string
{
return sConfigMgr->GetStringDefault("PrivateKeyPassword", "");
};
LOAD_CHECK(instance().set_password_callback(passwordCallback, err));
LOAD_CHECK(instance().use_certificate_chain_file(certificateChainFile, err));
LOAD_CHECK(instance().use_private_key_file(privateKeyFile, boost::asio::ssl::context::pem, err));
@@ -44,6 +49,6 @@ bool Battlenet::SslContext::Initialize()
boost::asio::ssl::context& Battlenet::SslContext::instance()
{
static boost::asio::ssl::context context(boost::asio::ssl::context::sslv23);
static boost::asio::ssl::context context(boost::asio::ssl::context::tls);
return context;
}

7
src/server/bnetserver/bnetserver.conf.dist
View File

@@ -111,6 +111,13 @@ CertificatesFile = "./bnetserver.cert.pem"
PrivateKeyFile = "./bnetserver.key.pem"
#
# PrivateKeyPassword
# Description: Password used to encrypt private key.
# Default: ""
PrivateKeyPassword = ""
#
# UseProcessors
# Description: Processors mask for Windows and Linux based multi-processor systems.