Merge commit

2019-01-15 12:43:19 -08:00 · 2019-01-15 12:43:19 -08:00 · 495d447cab
commit 495d447cab
parent 58d20254eb 118e547175
68 changed files with 1560 additions and 407 deletions
--- a/src/common/interfaces/IConfig.h
+++ b/src/common/interfaces/IConfig.h
@ -100,16 +100,23 @@ public:
        OclCompModeKey    = 1410,

        // xmrig-proxy
-        AccessLogFileKey  = 'A',
-        BindKey           = 'b',
-        CoinKey           = 1104,
-        CustomDiffKey     = 1102,
-        DebugKey          = 1101,
-        ModeKey           = 'm',
-        PoolCoinKey       = 'C',
-        ReuseTimeoutKey   = 1106,
-        WorkersKey        = 1103,
-        WorkersAdvKey     = 1107,
+        AccessLogFileKey   = 'A',
+        BindKey            = 'b',
+        CoinKey            = 1104,
+        CustomDiffKey      = 1102,
+        DebugKey           = 1101,
+        ModeKey            = 'm',
+        PoolCoinKey        = 'C',
+        ReuseTimeoutKey    = 1106,
+        WorkersKey         = 1103,
+        WorkersAdvKey      = 1107,
+        TlsBindKey         = 1108,
+        TlsCertKey         = 1109,
+        TlsCertKeyKey      = 1110,
+        TlsDHparamKey      = 1111,
+        TlsCiphersKey      = 1112,
+        TlsCipherSuitesKey = 1113,
+        TlsProtocolsKey    = 1114,

        // xmrig nvidia
        CudaMaxThreadsKey = 1200,