SSLv3までをデフォルトで無効にする

xtne6f · Apr 16, 2016 · 19342bc · 19342bc
1 parent f1d28bd
commit 19342bc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/EpgTimerSrv/EpgTimerSrv/EpgTimerSrvMain.cpp b/EpgTimerSrv/EpgTimerSrv/EpgTimerSrvMain.cpp
@@ -693,6 +693,7 @@ void CEpgTimerSrvMain::ReloadNetworkSetting()
 		this->httpOptions.authenticationDomain = GetPrivateProfileToString(L"SET", L"HttpAuthenticationDomain", L"", iniPath.c_str());
 		this->httpOptions.numThreads = GetPrivateProfileInt(L"SET", L"HttpNumThreads", 3, iniPath.c_str());
 		this->httpOptions.requestTimeout = GetPrivateProfileInt(L"SET", L"HttpRequestTimeoutSec", 120, iniPath.c_str()) * 1000;
+		this->httpOptions.sslProtocolVersion = GetPrivateProfileInt(L"SET", L"HttpSslProtocolVersion", 2, iniPath.c_str());
 		this->httpOptions.keepAlive = GetPrivateProfileInt(L"SET", L"HttpKeepAlive", 0, iniPath.c_str()) != 0;
 		this->httpOptions.ports = GetPrivateProfileToString(L"SET", L"HttpPort", L"5510", iniPath.c_str());
 		this->httpOptions.saveLog = enableHttpSrv == 2;

diff --git a/EpgTimerSrv/EpgTimerSrv/HttpServer.cpp b/EpgTimerSrv/EpgTimerSrv/HttpServer.cpp
@@ -68,6 +68,8 @@ bool CHttpServer::StartServer(const SERVER_OPTIONS& op, int (*initProc)(lua_Stat
 	Format(numThreads, "%d", min(max(op.numThreads, 1), 50));
 	string requestTimeout;
 	Format(requestTimeout, "%d", max(op.requestTimeout, 1));
+	string sslProtocolVersion;
+	Format(sslProtocolVersion, "%d", op.sslProtocolVersion);
 
 	//追加のMIMEタイプ
 	CParseContentTypeText contentType;
@@ -87,9 +89,10 @@ bool CHttpServer::StartServer(const SERVER_OPTIONS& op, int (*initProc)(lua_Stat
 		"document_root", rootPathU.c_str(),
 		"num_threads", numThreads.c_str(),
 		"request_timeout_ms", requestTimeout.c_str(),
+		"ssl_protocol_version", sslProtocolVersion.c_str(),
 		"lua_script_pattern", "**.lua$|**.html$|*/api/*$",
 	};
-	int opCount = 2 * 8;
+	int opCount = 2 * 9;
 	if( op.saveLog ){
 		options[opCount++] = "access_log_file";
 		options[opCount++] = accessLogPath.c_str();

diff --git a/EpgTimerSrv/EpgTimerSrv/HttpServer.h b/EpgTimerSrv/EpgTimerSrv/HttpServer.h
@@ -15,6 +15,7 @@ class CHttpServer
 		std::wstring authenticationDomain;
 		int numThreads;
 		int requestTimeout;
+		int sslProtocolVersion;
 		bool keepAlive;
 		bool saveLog;
 	};