Fix diggest buffer reset in SHA2 and add test cases

Foundation/src/SHA2Engine.cpp

@@ -408,6 +408,7 @@ void SHA2Engine::reset()
 
 const DigestEngine::Digest& SHA2Engine::digest()
 {
+	_digest.clear();
 	if (_context == NULL) return _digest;
 	HASHCONTEXT* pContext = (HASHCONTEXT*)_context;
 	size_t last, padn;

Foundation/testsuite/src/CryptTestSuite.cpp

@@ -14,6 +14,7 @@
 #include "MD4EngineTest.h"
 #include "MD5EngineTest.h"
 #include "SHA1EngineTest.h"
+#include "SHA2EngineTest.h"
 #include "HMACEngineTest.h"
 #include "PBKDF2EngineTest.h"
 #include "DigestStreamTest.h"
@@ -28,6 +29,7 @@ CppUnit::Test* CryptTestSuite::suite()
 	pSuite->addTest(MD4EngineTest::suite());
 	pSuite->addTest(MD5EngineTest::suite());
 	pSuite->addTest(SHA1EngineTest::suite());
+	pSuite->addTest(SHA2EngineTest::suite());
 	pSuite->addTest(HMACEngineTest::suite());
 	pSuite->addTest(PBKDF2EngineTest::suite());
 	pSuite->addTest(DigestStreamTest::suite());

Foundation/testsuite/src/SHA2EngineTest.cpp

@@ -0,0 +1,117 @@
+//
+// SHA2EngineTest.cpp
+//
+// $Id: //poco/1.4/Foundation/testsuite/src/SHA2EngineTest.cpp#1 $
+//
+// Code of the SHA2EngineTest class.
+//
+// test vectors from FIPS 180-1
+//
+
+#include "SHA2EngineTest.h"
+#include "Poco/CppUnit/TestCaller.h"
+#include "Poco/CppUnit/TestSuite.h"
+#include "Poco/SHA2Engine.h"
+
+using Poco::SHA2Engine;
+using Poco::DigestEngine;
+
+SHA2EngineTest::SHA2EngineTest(const std::string& rName): CppUnit::TestCase(rName)
+{
+}
+
+SHA2EngineTest::~SHA2EngineTest()
+{
+}
+
+void SHA2EngineTest::testSHA224()
+{
+	SHA2Engine engine(SHA2Engine::SHA_224);
+
+	engine.update("abc");
+	assert(DigestEngine::digestToHex(engine.digest()) == "23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7");
+
+	engine.update("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq");
+	assert(DigestEngine::digestToHex(engine.digest()) == "75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525");
+
+	engine.update("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu");
+	assert(DigestEngine::digestToHex(engine.digest()) == "c97ca9a559850ce97a04a96def6d99a9e0e0e2ab14e6b8df265fc0b3");
+
+	for (int i = 0; i < 1000000; ++i)
+		engine.update('a');
+	assert(DigestEngine::digestToHex(engine.digest()) == "20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67");
+}
+
+void SHA2EngineTest::testSHA256()
+{
+	SHA2Engine engine(SHA2Engine::SHA_256);
+
+	engine.update("abc");
+	assert(DigestEngine::digestToHex(engine.digest()) == "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad");
+
+	engine.update("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq");
+	assert(DigestEngine::digestToHex(engine.digest()) == "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1");
+
+	engine.update("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu");
+	assert(DigestEngine::digestToHex(engine.digest()) == "cf5b16a778af8380036ce59e7b0492370b249b11e8f07a51afac45037afee9d1");
+
+	for (int i = 0; i < 1000000; ++i)
+		engine.update('a');
+	assert(DigestEngine::digestToHex(engine.digest()) == "cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0");
+}
+
+void SHA2EngineTest::testSHA384()
+{
+	SHA2Engine engine(SHA2Engine::SHA_384);
+
+	engine.update("abc");
+	assert(DigestEngine::digestToHex(engine.digest()) == "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7");
+
+	engine.update("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq");
+	assert(DigestEngine::digestToHex(engine.digest()) == "3391fdddfc8dc7393707a65b1b4709397cf8b1d162af05abfe8f450de5f36bc6b0455a8520bc4e6f5fe95b1fe3c8452b");
+
+	engine.update("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu");
+	assert(DigestEngine::digestToHex(engine.digest()) == "09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712fcc7c71a557e2db966c3e9fa91746039");
+
+	for (int i = 0; i < 1000000; ++i)
+		engine.update('a');
+	assert(DigestEngine::digestToHex(engine.digest()) == "9d0e1809716474cb086e834e310a4a1ced149e9c00f248527972cec5704c2a5b07b8b3dc38ecc4ebae97ddd87f3d8985");
+}
+
+void SHA2EngineTest::testSHA512()
+{
+	SHA2Engine engine(SHA2Engine::SHA_512);
+
+	engine.update("abc");
+	assert(DigestEngine::digestToHex(engine.digest()) == "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f");
+
+	engine.update("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq");
+	assert(DigestEngine::digestToHex(engine.digest()) == "204a8fc6dda82f0a0ced7beb8e08a41657c16ef468b228a8279be331a703c33596fd15c13b1b07f9aa1d3bea57789ca031ad85c7a71dd70354ec631238ca3445");
+
+	engine.update("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu");
+	assert(DigestEngine::digestToHex(engine.digest()) == "8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909");
+
+	for (int i = 0; i < 1000000; ++i)
+		engine.update('a');
+	assert(DigestEngine::digestToHex(engine.digest()) == "e718483d0ce769644e2e42c7bc15b4638e1f98b13b2044285632a803afa973ebde0ff244877ea60a4cb0432ce577c31beb009c5c2c49aa2e4eadb217ad8cc09b");
+}
+
+void SHA2EngineTest::setUp()
+{
+}
+
+void SHA2EngineTest::tearDown()
+{
+}
+
+CppUnit::Test* SHA2EngineTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("SHA2EngineTest");
+
+	CppUnit_addTest(pSuite, SHA2EngineTest, testSHA224);
+	CppUnit_addTest(pSuite, SHA2EngineTest, testSHA256);
+	CppUnit_addTest(pSuite, SHA2EngineTest, testSHA384);
+	CppUnit_addTest(pSuite, SHA2EngineTest, testSHA512);
+
+	return pSuite;
+}

Foundation/testsuite/src/SHA2EngineTest.h

@@ -0,0 +1,34 @@
+//
+// SHA2EngineTest.h
+//
+// $Id: //poco/1.4/Foundation/testsuite/src/SHA2EngineTest.h#1 $
+//
+// Definition of the SHA2EngineTest class.
+//
+
+#ifndef SHA2EngineTest_INCLUDED
+#define SHA2EngineTest_INCLUDED
+
+#include "Poco/Foundation.h"
+#include "Poco/CppUnit/TestCase.h"
+
+class SHA2EngineTest: public CppUnit::TestCase
+{
+public:
+	SHA2EngineTest(const std::string& name);
+	~SHA2EngineTest();
+
+	void testSHA224();
+	void testSHA256();
+	void testSHA384();
+	void testSHA512();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+#endif // SHA2EngineTest_INCLUDED