diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-04-28 12:20:15 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-06-21 19:47:42 +0200 |
| commit | 13b5dfef64bbb77d583b2acc59e2b33f89645308 (patch) | |
| tree | 87bcc5b35a5b2dda9fd187dea84d3c01def32744 | |
| parent | 1cc344ce42d8dddd6356c89ef3ceb58418676816 (diff) | |
| download | bitcoin-13b5dfef64bbb77d583b2acc59e2b33f89645308.tar.xz | |
Move crypto implementations to src/crypto/
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/crypto/sha1.cpp (renamed from src/sha1.cpp) | 2 | ||||
| -rw-r--r-- | src/crypto/sha1.h (renamed from src/sha1.h) | 0 | ||||
| -rw-r--r-- | src/crypto/sha2.cpp (renamed from src/sha2.cpp) | 2 | ||||
| -rw-r--r-- | src/crypto/sha2.h (renamed from src/sha2.h) | 0 | ||||
| -rw-r--r-- | src/hash.h | 2 | ||||
| -rw-r--r-- | src/key.cpp | 2 | ||||
| -rw-r--r-- | src/script.cpp | 4 | ||||
| -rw-r--r-- | src/test/sha1_tests.cpp | 2 | ||||
| -rw-r--r-- | src/test/sha2_tests.cpp | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 67b069bde1..bc65119a92 100644 --- 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/sha1.cpp b/src/crypto/sha1.cpp index 0a70077544..4b2e3e19d1 100644 --- a/src/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/sha1.h b/src/crypto/sha1.h index 6efde78a5b..6efde78a5b 100644 --- a/src/sha1.h +++ b/src/crypto/sha1.h diff --git a/src/sha2.cpp b/src/crypto/sha2.cpp index c9beaf220b..0d0c32883f 100644 --- a/src/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/sha2.h b/src/crypto/sha2.h index 001bfc647c..001bfc647c 100644 --- a/src/sha2.h +++ b/src/crypto/sha2.h diff --git a/src/hash.h b/src/hash.h index 9e7a67550f..318399c334 100644 --- 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 index 0685948922..96b1ac439c 100644 --- 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 index facf3044d6..c6574a6ee8 100644 --- 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 index bae17c5d4a..88f2da0bbb 100644 --- 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 index 516b942ad3..1e48c973cf 100644 --- 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> |