Commit 4556ae60 authored by Pavel Vasin's avatar Pavel Vasin

replace libsodium with boring crypto library

parent c8faa327
......@@ -226,6 +226,7 @@ HEADERS += src/qt/bitcoingui.h \
src/netbase.h \
src/clientversion.h \
src/threadsafety.h \
src/monocypher.h \
src/tinyformat.h
SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
......@@ -299,6 +300,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/rpcconsole.cpp \
src/noui.cpp \
src/kernel.cpp \
src/monocypher.cpp \
src/scrypt-arm.S \
src/scrypt-x86.S \
src/scrypt-x86_64.S \
......@@ -410,7 +412,7 @@ macx:QMAKE_INFO_PLIST = share/qt/Info.plist
# Set libraries and includes at end, to use platform-defined defaults if not overridden
INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH
LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX -lsodium
LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
# -lgdi32 has to happen after -lcrypto (see #681)
windows:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
......
......@@ -66,7 +66,6 @@ sudo apt-get install libssl-dev
sudo apt-get install libdb++-dev
sudo apt-get install libboost-all-dev
sudo apt-get install libqrencode-dev
sudo apt-get install libsodium-dev
If using Boost 1.37, append -mt to the boost libraries in the makefile.
......@@ -74,7 +73,7 @@ If using Boost 1.37, append -mt to the boost libraries in the makefile.
Dependency Build Instructions: Gentoo
-------------------------------------
emerge -av1 --noreplace boost openssl sys-libs/db libsodium
emerge -av1 --noreplace boost openssl sys-libs/db
Take the following steps to build (no UPnP support):
cd ${BLACKCOIN_DIR}/src
......
......@@ -15,7 +15,7 @@ distribution are installed, for Debian and Ubuntu these are:
apt-get install qt5-default qt5-qmake qtbase5-dev-tools qttools5-dev-tools \
build-essential libboost-dev libboost-system-dev \
libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev \
libssl-dev libdb++-dev libminiupnpc-dev libsodium-dev
libssl-dev libdb++-dev libminiupnpc-dev
then execute the following:
......
......@@ -24,7 +24,6 @@ endif
# for boost 1.37, add -mt to the boost libraries
LIBS += \
-Wl,-B$(LMODE) \
-l sodium
-l boost_system$(BOOST_LIB_SUFFIX) \
-l boost_filesystem$(BOOST_LIB_SUFFIX) \
-l boost_program_options$(BOOST_LIB_SUFFIX) \
......@@ -124,6 +123,7 @@ OBJS= \
obj/hash.o \
obj/noui.o \
obj/kernel.o \
obj/monocypher.o \
obj/pbkdf2.o \
obj/scrypt.o \
obj/scrypt-arm.o \
......
......@@ -28,7 +28,6 @@ LIBPATHS= \
-L"$(DEPSDIR)/openssl-1.0.1f"
LIBS= \
-l sodium
-l boost_system-mt \
-l boost_filesystem-mt \
-l boost_program_options-mt \
......@@ -88,6 +87,7 @@ OBJS= \
obj/hash.o \
obj/noui.o \
obj/kernel.o \
obj/monocypher.o \
obj/pbkdf2.o \
obj/scrypt.o \
obj/scrypt-x86.o \
......
......@@ -16,7 +16,6 @@ LIBPATHS= \
-L"C:\openssl-1.0.1c-mgw"
LIBS= \
-l sodium
-l boost_system-mgw44-mt-1_53 \
-l boost_filesystem-mgw44-mt-1_53 \
-l boost_program_options-mgw44-mt-1_53 \
......@@ -78,6 +77,7 @@ OBJS= \
obj/hash.o \
obj/noui.o \
obj/kernel.o \
obj/monocypher.o \
obj/pbkdf2.o \
obj/scrypt.o \
obj/scrypt-x86.o \
......
......@@ -27,7 +27,6 @@ LIBS= -dead_strip
ifdef STATIC
# Build STATIC if you are redistributing the blackcoind binary
LIBS += \
$(DEPSDIR)/lib/libsodium.a \
$(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \
$(DEPSDIR)/lib/libboost_system-mt.a \
$(DEPSDIR)/lib/libboost_filesystem-mt.a \
......@@ -38,7 +37,6 @@ LIBS += \
-lz
else
LIBS += \
-lsodium \
-ldb_cxx-4.8 \
-lboost_system-mt \
-lboost_filesystem-mt \
......@@ -95,6 +93,7 @@ OBJS= \
obj/noui.o \
obj/pbkdf2.o \
obj/kernel.o \
obj/monocypher.o \
obj/scrypt.o \
obj/scrypt-x86.o \
obj/scrypt-x86_64.o \
......
......@@ -25,7 +25,6 @@ endif
# for boost 1.37, add -mt to the boost libraries
LIBS += \
-Wl,-B$(LMODE) \
-l sodium \
-l boost_system$(BOOST_LIB_SUFFIX) \
-l boost_filesystem$(BOOST_LIB_SUFFIX) \
-l boost_program_options$(BOOST_LIB_SUFFIX) \
......@@ -130,6 +129,7 @@ OBJS= \
obj/hash.o \
obj/noui.o \
obj/kernel.o \
obj/monocypher.o \
obj/pbkdf2.o \
obj/scrypt.o \
obj/scrypt-arm.o \
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment