3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Problem: HAVE_LIBSODIUM macro is inconsistent

Browse Source 
Solution: use ZMQ_USE_LIBSODIUM to match ZMQ_USE_TWEETNACL
This commit is contained in:
Pieter Hintjens 2016-03-12 15:25:41 +01:00
parent 6630a7ceaf
commit 6a78b3ec19
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -43,7 +43,7 @@ elseif (WITH_LIBSODIUM)
if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS") if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
target_link_libraries (libzmq ssp) target_link_libraries (libzmq ssp)
endif () endif ()
set (HAVE_LIBSODIUM 1) set (ZMQ_USE_LIBSODIUM 1)
set (ZMQ_HAVE_CURVE 1) set (ZMQ_HAVE_CURVE 1)
else () else ()
message (FATAL_ERROR message (FATAL_ERROR

2
configure.ac
View File

@ -439,7 +439,7 @@ if test "x$enable_curve" = "xno"; then
elif test "x$with_libsodium" = "xyes"; then elif test "x$with_libsodium" = "xyes"; then
AC_MSG_NOTICE([Using libsodium for CURVE security]) AC_MSG_NOTICE([Using libsodium for CURVE security])
AC_DEFINE(ZMQ_HAVE_CURVE, [1], [Using curve encryption]) AC_DEFINE(ZMQ_HAVE_CURVE, [1], [Using curve encryption])
AC_DEFINE(HAVE_LIBSODIUM, [1], [Using libsodium for curve encryption]) AC_DEFINE(ZMQ_USE_LIBSODIUM, [1], [Using libsodium for curve encryption])
curve_library="libsodium" curve_library="libsodium"
# On Solaris, libsodium depends on libssp # On Solaris, libsodium depends on libssp

2
src/ctx.cpp
View File

@ -51,7 +51,7 @@
#if defined (ZMQ_USE_TWEETNACL) #if defined (ZMQ_USE_TWEETNACL)
# include "tweetnacl.h" # include "tweetnacl.h"
#elif defined (HAVE_LIBSODIUM) #elif defined (ZMQ_USE_LIBSODIUM)
# include "sodium.h" # include "sodium.h"
#endif #endif

2
src/curve_client.hpp
View File

@ -36,7 +36,7 @@
#if defined (ZMQ_USE_TWEETNACL) #if defined (ZMQ_USE_TWEETNACL)
# include "tweetnacl.h" # include "tweetnacl.h"
#elif defined (HAVE_LIBSODIUM) #elif defined (ZMQ_USE_LIBSODIUM)
# include "sodium.h" # include "sodium.h"
#endif #endif

2
src/curve_server.hpp
View File

@ -36,7 +36,7 @@
#if defined (ZMQ_USE_TWEETNACL) #if defined (ZMQ_USE_TWEETNACL)
# include "tweetnacl.h" # include "tweetnacl.h"
#elif defined (HAVE_LIBSODIUM) #elif defined (ZMQ_USE_LIBSODIUM)
# include "sodium.h" # include "sodium.h"
#endif #endif

2
src/zmq_utils.cpp
View File

@ -46,7 +46,7 @@
#if defined (ZMQ_USE_TWEETNACL) #if defined (ZMQ_USE_TWEETNACL)
# include "tweetnacl.h" # include "tweetnacl.h"
#elif defined (HAVE_LIBSODIUM) #elif defined (ZMQ_USE_LIBSODIUM)
# include "sodium.h" # include "sodium.h"
#endif #endif