From 10017b06a2983dcf61c631ffc33196ec869d1f6f Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Sat, 28 Apr 2012 16:15:15 -0700 Subject: [PATCH] Add config option peer_ssl_cipher_list. --- src/Config.cpp | 39 ++++++++++++++++++++++----------------- src/Config.h | 5 +++++ 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/src/Config.cpp b/src/Config.cpp index f8066f915d..62baef2582 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -6,35 +6,38 @@ #include #include -#define CONFIG_FILE_NAME SYSTEM_NAME "d.cfg" // newcoind.cfg -#define SECTION_PEER_IP "peer_ip" -#define SECTION_PEER_PORT "peer_port" -#define SECTION_RPC_IP "rpc_ip" -#define SECTION_RPC_PORT "rpc_port" -#define SECTION_VALIDATION_PASSWORD "validation_password" -#define SECTION_VALIDATION_KEY "validation_key" +#define CONFIG_FILE_NAME SYSTEM_NAME "d.cfg" // newcoind.cfg +#define SECTION_PEER_IP "peer_ip" +#define SECTION_PEER_PORT "peer_port" +#define SECTION_RPC_IP "rpc_ip" +#define SECTION_RPC_PORT "rpc_port" +#define SECTION_VALIDATION_PASSWORD "validation_password" +#define SECTION_VALIDATION_KEY "validation_key" +#define SECTION_PEER_SSL_CIPHER_LIST "peer_ssl_cipher_list" Config theConfig; Config::Config() { - VERSION=1; + VERSION = 1; - NETWORK_START_TIME=1319844908; + NETWORK_START_TIME = 1319844908; - PEER_PORT=SYSTEM_PEER_PORT; - RPC_PORT=5001; - NUMBER_CONNECTIONS=30; + PEER_PORT = SYSTEM_PEER_PORT; + RPC_PORT = 5001; + NUMBER_CONNECTIONS = 30; // a new ledger every 30 min - LEDGER_SECONDS=(60*30); + LEDGER_SECONDS = (60*30); - RPC_USER="admin"; - RPC_PASSWORD="pass"; + RPC_USER = "admin"; + RPC_PASSWORD = "pass"; - DATA_DIR="db/"; + DATA_DIR = "db/"; - TRANSACTION_FEE_BASE=1000; + PEER_SSL_CIPHER_LIST = DEFAULT_PEER_SSL_CIPHER_LIST; + + TRANSACTION_FEE_BASE = 1000; } void Config::load() @@ -73,6 +76,8 @@ void Config::load() (void) sectionSingleB(secConfig, SECTION_VALIDATION_PASSWORD, VALIDATION_PASSWORD); (void) sectionSingleB(secConfig, SECTION_VALIDATION_KEY, VALIDATION_KEY); + + (void) sectionSingleB(secConfig, SECTION_PEER_SSL_CIPHER_LIST, PEER_SSL_CIPHER_LIST); } } diff --git a/src/Config.h b/src/Config.h index 951c5817ef..9974d4d94e 100644 --- a/src/Config.h +++ b/src/Config.h @@ -7,6 +7,9 @@ const int SYSTEM_PEER_PORT=6561; +// Allow anonymous DH. +#define DEFAULT_PEER_SSL_CIPHER_LIST "ALL:!LOW:!EXP:!MD5:@STRENGTH" + class Config { public: @@ -42,6 +45,8 @@ public: std::string VALIDATION_PASSWORD; std::string VALIDATION_KEY; + std::string PEER_SSL_CIPHER_LIST; + // configuration parameters std::string DATA_DIR;