aboutsummaryrefslogtreecommitdiff
path: root/src/common/util.cpp
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-12-16 23:19:27 +0200
committerRiccardo Spagni <ric@spagni.net>2017-12-16 23:19:27 +0200
commit6c0953b15a27a49403c6ec2a48c1b0dcefa1eda5 (patch)
tree90c341b746beeb252953081f75bef7f315704068 /src/common/util.cpp
parentMerge pull request #2856 (diff)
parentnew wipeable_string class to replace std::string passphrases (diff)
downloadmonero-6c0953b15a27a49403c6ec2a48c1b0dcefa1eda5.tar.xz
Merge pull request #2860
3dffe71b new wipeable_string class to replace std::string passphrases (moneromooo-monero) 7a2a5741 utils: initialize easylogging++ in on_startup (moneromooo-monero) 54950829 use memwipe in a few relevant places (moneromooo-monero) 000666ff add a memwipe function (moneromooo-monero)
Diffstat (limited to 'src/common/util.cpp')
-rw-r--r--src/common/util.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/common/util.cpp b/src/common/util.cpp
index e8ac61815..de19fec81 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -36,9 +36,11 @@
#include "include_base_utils.h"
#include "file_io_utils.h"
+#include "wipeable_string.h"
using namespace epee;
#include "util.h"
+#include "memwipe.h"
#include "cryptonote_config.h"
#include "net/http_client.h" // epee::net_utils::...
@@ -542,6 +544,10 @@ std::string get_nix_version_display_string()
}
bool on_startup()
{
+ wipeable_string::set_wipe(&memwipe);
+
+ mlog_configure("", true);
+
sanitize_locale();
#ifdef __GLIBC__