#include <boost/thread.hpp>
#include <openssl/crypto.h>
#include <openssl/rand.h>
+#include <openssl/conf.h>
#ifdef WIN32
-#ifdef _MSC_VER
-#pragma warning(disable:4786)
-#pragma warning(disable:4804)
-#pragma warning(disable:4805)
-#pragma warning(disable:4717)
-#endif
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
ppmutexOpenSSL[i] = new CCriticalSection();
CRYPTO_set_locking_callback(locking_callback);
+ // OpenSSL can optionally load a config file which lists optional loadable modules and engines.
+ // We don't use them so we don't require the config. However some of our libs may call functions
+ // which attempt to load the config file, possibly resulting in an exit() or crash if it is missing
+ // or corrupt. Explicitly tell OpenSSL not to try to load the file. The result for our libs will be
+ // that the config appears to have been loaded and there are no modules/engines available.
+ OPENSSL_no_config();
+
#ifdef WIN32
// Seed random number generator with screen scrape and other hardware sources
RAND_screen();
buffer += vstrprintf(pszFormat, arg_ptr);
va_end(arg_ptr);
- int line_start = 0, line_end;
+ size_t line_start = 0, line_end;
while((line_end = buffer.find('\n', line_start)) != -1)
{
OutputDebugStringA(buffer.substr(line_start, line_end - line_start).c_str());
if (p != buffer)
delete[] p;
limit *= 2;
- p = new char[limit];
+ p = new(nothrow) char[limit];
if (p == NULL)
throw std::bad_alloc();
}
string str = strprintf("%" PRId64 ".%06" PRId64, quotient, remainder);
// Right-trim excess zeros before the decimal point:
- int nTrim = 0;
- for (int i = str.size()-1; (str[i] == '0' && isdigit(str[i-2])); --i)
+ size_t nTrim = 0;
+ for (size_t i = str.size()-1; (str[i] == '0' && isdigit(str[i-2])); --i)
++nTrim;
if (nTrim)
str.erase(str.size()-nTrim, nTrim);
if (n < 0)
- str.insert((unsigned int)0, 1, '-');
+ str.insert(0u, 1, '-');
else if (fPlus && n > 0)
- str.insert((unsigned int)0, 1, '+');
+ str.insert(0u, 1, '+');
return str;
}
return nDefault;
}
+int32_t GetArgInt(const std::string& strArg, int32_t nDefault)
+{
+ if (mapArgs.count(strArg))
+ return strtol(mapArgs[strArg]);
+ return nDefault;
+}
+
+uint32_t GetArgUInt(const std::string& strArg, uint32_t nDefault)
+{
+ if (mapArgs.count(strArg))
+ return strtoul(mapArgs[strArg]);
+ return nDefault;
+}
+
bool GetBoolArg(const std::string& strArg, bool fDefault)
{
if (mapArgs.count(strArg))
pConf << "rpcuser=user\nrpcpassword="
+ randomStrGen(15)
+ "\nrpcport=8344"
- + "\nport=7777"
+ "\n#(0=off, 1=on) daemon - run in the background as a daemon and accept commands"
+ "\ndaemon=0"
+ "\n#(0=off, 1=on) server - accept command line and JSON-RPC commands"
+ "\nserver=0"
- + "\nrpcallowip=127.0.0.1"
- + "\ntestnet=0";
+ + "\nrpcallowip=127.0.0.1";
pConf.close();
}
ss.imbue(loc);
ss << boost::posix_time::from_time_t(nTime);
return ss.str();
-}
\ No newline at end of file
+}