From fdd4c5e5770c2765afd7734550dc80e31a480045 Mon Sep 17 00:00:00 2001
From: moneromooo-monero <moneromooo-monero@users.noreply.github.com>
Date: Thu, 21 Dec 2017 14:51:29 +0000
Subject: move memwipe to epee to avoid common<->crypto circular dependencies

---
 src/crypto/chacha.h | 2 +-
 src/crypto/crypto.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/crypto')

diff --git a/src/crypto/chacha.h b/src/crypto/chacha.h
index a9665030d..c11e4aa2f 100644
--- a/src/crypto/chacha.h
+++ b/src/crypto/chacha.h
@@ -39,7 +39,7 @@
 #if defined(__cplusplus)
 #include <memory.h>
 
-#include "common/memwipe.h"
+#include "memwipe.h"
 #include "hash.h"
 
 namespace crypto {
diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h
index 0ce5e6d7a..a929302c1 100644
--- a/src/crypto/crypto.h
+++ b/src/crypto/crypto.h
@@ -41,7 +41,7 @@
 
 #include "common/pod-class.h"
 #include "common/util.h"
-#include "common/memwipe.h"
+#include "memwipe.h"
 #include "generic-ops.h"
 #include "hex.h"
 #include "span.h"
-- 
cgit v1.2.3


From 6d8b29ef2800a36236e4d31521878ef02f3084ab Mon Sep 17 00:00:00 2001
From: stoffu <stoffu@protonmail.ch>
Date: Thu, 21 Dec 2017 15:22:25 +0000
Subject: fix some link errors in debug mode for macos

---
 src/crypto/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/crypto')

diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
index fd71a87e7..764b30273 100644
--- a/src/crypto/CMakeLists.txt
+++ b/src/crypto/CMakeLists.txt
@@ -76,6 +76,7 @@ monero_add_library(cncrypto
   ${crypto_private_headers})
 target_link_libraries(cncrypto
   PUBLIC
+    epee
     ${Boost_SYSTEM_LIBRARY}
   PRIVATE
     ${EXTRA_LIBRARIES})
-- 
cgit v1.2.3