Get rid of dhFile and use hard coded Diffie-Hellman parameters (4befe824) · Commits · dcdb / dcdb

collectagent/collectagent.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -782,7 +782,6 @@ int main(int argc, char* const argv[]) {
		LOG(info) << " REST Server: " << restAPISettings.host << ":" << restAPISettings.port;
		LOG(info) << " Certificate: " << restAPISettings.certificate;
		LOG(info) << " Private key file: " << restAPISettings.privateKey;
		LOG(info) << " DH params from: " << restAPISettings.dhFile;
		}
		LOG_VAR(vLogLevel) << "----- Analytics Configuration -----";
		for(auto& p : analyticsController->getManager()->getPlugins()) {

common/include/globalconfiguration.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,6 @@ public:
		std::string port = "8000";/*< Port to listen on /
		std::string certificate = "";/*< Certificate chain file in PEM format /
		std::string privateKey = "";/*< Private key file in PEM format /
		std::string dhFile = "";/*< File with Diffie-Hellman parameters /
		};

		/**

common/src/RESTHttpsServer.cpp

+5 −2

Original line number	Diff line number	Diff line
		@@ -84,13 +84,16 @@ RESTHttpsServer::RESTHttpsServer(serverSettings_t settings) :
		try {
		_ctx->use_certificate_chain_file(settings.certificate);
		_ctx->use_private_key_file(settings.privateKey, ssl::context::pem);
		_ctx->use_tmp_dh_file(settings.dhFile);
		} catch (const std::exception& e) {
		ServerLOG(fatal) << "Could not load certificate OR private key OR DH settings file! "
		ServerLOG(fatal) << "Could not load certificate OR private key settings file! "
		"Please ensure the paths in the config file are valid!";
		throw;
		}

		// 2048bit Diffie-Hellman parameters from RFC3526
		static unsigned char const s_dh2048_pem[] = { 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x42, 0x45, 0x47, 0x49, 0x4E, 0x20, 0x44, 0x48, 0x20, 0x50, 0x41, 0x52, 0x41, 0x4D, 0x45, 0x54, 0x45, 0x52, 0x53, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x0A, 0x4D, 0x49, 0x49, 0x42, 0x43, 0x41, 0x4B, 0x43, 0x41, 0x51, 0x45, 0x41, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x4A, 0x44, 0x39, 0x71, 0x69, 0x49, 0x57, 0x6A, 0x43, 0x4E, 0x4D, 0x54, 0x47, 0x59, 0x6F, 0x75, 0x41, 0x33, 0x42, 0x7A, 0x52, 0x4B, 0x51, 0x4A, 0x4F, 0x43, 0x49, 0x70, 0x6E, 0x7A, 0x48, 0x51, 0x43, 0x43, 0x37, 0x36, 0x6D, 0x4F, 0x78, 0x4F, 0x62, 0x0A, 0x49, 0x6C, 0x46, 0x4B, 0x43, 0x48, 0x6D, 0x4F, 0x4E, 0x41, 0x54, 0x64, 0x37, 0x35, 0x55, 0x5A, 0x73, 0x38, 0x30, 0x36, 0x51, 0x78, 0x73, 0x77, 0x4B, 0x77, 0x70, 0x74, 0x38, 0x6C, 0x38, 0x55, 0x4E, 0x30, 0x2F, 0x68, 0x4E, 0x57, 0x31, 0x74, 0x55, 0x63, 0x4A, 0x46, 0x35, 0x49, 0x57, 0x31, 0x64, 0x6D, 0x4A, 0x65, 0x66, 0x73, 0x62, 0x30, 0x54, 0x45, 0x4C, 0x70, 0x70, 0x6A, 0x66, 0x74, 0x0A, 0x61, 0x77, 0x76, 0x2F, 0x58, 0x4C, 0x62, 0x30, 0x42, 0x72, 0x66, 0x74, 0x37, 0x6A, 0x68, 0x72, 0x2B, 0x31, 0x71, 0x4A, 0x6E, 0x36, 0x57, 0x75, 0x6E, 0x79, 0x51, 0x52, 0x66, 0x45, 0x73, 0x66, 0x35, 0x6B, 0x6B, 0x6F, 0x5A, 0x6C, 0x48, 0x73, 0x35, 0x46, 0x73, 0x39, 0x77, 0x67, 0x42, 0x38, 0x75, 0x4B, 0x46, 0x6A, 0x76, 0x77, 0x57, 0x59, 0x32, 0x6B, 0x67, 0x32, 0x48, 0x46, 0x58, 0x54, 0x0A, 0x6D, 0x6D, 0x6B, 0x57, 0x50, 0x36, 0x6A, 0x39, 0x4A, 0x4D, 0x39, 0x66, 0x67, 0x32, 0x56, 0x64, 0x49, 0x39, 0x79, 0x6A, 0x72, 0x5A, 0x59, 0x63, 0x59, 0x76, 0x4E, 0x57, 0x49, 0x49, 0x56, 0x53, 0x75, 0x35, 0x37, 0x56, 0x4B, 0x51, 0x64, 0x77, 0x6C, 0x70, 0x5A, 0x74, 0x5A, 0x77, 0x77, 0x31, 0x54, 0x6B, 0x71, 0x38, 0x6D, 0x41, 0x54, 0x78, 0x64, 0x47, 0x77, 0x49, 0x79, 0x68, 0x67, 0x68, 0x0A, 0x66, 0x44, 0x4B, 0x51, 0x58, 0x6B, 0x59, 0x75, 0x4E, 0x73, 0x34, 0x37, 0x34, 0x35, 0x35, 0x33, 0x4C, 0x42, 0x67, 0x4F, 0x68, 0x67, 0x4F, 0x62, 0x4A, 0x34, 0x4F, 0x69, 0x37, 0x41, 0x65, 0x69, 0x6A, 0x37, 0x58, 0x46, 0x58, 0x66, 0x42, 0x76, 0x54, 0x46, 0x4C, 0x4A, 0x33, 0x69, 0x76, 0x4C, 0x39, 0x70, 0x56, 0x59, 0x46, 0x78, 0x67, 0x35, 0x6C, 0x55, 0x6C, 0x38, 0x36, 0x70, 0x56, 0x71, 0x0A, 0x35, 0x52, 0x58, 0x53, 0x4A, 0x68, 0x69, 0x59, 0x2B, 0x67, 0x55, 0x51, 0x46, 0x58, 0x4B, 0x4F, 0x57, 0x6F, 0x71, 0x73, 0x71, 0x6D, 0x6A, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x77, 0x49, 0x42, 0x41, 0x67, 0x3D, 0x3D, 0x0A, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x45, 0x4E, 0x44, 0x20, 0x44, 0x48, 0x20, 0x50, 0x41, 0x52, 0x41, 0x4D, 0x45, 0x54, 0x45, 0x52, 0x53, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D };
		_ctx->use_tmp_dh(boost::asio::buffer(s_dh2048_pem));

		// This will receive the new connection
		_socket = std::unique_ptr<tcp::socket>(new tcp::socket(*_io));

common/src/globalconfiguration.cpp

+0 −2

Original line number	Diff line number	Diff line
		@@ -118,8 +118,6 @@ void GlobalConfiguration::readConfig() {
		restAPISettings.certificate = global.second.data();
		} else if (boost::iequals(global.first, "privateKey")) {
		restAPISettings.privateKey = global.second.data();
		} else if (boost::iequals(global.first, "dhFile")) {
		restAPISettings.dhFile = global.second.data();
		} else if (boost::iequals(global.first, "user")) {
		//Avoids unnecessary "Value not recognized" message
		} else {

dcdbpusher/dcdbpusher.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -381,7 +381,6 @@ int main(int argc, char **argv) {
		LOG(info) << " REST Server: " << restAPISettings.host << ":" << restAPISettings.port;
		LOG(info) << " Certificate: " << restAPISettings.certificate;
		LOG(info) << " Private key file: " << restAPISettings.privateKey;
		LOG(info) << " DH params from: " << restAPISettings.dhFile;
		}
		LOG_VAR(vLogLevel) << "----- Sampling Configuration -----";
		for (auto &p : _pluginManager->getPlugins()) {