diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2019-05-28 07:20:50 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2019-05-28 07:20:50 -0400 |
| commit | b370dc014446dfe1ea9b8926d13dc8ec643f33b9 (patch) | |
| tree | 95f1c8cb423c894e75ce0b27b50f56ffdd2fc7e4 /lib/server/ServerTLS.h | |
| parent | e9db5f7277a85068ef9e5515adf8577f74814d5e (diff) | |
| parent | 6017757bc079f4446aa77bc5c0855c52741280f4 (diff) | |
Update upstream source from tag 'upstream/0.13__git20190527.g039c4a1'
Update to upstream version '0.13~~git20190527.g039c4a1'
with Debian dir 2f67398c74e85067e31e6bf62658e5870a79e436
Diffstat (limited to 'lib/server/ServerTLS.h')
| -rw-r--r-- | lib/server/ServerTLS.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/server/ServerTLS.h b/lib/server/ServerTLS.h index f748f4b2..6b53e860 100644 --- a/lib/server/ServerTLS.h +++ b/lib/server/ServerTLS.h @@ -10,6 +10,7 @@ #ifndef SERVERTLS__H #define SERVERTLS__H +#include "BoxPortsAndFiles.h" #include "ServerStream.h" #include "SocketStreamTLS.h" #include "SSLLib.h" @@ -52,8 +53,12 @@ public: std::string certFile(serverconf.GetKeyValue("CertificateFile")); std::string keyFile(serverconf.GetKeyValue("PrivateKeyFile")); std::string caFile(serverconf.GetKeyValue("TrustedCAsFile")); + + int ssl_security_level(serverconf.GetKeyValueInt("SSLSecurityLevel", + BOX_DEFAULT_SSL_SECURITY_LEVEL)); + mContext.Initialise(true /* as server */, certFile.c_str(), - keyFile.c_str(), caFile.c_str()); + keyFile.c_str(), caFile.c_str(), ssl_security_level); // Then do normal stream server stuff ServerStream<SocketStreamTLS, Port, ListenBacklog, @@ -75,6 +80,8 @@ private: ConfigurationVerifyKey("CertificateFile", ConfigTest_Exists), \ ConfigurationVerifyKey("PrivateKeyFile", ConfigTest_Exists), \ ConfigurationVerifyKey("TrustedCAsFile", ConfigTest_Exists), \ + ConfigurationVerifyKey("SSLSecurityLevel", ConfigTest_IsInt, \ + BOX_DEFAULT_SSL_SECURITY_LEVEL), \ SERVERSTREAM_VERIFY_SERVER_KEYS(DEFAULT_ADDRESSES) #endif // SERVERTLS__H |