Merge branch 'dev' into duke

2020-11-14 15:46:32 -05:00
parent 52d02c2e6d a565362398
commit 7079742408
23 changed files with 816 additions and 1126 deletions
--- a/src/wallet/crypter.cpp
+++ b/src/wallet/crypter.cpp
@@ -28,8 +28,8 @@
 #include <string>
 #include <vector>
 #include <boost/foreach.hpp>
-#include <openssl/aes.h>
-#include <openssl/evp.h>
+#include <wolfssl/openssl/aes.h>
+#include <wolfssl/openssl/evp.h>

 using namespace libzcash;