From e85f9ccfd64b52419d47bd8f76c4b08eb2e0c422 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Wed, 8 Aug 2007 14:40:11 +0000 Subject: 2007-08-08 Tatsuhiro Tsujikawa MessageDigestHelper is introduced in order to simplify the use of message digest. Removed repeated code. The message digest algorithm is now specified by string, like "sha1", "md5". * src/messageDigest.{h, cc} * src/MessageDigestHelper.{h, cc}: New class. * src/DefaultPieceStorage.cc * src/DefaultBtContext.{h, cc} (computeFastSet): New function. (setInfoHash): Added for unit testing. (setNumPieces): Added for unit testing. * src/DefaultBtInteractive.cc * src/BtPieceMessage.cc * src/Peer.cc * src/Checksum.h * src/message.h * src/IteratableChecksumValidator.h * src/ChunkChecksumValidator.{h, cc}: Use IteratableChecksumValidator inside it. * src/SegmentMan.{h, cc} (checkIntegrity): Removed. * src/IteratableChunkChecksumValidator.{h, cc} * src/Util.h (sha1Sum): Removed. (simpleMessageDigest): Removed. (fileChecksum): Removed. (computeFastSet): Removed. * src/ShaVisitor.cc * src/ChunkChecksum.h * src/DownloadCommand.cc Removed messageDigest virtual functions. * src/MultiDiskAdaptor.{h, cc} * src/DiskAdaptor.h * src/ByteArrayDiskWriter.h * src/DiskWriter.h * src/DiskAdaptorWriter.h * src/AbstractSingleDiskAdaptor.{h, cc} * src/AbstractDiskWriter.{h, cc} Fixed comilation error when message digest is disabled. * src/MetalinkEntry.{h, cc} * src/MetalinkRequestInfo.cc Removed srandom and random. * src/SimpleRandomizer.h Added size() virtual function to DiskAdaptor * src/MultiDiskAdaptor.h Fixed the bug that causes that files are not opened correctly in multi-file torrent. * src/TorrentRequestInfo.cc * src/MultiDiskAdaptor.cc Added SHA256 support * src/messageDigest.cc * src/Xml2MetalinkProcessor.cc Show supported message digest algorithms * src/main.cc Updated contact info. * src/main.cc --- test/IteratableChunkChecksumValidatorTest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/IteratableChunkChecksumValidatorTest.cc') diff --git a/test/IteratableChunkChecksumValidatorTest.cc b/test/IteratableChunkChecksumValidatorTest.cc index fb34d243..65dbbe18 100644 --- a/test/IteratableChunkChecksumValidatorTest.cc +++ b/test/IteratableChunkChecksumValidatorTest.cc @@ -46,7 +46,7 @@ void IteratableChunkChecksumValidatorTest::testValidate() { DefaultDiskWriterHandle diskWriter = new DefaultDiskWriter(); diskWriter->openExistingFile("chunkChecksumTestFile250.txt"); - ChunkChecksumHandle chunkChecksum = new ChunkChecksum(DIGEST_ALGO_SHA1, + ChunkChecksumHandle chunkChecksum = new ChunkChecksum("sha1", checksums, 100); IteratableChunkChecksumValidator validator; @@ -64,7 +64,7 @@ void IteratableChunkChecksumValidatorTest::testValidate() { CPPUNIT_ASSERT(bitfieldMan.isAllBitSet()); checksums[1] = "ffffffffffffffffffffffffffffffffffffffff"; - chunkChecksum = new ChunkChecksum(DIGEST_ALGO_SHA1, + chunkChecksum = new ChunkChecksum("sha1", checksums, 100); validator.setChunkChecksum(chunkChecksum); -- cgit