diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-01 14:57:49 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-01 14:57:58 +0100 |
| commit | f0877f8b6200dcf6df12df5e69d498d365f81f8b (patch) | |
| tree | dc5f63386a9c0752a62301a815d6a976286a1b42 /src/Makefile.am | |
| parent | 89151d9f29870cc9246f76baba75b75d3a7528d7 (diff) | |
| parent | 4cdaa95a209808276992dc1eb0ed0773f7927073 (diff) | |
| download | bitcoin-f0877f8b6200dcf6df12df5e69d498d365f81f8b.tar.xz | |
Merge pull request #5227
4cdaa95 Resize after succesful result (Pieter Wuille)
9d8604f Header define style cleanups (Pieter Wuille)
a53fd41 Deterministic signing (Pieter Wuille)
3060e36 Add the RFC6979 PRNG (Pieter Wuille)
a8f5087 Add HMAC-SHA256 (Pieter Wuille)
36fa4a7 Split up crypto/sha2 (Pieter Wuille)
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3ec9e2f85d..4c4f9f6937 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -203,10 +203,18 @@ libbitcoin_wallet_a_SOURCES = \ crypto_libbitcoin_crypto_a_CPPFLAGS = $(BITCOIN_CONFIG_INCLUDES) crypto_libbitcoin_crypto_a_SOURCES = \ crypto/sha1.cpp \ - crypto/sha2.cpp \ + crypto/sha256.cpp \ + crypto/sha512.cpp \ + crypto/hmac_sha256.cpp \ + crypto/rfc6979_hmac_sha256.cpp \ + crypto/hmac_sha512.cpp \ crypto/ripemd160.cpp \ crypto/common.h \ - crypto/sha2.h \ + crypto/sha256.h \ + crypto/sha512.h \ + crypto/hmac_sha256.h \ + crypto/rfc6979_hmac_sha256.h \ + crypto/hmac_sha512.h \ crypto/sha1.h \ crypto/ripemd160.h @@ -343,8 +351,10 @@ if BUILD_BITCOIN_LIBS include_HEADERS = script/bitcoinconsensus.h libbitcoinconsensus_la_SOURCES = \ core/transaction.cpp \ + crypto/hmac_sha512.cpp \ crypto/sha1.cpp \ - crypto/sha2.cpp \ + crypto/sha256.cpp \ + crypto/sha512.cpp \ crypto/ripemd160.cpp \ eccryptoverify.cpp \ ecwrapper.cpp \ |