diff options
author | luigi1111 <luigi1111w@gmail.com> | 2018-08-22 20:32:55 -0500 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2018-08-22 20:32:55 -0500 |
commit | 13a34faeb09814121140e14e0af442714fa985f9 (patch) | |
tree | a9ae5deea2a54c57391752089a42aea3954bac04 /contrib/epee/src/CMakeLists.txt | |
parent | Merge pull request #4105 (diff) | |
parent | crypto: make secret_key automatically mlock (diff) | |
download | monero-13a34faeb09814121140e14e0af442714fa985f9.tar.xz |
Merge pull request #4131
ea37614 wallet: wipe seed from memory where appropriate (moneromooo-monero)
e9ffa91 store secret keys encrypted where possible (moneromooo-monero)
70271fa common: add a class to safely wrap mlock/munlock (moneromooo-monero)
ab74dc2 crypto: make secret_key automatically mlock (moneromooo-monero)
Diffstat (limited to 'contrib/epee/src/CMakeLists.txt')
-rw-r--r-- | contrib/epee/src/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/epee/src/CMakeLists.txt b/contrib/epee/src/CMakeLists.txt index c4750cea0..0b5e7ae6c 100644 --- a/contrib/epee/src/CMakeLists.txt +++ b/contrib/epee/src/CMakeLists.txt @@ -27,7 +27,7 @@ # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. add_library(epee STATIC hex.cpp http_auth.cpp mlog.cpp net_utils_base.cpp string_tools.cpp wipeable_string.cpp memwipe.c - connection_basic.cpp network_throttle.cpp network_throttle-detail.cpp) + connection_basic.cpp network_throttle.cpp network_throttle-detail.cpp mlocker.cpp) if (USE_READLINE AND GNU_READLINE_FOUND) add_library(epee_readline STATIC readline_buffer.cpp) endif() |