From e18e8aeeaa2c24591b0ebb89984cbdc30a0f25a8 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 12 Sep 2014 00:49:55 +0900 Subject: [PATCH] Support Adler32 checksum Adler32 checksum is available for --checksum option and hash element in Metalink files. Currently, we use Adler32 implementation in Zlib. --- src/Adler32MessageDigestImpl.cc | 76 +++++++++++++++++++++++++++++++ src/Adler32MessageDigestImpl.h | 67 +++++++++++++++++++++++++++ src/AppleMessageDigestImpl.cc | 3 ++ src/InternalMessageDigestImpl.cc | 3 ++ src/LibgcryptMessageDigestImpl.cc | 3 ++ src/LibnettleMessageDigestImpl.cc | 3 ++ src/LibsslMessageDigestImpl.cc | 3 ++ src/Makefile.am | 3 +- src/MessageDigest.cc | 3 +- test/MessageDigestTest.cc | 16 +++++++ 10 files changed, 178 insertions(+), 2 deletions(-) create mode 100644 src/Adler32MessageDigestImpl.cc create mode 100644 src/Adler32MessageDigestImpl.h diff --git a/src/Adler32MessageDigestImpl.cc b/src/Adler32MessageDigestImpl.cc new file mode 100644 index 00000000..96ce07ca --- /dev/null +++ b/src/Adler32MessageDigestImpl.cc @@ -0,0 +1,76 @@ +/* */ +#include "Adler32MessageDigestImpl.h" + +#include + +#include + +#include "a2netcompat.h" + +namespace aria2 { + +Adler32MessageDigestImpl::Adler32MessageDigestImpl() + : adler_(adler32(0, Z_NULL, 0)) +{} + +size_t Adler32MessageDigestImpl::getDigestLength() const +{ + return length(); +} + +void Adler32MessageDigestImpl::reset() +{ + adler_ = adler32(0, Z_NULL, 0); +} + +void Adler32MessageDigestImpl::update(const void* data, size_t length) +{ + adler_ = adler32(adler_, reinterpret_cast(data), + length); +} + +void Adler32MessageDigestImpl::digest(unsigned char* md) +{ + auto adler = htonl(adler_); + memcpy(md, &adler, getDigestLength()); +} + +size_t Adler32MessageDigestImpl::length() +{ + return 4; +} + +} // namespace aria2 diff --git a/src/Adler32MessageDigestImpl.h b/src/Adler32MessageDigestImpl.h new file mode 100644 index 00000000..1fb91785 --- /dev/null +++ b/src/Adler32MessageDigestImpl.h @@ -0,0 +1,67 @@ +/* */ +#ifndef D_ADLER32_MESSAGE_DIGEST_H +#define D_ADLER32_MESSAGE_DIGEST_H + +#include "MessageDigestImpl.h" + +namespace aria2 { + +#ifdef HAVE_ZLIB + +#define ADLER32_MESSAGE_DIGEST \ + { "adler32", make_hi() }, + +class Adler32MessageDigestImpl : public MessageDigestImpl { +public: + Adler32MessageDigestImpl(); + virtual size_t getDigestLength() const CXX11_OVERRIDE; + virtual void reset() CXX11_OVERRIDE; + virtual void update(const void* data, size_t length) CXX11_OVERRIDE; + virtual void digest(unsigned char* md) CXX11_OVERRIDE; + static size_t length(); +private: + unsigned long adler_; +}; + +#else // !HAVE_ZLIB + +#define ADLER32_MESSAGE_DIGEST + +#endif // !HAVE_ZLIB + +} // namespace aria2 + +#endif // D_ADLER32_MESSAGE_DIGEST_H diff --git a/src/AppleMessageDigestImpl.cc b/src/AppleMessageDigestImpl.cc index 5a5d45e6..59e4c4dd 100644 --- a/src/AppleMessageDigestImpl.cc +++ b/src/AppleMessageDigestImpl.cc @@ -37,6 +37,8 @@ #include +#include "Adler32MessageDigestImpl.h" + namespace aria2 { namespace { @@ -126,6 +128,7 @@ MessageDigestImpl::hashes_t MessageDigestImpl::hashes = { { "sha-384", make_hi() }, { "sha-512", make_hi() }, { "md5", make_hi() }, + ADLER32_MESSAGE_DIGEST }; } // namespace aria2 diff --git a/src/InternalMessageDigestImpl.cc b/src/InternalMessageDigestImpl.cc index c9ad99a7..f8dd70eb 100644 --- a/src/InternalMessageDigestImpl.cc +++ b/src/InternalMessageDigestImpl.cc @@ -37,6 +37,8 @@ #include "crypto_hash.h" +#include "Adler32MessageDigestImpl.h" + namespace { using namespace aria2; using namespace crypto; @@ -101,6 +103,7 @@ MessageDigestImpl::hashes_t MessageDigestImpl::hashes = { { "sha-384", make_hi() }, { "sha-512", make_hi() }, { "md5", make_hi() }, + ADLER32_MESSAGE_DIGEST }; } // namespace aria2 diff --git a/src/LibgcryptMessageDigestImpl.cc b/src/LibgcryptMessageDigestImpl.cc index 508b96be..8d43a665 100644 --- a/src/LibgcryptMessageDigestImpl.cc +++ b/src/LibgcryptMessageDigestImpl.cc @@ -37,6 +37,8 @@ #include +#include "Adler32MessageDigestImpl.h" + namespace aria2 { namespace { @@ -116,6 +118,7 @@ MessageDigestImpl::hashes_t MessageDigestImpl::hashes = { { "sha-384", make_hi() }, { "sha-512", make_hi() }, { "md5", make_hi() }, + ADLER32_MESSAGE_DIGEST }; } // namespace aria2 diff --git a/src/LibnettleMessageDigestImpl.cc b/src/LibnettleMessageDigestImpl.cc index 1f03c2e6..f63a820c 100644 --- a/src/LibnettleMessageDigestImpl.cc +++ b/src/LibnettleMessageDigestImpl.cc @@ -37,6 +37,8 @@ #include +#include "Adler32MessageDigestImpl.h" + namespace aria2 { namespace { @@ -95,6 +97,7 @@ MessageDigestImpl::hashes_t MessageDigestImpl::hashes = { { "sha-384", make_hi() }, { "sha-512", make_hi() }, { "md5", make_hi() }, + ADLER32_MESSAGE_DIGEST }; } // namespace aria2 diff --git a/src/LibsslMessageDigestImpl.cc b/src/LibsslMessageDigestImpl.cc index 037fc45f..1077e8e3 100644 --- a/src/LibsslMessageDigestImpl.cc +++ b/src/LibsslMessageDigestImpl.cc @@ -37,6 +37,8 @@ #include +#include "Adler32MessageDigestImpl.h" + namespace aria2 { template @@ -102,6 +104,7 @@ MessageDigestImpl::hashes_t MessageDigestImpl::hashes = { { "sha-512", make_hi >() }, #endif { "md5", make_hi() }, + ADLER32_MESSAGE_DIGEST }; } // namespace aria2 diff --git a/src/Makefile.am b/src/Makefile.am index bcf25948..cd49f94f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -417,7 +417,8 @@ if HAVE_ZLIB SRCS += \ GZipDecodingStreamFilter.cc GZipDecodingStreamFilter.h\ GZipEncoder.cc GZipEncoder.h\ - GZipFile.cc GZipFile.h + GZipFile.cc GZipFile.h \ + Adler32MessageDigestImpl.cc Adler32MessageDigestImpl.h endif # HAVE_ZLIB if HAVE_SQLITE3 diff --git a/src/MessageDigest.cc b/src/MessageDigest.cc index 731a9420..77c43e31 100644 --- a/src/MessageDigest.cc +++ b/src/MessageDigest.cc @@ -59,7 +59,8 @@ HashTypeEntry hashTypes[] = { HashTypeEntry("sha-256", 3), HashTypeEntry("sha-384", 4), HashTypeEntry("sha-512", 5), - HashTypeEntry("md5", 0) + HashTypeEntry("md5", 0), + HashTypeEntry("adler32", 0), }; } // namespace aria2 diff --git a/test/MessageDigestTest.cc b/test/MessageDigestTest.cc index 4608ca53..513ec3c9 100644 --- a/test/MessageDigestTest.cc +++ b/test/MessageDigestTest.cc @@ -19,11 +19,15 @@ class MessageDigestTest:public CppUnit::TestFixture { std::unique_ptr sha1_; std::unique_ptr md5_; + std::unique_ptr adler32_; public: void setUp() { md5_ = MessageDigest::create("md5"); sha1_ = MessageDigest::sha1(); +#ifdef HAVE_ZLIB + adler32_ = MessageDigest::create("adler32"); +#endif // HAVE_ZLIB } void testDigest(); @@ -54,6 +58,18 @@ void MessageDigestTest::testDigest() sha1_->update("abc", 3); CPPUNIT_ASSERT_EQUAL(std::string("a9993e364706816aba3e25717850c26c9cd0d89d"), util::toHex(sha1_->digest())); + +#ifdef HAVE_ZLIB + adler32_->reset(); + adler32_->update("aria2", 5); + CPPUNIT_ASSERT_EQUAL(std::string("05e101d0"), + util::toHex(adler32_->digest())); + + adler32_->reset(); + adler32_->update("abc", 3); + CPPUNIT_ASSERT_EQUAL(std::string("024d0127"), + util::toHex(adler32_->digest())); +#endif // HAVE_ZLIB } void MessageDigestTest::testSupports()