From 41d4eb705b23af04e5fbd5b5edd78922e0602fc5 Mon Sep 17 00:00:00 2001
From: Taylor Hornby <taylor@defuse.ca>
Date: Thu, 17 Mar 2016 16:37:55 -0600
Subject: [PATCH] Link with libsodium and replace a CSPRNG.

---
 configure.ac                | 2 +-
 src/zerocash/utils/util.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index b21a4c7cb..6c8ca8869 100644
--- a/configure.ac
+++ b/configure.ac
@@ -717,7 +717,7 @@ CPPFLAGS="-I$LIBSNARK_INCDIR $CPPFLAGS"
 AC_CHECK_HEADER([libsnark/gadgetlib1/gadget.hpp],,AC_MSG_ERROR(libsnark headers missing))
 AC_CHECK_LIB([snark],[main],LIBSNARK_LIBS=-lsnark, [AC_MSG_ERROR(libsnark missing)], [-lgmpxx])
 
-LIBZEROCASH_LIBS="-lsnark -lcryptopp -lgmp -lgmpxx -lboost_system-mt -lcrypto"
+LIBZEROCASH_LIBS="-lsnark -lcryptopp -lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium"
 
 AC_CHECK_LIB([crypto],[RAND_egd],[],[
   AC_ARG_WITH([libressl],
diff --git a/src/zerocash/utils/util.cpp b/src/zerocash/utils/util.cpp
index d784db02c..846fb5ff4 100644
--- a/src/zerocash/utils/util.cpp
+++ b/src/zerocash/utils/util.cpp
@@ -9,6 +9,8 @@
 #include <iomanip>
 #include <algorithm>
 
+#include <sodium.h>
+
 #include "util.h"
 
 namespace libzerocash {
@@ -82,9 +84,7 @@ void printBytesVectorAsHex(const std::string str, const std::vector<unsigned cha
 }
 
 void getRandBytes(unsigned char* bytes, int num) {
-    int ret = RAND_bytes(bytes, num);
-    if(ret != 1)
-        std::cout << "rand_bytes error!" << ERR_get_error() << std::endl;
+    randombytes_buf(bytes, num);
 }
 
 void convertBytesToVector(const unsigned char* bytes, std::vector<bool>& v) {