diff options
| author | Gacko <gacko28@gmx.de> | 2016-04-10 13:31:39 +0200 |
|---|---|---|
| committer | Gacko <gacko28@gmx.de> | 2016-04-10 13:31:39 +0200 |
| commit | 7c3df3f5d3abfd7b270b4816ce714bdfe8c2a3b7 (patch) | |
| tree | b79d44a650e80cbd17949c286dda17faefddaadd | |
| parent | 9fc090881b183283735d17f0f3a6453926bafd7b (diff) | |
Make private key and public key configurable.
Defaults to the files installed to the bin directory.
| -rw-r--r-- | src/server/bnetserver/Server/SslContext.cpp | 8 | ||||
| -rw-r--r-- | src/server/bnetserver/bnetserver.conf.dist | 16 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/server/bnetserver/Server/SslContext.cpp b/src/server/bnetserver/Server/SslContext.cpp index 3cc62b284dc..b4287eedc5f 100644 --- a/src/server/bnetserver/Server/SslContext.cpp +++ b/src/server/bnetserver/Server/SslContext.cpp @@ -17,6 +17,7 @@ #include "SslContext.h" #include "Log.h" +#include "Config.h" bool Battlenet::SslContext::Initialize() { @@ -29,9 +30,12 @@ bool Battlenet::SslContext::Initialize() return false; \ } } while (0) + std::string publicKeyFile = sConfigMgr->GetStringDefault("PublicKeyFile", "./bnetserver.cert.pem"); + std::string privateKeyFile = sConfigMgr->GetStringDefault("PrivateKeyFile", "./bnetserver.key.pem"); + LOAD_CHECK(instance().set_options(boost::asio::ssl::context::no_sslv3, err)); - LOAD_CHECK(instance().use_certificate_chain_file("bnetserver.cert.pem", err)); - LOAD_CHECK(instance().use_private_key_file("bnetserver.key.pem", boost::asio::ssl::context::pem, err)); + LOAD_CHECK(instance().use_certificate_chain_file(publicKeyFile, err)); + LOAD_CHECK(instance().use_private_key_file(privateKeyFile, boost::asio::ssl::context::pem, err)); #undef LOAD_CHECK diff --git a/src/server/bnetserver/bnetserver.conf.dist b/src/server/bnetserver/bnetserver.conf.dist index 211e63cfdb9..edad0779662 100644 --- a/src/server/bnetserver/bnetserver.conf.dist +++ b/src/server/bnetserver/bnetserver.conf.dist @@ -87,6 +87,22 @@ BindIP = "0.0.0.0" PidFile = "" # +# PublicKeyFile +# Description: Public key file. +# Example: "/etc/ssl/certs/bnetserver.cert.pem" +# Default: "./bnetserver.cert.pem" + +PublicKeyFile = "./bnetserver.cert.pem" + +# +# PrivateKeyFile +# Description: Private key file. +# Example: "/etc/ssl/private/bnetserver.key.pem" +# Default: "./bnetserver.key.pem" + +PrivateKeyFile = "./bnetserver.key.pem" + +# # UseProcessors # Description: Processors mask for Windows and Linux based multi-processor systems. # Example: A computer with 2 CPUs: |