From 89f997ec0d93345fa3134d1c906bf16246a51fc1 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Thu, 11 Nov 2010 02:56:24 +0000
Subject: 2010-11-11  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>

	Replaced MessageDigestContext with MessageDigest.  Cleaned up
	unnecessary functions in MessageDigestHelper.
	* src/BtPieceMessage.cc
	* src/Checksum.h
	* src/DHTTokenTracker.cc
	* src/DownloadCommand.cc
	* src/DownloadCommand.h
	* src/HashFuncEntry.h
	* src/IteratableChecksumValidator.cc
	* src/IteratableChecksumValidator.h
	* src/IteratableChunkChecksumValidator.cc
	* src/IteratableChunkChecksumValidator.h
	* src/LibgcryptMessageDigestImpl.cc
	* src/LibgcryptMessageDigestImpl.h
	* src/LibsslMessageDigestImpl.cc
	* src/LibsslMessageDigestImpl.h
	* src/MSEHandshake.cc
	* src/MSEHandshake.h
	* src/Makefile.am
	* src/MessageDigest.cc
	* src/MessageDigest.h
	* src/MessageDigestHelper.cc
	* src/MessageDigestHelper.h
	* src/MessageDigestImpl.h
	* src/MetalinkParserController.cc
	* src/Piece.cc
	* src/Piece.h
	* src/UTMetadataDataExtensionMessage.cc
	* src/bittorrent_helper.cc
	* src/messageDigest.cc: Removed
	* src/messageDigest.h: Removed
	* src/util.cc
	* src/version_usage.cc
	* test/BittorrentHelperTest.cc
	* test/GZipDecoderTest.cc
	* test/GZipDecodingStreamFilterTest.cc
	* test/IteratableChecksumValidatorTest.cc
	* test/IteratableChunkChecksumValidatorTest.cc
	* test/Makefile.am
	* test/MessageDigestHelperTest.cc
	* test/MessageDigestTest.cc
	* test/Metalink2RequestGroupTest.cc
	* test/MetalinkProcessorTest.cc
	* test/PieceTest.cc
	* test/TestUtil.cc
	* test/TestUtil.h
	* test/UTMetadataDataExtensionMessageTest.cc
	* test/UTMetadataPostDownloadHandlerTest.cc
---
 src/IteratableChecksumValidator.cc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/IteratableChecksumValidator.cc')

diff --git a/src/IteratableChecksumValidator.cc b/src/IteratableChecksumValidator.cc
index a6679f5a..02f41869 100644
--- a/src/IteratableChecksumValidator.cc
+++ b/src/IteratableChecksumValidator.cc
@@ -39,7 +39,7 @@
 #include "util.h"
 #include "message.h"
 #include "PieceStorage.h"
-#include "messageDigest.h"
+#include "MessageDigest.h"
 #include "LogFactory.h"
 #include "Logger.h"
 #include "DiskAdaptor.h"
@@ -76,10 +76,10 @@ void IteratableChecksumValidator::validateChunk()
     size_t length = pieceStorage_->getDiskAdaptor()->readData(buffer_,
                                                               BUFSIZE,
                                                               currentOffset_);
-    ctx_->digestUpdate(buffer_, length);
+    ctx_->update(buffer_, length);
     currentOffset_ += length;
     if(finished()) {
-      std::string actualChecksum = util::toHex(ctx_->digestFinal());
+      std::string actualChecksum = ctx_->hexDigest();
       if(dctx_->getChecksum() == actualChecksum) {
         pieceStorage_->markAllPiecesDone();
       } else {
@@ -117,9 +117,7 @@ void IteratableChecksumValidator::init()
 #endif // !HAVE_POSIX_MEMALIGN
   pieceStorage_->getDiskAdaptor()->enableDirectIO();
   currentOffset_ = 0;
-  ctx_.reset(new MessageDigestContext());
-  ctx_->trySetAlgo(dctx_->getChecksumHashAlgo());
-  ctx_->digestInit();
+  ctx_ = MessageDigest::create(dctx_->getChecksumHashAlgo());
 }
 
 } // namespace aria2
-- 
cgit