diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-12-21 14:51:29 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-01-10 01:57:54 +0000 |
| commit | fdd4c5e5770c2765afd7734550dc80e31a480045 (patch) | |
| tree | 9564716b74e971828e0fbdbc6bb13ea8b2362428 /contrib/epee | |
| parent | epee: remove dependency on common (diff) | |
| download | monero-fdd4c5e5770c2765afd7734550dc80e31a480045.tar.xz | |
move memwipe to epee to avoid common<->crypto circular dependencies
Diffstat (limited to '')
| -rw-r--r-- | contrib/epee/include/memwipe.h (renamed from src/common/memwipe.h) | 0 | ||||
| -rw-r--r-- | contrib/epee/src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | contrib/epee/src/memwipe.c (renamed from src/common/memwipe.c) | 0 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/common/memwipe.h b/contrib/epee/include/memwipe.h index c3b4ce8ab..c3b4ce8ab 100644 --- a/src/common/memwipe.h +++ b/contrib/epee/include/memwipe.h diff --git a/contrib/epee/src/CMakeLists.txt b/contrib/epee/src/CMakeLists.txt index ee118724d..9d104ceeb 100644 --- a/contrib/epee/src/CMakeLists.txt +++ b/contrib/epee/src/CMakeLists.txt @@ -26,12 +26,16 @@ # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF # 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 +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) if (USE_READLINE AND GNU_READLINE_FOUND) add_library(epee_readline STATIC readline_buffer.cpp) endif() +if(HAVE_C11) +SET_PROPERTY(SOURCE memwipe.c PROPERTY COMPILE_FLAGS -std=c11) +endif() + # Build and install libepee if we're building for GUI if (BUILD_GUI_DEPS) if(IOS) diff --git a/src/common/memwipe.c b/contrib/epee/src/memwipe.c index da7e9f346..da7e9f346 100644 --- a/src/common/memwipe.c +++ b/contrib/epee/src/memwipe.c |