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/cc/import.cpp
+++ b/src/cc/import.cpp
@@ -19,7 +19,7 @@
 #include "crosschain.h"
 #include "primitives/transaction.h"
 #include "cc/CCinclude.h"
-#include <openssl/sha.h>
+#include <wolfssl/wolfcrypt/sha.h>
 #include "cc/CCtokens.h"

 #include "key_io.h"