Move crypto implementations to src/crypto/

sipa · sipa · commit 13b5dfef64bb · 2014-06-21T19:47:42.000+02:00
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -75,8 +75,8 @@ BITCOIN_CORE_H = \
   rpcserver.h \
   script.h \
   serialize.h \
-  sha2.h \
-  sha1.h \
+  crypto/sha2.h \
+  crypto/sha1.h \
   sync.h \
   threadsafety.h \
   tinyformat.h \
@@ -154,8 +154,8 @@ libbitcoin_common_a_SOURCES = \
   protocol.cpp \
   rpcprotocol.cpp \
   script.cpp \
-  sha1.cpp \
-  sha2.cpp \
+  crypto/sha1.cpp \
+  crypto/sha2.cpp \
   sync.cpp \
   util.cpp \
   version.cpp \
diff --git a/src/crypto/sha1.cpp b/src/crypto/sha1.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "sha1.h"
+#include "crypto/sha1.h"
 
 #include <string.h>
 
diff --git a/src/crypto/sha1.h b/src/crypto/sha1.h
diff --git a/src/crypto/sha2.cpp b/src/crypto/sha2.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "sha2.h"
+#include "crypto/sha2.h"
 
 #include <string.h>
 
diff --git a/src/crypto/sha2.h b/src/crypto/sha2.h
diff --git a/src/hash.h b/src/hash.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_HASH_H
 #define BITCOIN_HASH_H
 
-#include "sha2.h"
+#include "crypto/sha2.h"
 #include "serialize.h"
 #include "uint256.h"
 #include "version.h"
diff --git a/src/key.cpp b/src/key.cpp
@@ -4,7 +4,7 @@
 
 #include "key.h"
 
-#include "sha2.h"
+#include "crypto/sha2.h"
 
 #include <openssl/bn.h>
 #include <openssl/ecdsa.h>
diff --git a/src/script.cpp b/src/script.cpp
@@ -9,8 +9,8 @@
 #include "hash.h"
 #include "key.h"
 #include "keystore.h"
-#include "sha1.h"
-#include "sha2.h"
+#include "crypto/sha1.h"
+#include "crypto/sha2.h"
 #include "sync.h"
 #include "uint256.h"
 #include "util.h"
diff --git a/src/test/sha1_tests.cpp b/src/test/sha1_tests.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "sha1.h"
+#include "crypto/sha1.h"
 #include "util.h"
 
 #include <vector>
diff --git a/src/test/sha2_tests.cpp b/src/test/sha2_tests.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "sha2.h"
+#include "crypto/sha2.h"
 #include "util.h"
 
 #include <vector>
