diff --git a/Foundation/Foundation.vxbuild b/Foundation/Foundation.vxbuild
index 8771cde42..1e6ad3a27 100644
--- a/Foundation/Foundation.vxbuild
+++ b/Foundation/Foundation.vxbuild
@@ -91,6 +91,7 @@ SOURCES="
 	RotateStrategy.cpp
 	Runnable.cpp
 	SHA1Engine.cpp
+	SHA2Engine.cpp
 	Semaphore.cpp
 	SharedLibrary.cpp
 	SimpleFileChannel.cpp
diff --git a/Foundation/Foundation_CE_vs90.vcproj b/Foundation/Foundation_CE_vs90.vcproj
index d4307d333..4ab67f9ec 100644
--- a/Foundation/Foundation_CE_vs90.vcproj
+++ b/Foundation/Foundation_CE_vs90.vcproj
@@ -1804,6 +1804,8 @@
 					RelativePath=".\src\RandomStream.cpp"/>
 				<File
 					RelativePath=".\src\SHA1Engine.cpp"/>
+				<File
+					RelativePath=".\src\SHA2Engine.cpp"/>
 			</Filter>
 			<Filter
 				Name="Header Files">
@@ -1825,6 +1827,8 @@
 					RelativePath=".\include\Poco\RandomStream.h"/>
 				<File
 					RelativePath=".\include\Poco\SHA1Engine.h"/>
+				<File
+					RelativePath=".\include\Poco\SHA2Engine.h"/>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/Foundation/Foundation_WEC2013_vs110.vcxproj b/Foundation/Foundation_WEC2013_vs110.vcxproj
index 042e9550a..799766cc0 100644
--- a/Foundation/Foundation_WEC2013_vs110.vcxproj
+++ b/Foundation/Foundation_WEC2013_vs110.vcxproj
@@ -610,6 +610,7 @@
     <ClCompile Include="src\Random.cpp" />
     <ClCompile Include="src\RandomStream.cpp" />
     <ClCompile Include="src\SHA1Engine.cpp" />
+    <ClCompile Include="src\SHA2Engine.cpp" />
     <ClCompile Include="src\Manifest.cpp" />
     <ClCompile Include="src\SharedLibrary.cpp" />
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
@@ -1236,6 +1237,7 @@
     <ClInclude Include="include\Poco\Random.h" />
     <ClInclude Include="include\Poco\RandomStream.h" />
     <ClInclude Include="include\Poco\SHA1Engine.h" />
+    <ClInclude Include="include\Poco\SHA2Engine.h" />
     <ClInclude Include="include\Poco\ClassLibrary.h" />
     <ClInclude Include="include\Poco\ClassLoader.h" />
     <ClInclude Include="include\Poco\Manifest.h" />
diff --git a/Foundation/Foundation_WEC2013_vs110.vcxproj.filters b/Foundation/Foundation_WEC2013_vs110.vcxproj.filters
index 3f40baaea..12afbd6bb 100644
--- a/Foundation/Foundation_WEC2013_vs110.vcxproj.filters
+++ b/Foundation/Foundation_WEC2013_vs110.vcxproj.filters
@@ -465,6 +465,9 @@
     <ClCompile Include="src\SHA1Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2Engine.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Manifest.cpp">
       <Filter>SharedLibrary\Source Files</Filter>
     </ClCompile>
@@ -1361,6 +1364,9 @@
     <ClInclude Include="include\Poco\SHA1Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SHA2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\ClassLibrary.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/Foundation_WEC2013_vs120.vcxproj b/Foundation/Foundation_WEC2013_vs120.vcxproj
index 661404776..6231a05bc 100644
--- a/Foundation/Foundation_WEC2013_vs120.vcxproj
+++ b/Foundation/Foundation_WEC2013_vs120.vcxproj
@@ -610,6 +610,7 @@
     <ClCompile Include="src\Random.cpp" />
     <ClCompile Include="src\RandomStream.cpp" />
     <ClCompile Include="src\SHA1Engine.cpp" />
+    <ClCompile Include="src\SHA2Engine.cpp" />
     <ClCompile Include="src\Manifest.cpp" />
     <ClCompile Include="src\SharedLibrary.cpp" />
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
@@ -1236,6 +1237,7 @@
     <ClInclude Include="include\Poco\Random.h" />
     <ClInclude Include="include\Poco\RandomStream.h" />
     <ClInclude Include="include\Poco\SHA1Engine.h" />
+    <ClInclude Include="include\Poco\SHA2Engine.h" />
     <ClInclude Include="include\Poco\ClassLibrary.h" />
     <ClInclude Include="include\Poco\ClassLoader.h" />
     <ClInclude Include="include\Poco\Manifest.h" />
diff --git a/Foundation/Foundation_WEC2013_vs120.vcxproj.filters b/Foundation/Foundation_WEC2013_vs120.vcxproj.filters
index 9570a6cbc..8438c98cd 100644
--- a/Foundation/Foundation_WEC2013_vs120.vcxproj.filters
+++ b/Foundation/Foundation_WEC2013_vs120.vcxproj.filters
@@ -465,6 +465,9 @@
     <ClCompile Include="src\SHA1Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2Engine.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Manifest.cpp">
       <Filter>SharedLibrary\Source Files</Filter>
     </ClCompile>
@@ -1361,6 +1364,9 @@
     <ClInclude Include="include\Poco\SHA1Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SHA2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\ClassLibrary.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/Foundation_vs100.vcxproj b/Foundation/Foundation_vs100.vcxproj
index b4a81655d..f0ef4e5b2 100644
--- a/Foundation/Foundation_vs100.vcxproj
+++ b/Foundation/Foundation_vs100.vcxproj
@@ -539,6 +539,7 @@
     <ClCompile Include="src\Random.cpp"/>
     <ClCompile Include="src\RandomStream.cpp"/>
     <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\SHA2Engine.cpp"/>
     <ClCompile Include="src\Manifest.cpp"/>
     <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
@@ -1132,6 +1133,7 @@
     <ClInclude Include="include\Poco\Random.h"/>
     <ClInclude Include="include\Poco\RandomStream.h"/>
     <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\SHA2Engine.h"/>
     <ClInclude Include="include\Poco\ClassLibrary.h"/>
     <ClInclude Include="include\Poco\ClassLoader.h"/>
     <ClInclude Include="include\Poco\Manifest.h"/>
diff --git a/Foundation/Foundation_vs100.vcxproj.filters b/Foundation/Foundation_vs100.vcxproj.filters
index 7684dde98..fa69faf52 100644
--- a/Foundation/Foundation_vs100.vcxproj.filters
+++ b/Foundation/Foundation_vs100.vcxproj.filters
@@ -477,6 +477,9 @@
     <ClCompile Include="src\SHA1Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2Engine.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Manifest.cpp">
       <Filter>SharedLibrary\Source Files</Filter>
     </ClCompile>
@@ -1349,6 +1352,9 @@
     <ClInclude Include="include\Poco\SHA1Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SHA2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\ClassLibrary.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/Foundation_vs110.vcxproj b/Foundation/Foundation_vs110.vcxproj
index 153408c0a..136e586c8 100644
--- a/Foundation/Foundation_vs110.vcxproj
+++ b/Foundation/Foundation_vs110.vcxproj
@@ -543,6 +543,7 @@
     <ClCompile Include="src\Random.cpp"/>
     <ClCompile Include="src\RandomStream.cpp"/>
     <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\SHA2Engine.cpp"/>
     <ClCompile Include="src\Manifest.cpp"/>
     <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
@@ -1136,6 +1137,7 @@
     <ClInclude Include="include\Poco\Random.h"/>
     <ClInclude Include="include\Poco\RandomStream.h"/>
     <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\SHA2Engine.h"/>
     <ClInclude Include="include\Poco\ClassLibrary.h"/>
     <ClInclude Include="include\Poco\ClassLoader.h"/>
     <ClInclude Include="include\Poco\Manifest.h"/>
diff --git a/Foundation/Foundation_vs110.vcxproj.filters b/Foundation/Foundation_vs110.vcxproj.filters
index 599ab6f08..415ffeb33 100644
--- a/Foundation/Foundation_vs110.vcxproj.filters
+++ b/Foundation/Foundation_vs110.vcxproj.filters
@@ -477,6 +477,9 @@
     <ClCompile Include="src\SHA1Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2Engine.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Manifest.cpp">
       <Filter>SharedLibrary\Source Files</Filter>
     </ClCompile>
@@ -1349,6 +1352,9 @@
     <ClInclude Include="include\Poco\SHA1Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SHA2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\ClassLibrary.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/Foundation_vs120.vcxproj b/Foundation/Foundation_vs120.vcxproj
index f5d08dba0..774b1fb9e 100644
--- a/Foundation/Foundation_vs120.vcxproj
+++ b/Foundation/Foundation_vs120.vcxproj
@@ -547,6 +547,7 @@
     <ClCompile Include="src\Random.cpp"/>
     <ClCompile Include="src\RandomStream.cpp"/>
     <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\SHA2Engine.cpp"/>
     <ClCompile Include="src\Manifest.cpp"/>
     <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
@@ -1140,6 +1141,7 @@
     <ClInclude Include="include\Poco\Random.h"/>
     <ClInclude Include="include\Poco\RandomStream.h"/>
     <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\SHA2Engine.h"/>
     <ClInclude Include="include\Poco\ClassLibrary.h"/>
     <ClInclude Include="include\Poco\ClassLoader.h"/>
     <ClInclude Include="include\Poco\Manifest.h"/>
diff --git a/Foundation/Foundation_vs120.vcxproj.filters b/Foundation/Foundation_vs120.vcxproj.filters
index f44731a84..3b33ea1c4 100644
--- a/Foundation/Foundation_vs120.vcxproj.filters
+++ b/Foundation/Foundation_vs120.vcxproj.filters
@@ -477,6 +477,9 @@
     <ClCompile Include="src\SHA1Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2Engine.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Manifest.cpp">
       <Filter>SharedLibrary\Source Files</Filter>
     </ClCompile>
@@ -1349,6 +1352,9 @@
     <ClInclude Include="include\Poco\SHA1Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SHA2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\ClassLibrary.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/Foundation_vs140.vcxproj b/Foundation/Foundation_vs140.vcxproj
index ab4f9228d..7596761f2 100644
--- a/Foundation/Foundation_vs140.vcxproj
+++ b/Foundation/Foundation_vs140.vcxproj
@@ -825,6 +825,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\SHA2Engine.cpp"/>
     <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
@@ -1232,6 +1233,7 @@
     <ClInclude Include="include\Poco\Semaphore_POSIX.h"/>
     <ClInclude Include="include\Poco\Semaphore_WIN32.h"/>
     <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\SHA2Engine.h"/>
     <ClInclude Include="include\Poco\SharedLibrary.h"/>
     <ClInclude Include="include\Poco\SharedLibrary_HPUX.h"/>
     <ClInclude Include="include\Poco\SharedLibrary_UNIX.h"/>
diff --git a/Foundation/Foundation_vs140.vcxproj.filters b/Foundation/Foundation_vs140.vcxproj.filters
index 28b5ba753..91e38cb8f 100644
--- a/Foundation/Foundation_vs140.vcxproj.filters
+++ b/Foundation/Foundation_vs140.vcxproj.filters
@@ -477,6 +477,9 @@
     <ClCompile Include="src\SHA1Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2Engine.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Manifest.cpp">
       <Filter>SharedLibrary\Source Files</Filter>
     </ClCompile>
@@ -1349,6 +1352,9 @@
     <ClInclude Include="include\Poco\SHA1Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SHA2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\ClassLibrary.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/Foundation_vs150.vcxproj b/Foundation/Foundation_vs150.vcxproj
index 833a5d8d7..206eaaa60 100644
--- a/Foundation/Foundation_vs150.vcxproj
+++ b/Foundation/Foundation_vs150.vcxproj
@@ -825,6 +825,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\SHA2Engine.cpp"/>
     <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
@@ -1232,6 +1233,7 @@
     <ClInclude Include="include\Poco\Semaphore_POSIX.h"/>
     <ClInclude Include="include\Poco\Semaphore_WIN32.h"/>
     <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\SHA2Engine.h"/>
     <ClInclude Include="include\Poco\SharedLibrary.h"/>
     <ClInclude Include="include\Poco\SharedLibrary_HPUX.h"/>
     <ClInclude Include="include\Poco\SharedLibrary_UNIX.h"/>
diff --git a/Foundation/Foundation_vs150.vcxproj.filters b/Foundation/Foundation_vs150.vcxproj.filters
index 28b5ba753..91e38cb8f 100644
--- a/Foundation/Foundation_vs150.vcxproj.filters
+++ b/Foundation/Foundation_vs150.vcxproj.filters
@@ -477,6 +477,9 @@
     <ClCompile Include="src\SHA1Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2Engine.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Manifest.cpp">
       <Filter>SharedLibrary\Source Files</Filter>
     </ClCompile>
@@ -1349,6 +1352,9 @@
     <ClInclude Include="include\Poco\SHA1Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SHA2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\ClassLibrary.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/Foundation_vs90.vcproj b/Foundation/Foundation_vs90.vcproj
index be014728a..fdf7b3c90 100644
--- a/Foundation/Foundation_vs90.vcproj
+++ b/Foundation/Foundation_vs90.vcproj
@@ -1758,6 +1758,8 @@
 					RelativePath=".\src\RandomStream.cpp"/>
 				<File
 					RelativePath=".\src\SHA1Engine.cpp"/>
+				<File
+					RelativePath=".\src\SHA2Engine.cpp"/>
 			</Filter>
 			<Filter
 				Name="Header Files">
@@ -1779,6 +1781,8 @@
 					RelativePath=".\include\Poco\RandomStream.h"/>
 				<File
 					RelativePath=".\include\Poco\SHA1Engine.h"/>
+				<File
+					RelativePath=".\include\Poco\SHA2Engine.h"/>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/Foundation/Foundation_x64_vs100.vcxproj b/Foundation/Foundation_x64_vs100.vcxproj
index 8d7574a27..92ffd45ee 100644
--- a/Foundation/Foundation_x64_vs100.vcxproj
+++ b/Foundation/Foundation_x64_vs100.vcxproj
@@ -537,6 +537,7 @@
     <ClCompile Include="src\Random.cpp"/>
     <ClCompile Include="src\RandomStream.cpp"/>
     <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\SHA2Engine.cpp"/>
     <ClCompile Include="src\Manifest.cpp"/>
     <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
@@ -1130,6 +1131,7 @@
     <ClInclude Include="include\Poco\Random.h"/>
     <ClInclude Include="include\Poco\RandomStream.h"/>
     <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\SHA2Engine.h"/>
     <ClInclude Include="include\Poco\ClassLibrary.h"/>
     <ClInclude Include="include\Poco\ClassLoader.h"/>
     <ClInclude Include="include\Poco\Manifest.h"/>
diff --git a/Foundation/Foundation_x64_vs100.vcxproj.filters b/Foundation/Foundation_x64_vs100.vcxproj.filters
index c37c3dd27..5fb7907ea 100644
--- a/Foundation/Foundation_x64_vs100.vcxproj.filters
+++ b/Foundation/Foundation_x64_vs100.vcxproj.filters
@@ -477,6 +477,9 @@
     <ClCompile Include="src\SHA1Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2Engine.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Manifest.cpp">
       <Filter>SharedLibrary\Source Files</Filter>
     </ClCompile>
diff --git a/Foundation/Foundation_x64_vs110.vcxproj b/Foundation/Foundation_x64_vs110.vcxproj
index c27aad883..dabc282b1 100644
--- a/Foundation/Foundation_x64_vs110.vcxproj
+++ b/Foundation/Foundation_x64_vs110.vcxproj
@@ -541,6 +541,7 @@
     <ClCompile Include="src\Random.cpp"/>
     <ClCompile Include="src\RandomStream.cpp"/>
     <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\SHA2Engine.cpp"/>
     <ClCompile Include="src\Manifest.cpp"/>
     <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
@@ -1134,6 +1135,7 @@
     <ClInclude Include="include\Poco\Random.h"/>
     <ClInclude Include="include\Poco\RandomStream.h"/>
     <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\SHA2Engine.h"/>
     <ClInclude Include="include\Poco\ClassLibrary.h"/>
     <ClInclude Include="include\Poco\ClassLoader.h"/>
     <ClInclude Include="include\Poco\Manifest.h"/>
diff --git a/Foundation/Foundation_x64_vs110.vcxproj.filters b/Foundation/Foundation_x64_vs110.vcxproj.filters
index cb7e5604c..3a05a478d 100644
--- a/Foundation/Foundation_x64_vs110.vcxproj.filters
+++ b/Foundation/Foundation_x64_vs110.vcxproj.filters
@@ -477,6 +477,9 @@
     <ClCompile Include="src\SHA1Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2Engine.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Manifest.cpp">
       <Filter>SharedLibrary\Source Files</Filter>
     </ClCompile>
@@ -1349,6 +1352,9 @@
     <ClInclude Include="include\Poco\SHA1Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SHA2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\ClassLibrary.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/Foundation_x64_vs120.vcxproj b/Foundation/Foundation_x64_vs120.vcxproj
index f2f9b953e..8fb7a7bec 100644
--- a/Foundation/Foundation_x64_vs120.vcxproj
+++ b/Foundation/Foundation_x64_vs120.vcxproj
@@ -548,6 +548,7 @@
     <ClCompile Include="src\Random.cpp"/>
     <ClCompile Include="src\RandomStream.cpp"/>
     <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\SHA2Engine.cpp"/>
     <ClCompile Include="src\Manifest.cpp"/>
     <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
@@ -1141,6 +1142,7 @@
     <ClInclude Include="include\Poco\Random.h"/>
     <ClInclude Include="include\Poco\RandomStream.h"/>
     <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\SHA2Engine.h"/>
     <ClInclude Include="include\Poco\ClassLibrary.h"/>
     <ClInclude Include="include\Poco\ClassLoader.h"/>
     <ClInclude Include="include\Poco\Manifest.h"/>
diff --git a/Foundation/Foundation_x64_vs120.vcxproj.filters b/Foundation/Foundation_x64_vs120.vcxproj.filters
index 47592a772..6b187f9ad 100644
--- a/Foundation/Foundation_x64_vs120.vcxproj.filters
+++ b/Foundation/Foundation_x64_vs120.vcxproj.filters
@@ -477,6 +477,9 @@
     <ClCompile Include="src\SHA1Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2Engine.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Manifest.cpp">
       <Filter>SharedLibrary\Source Files</Filter>
     </ClCompile>
@@ -1349,6 +1352,9 @@
     <ClInclude Include="include\Poco\SHA1Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SHA2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\ClassLibrary.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/Foundation_x64_vs140.vcxproj b/Foundation/Foundation_x64_vs140.vcxproj
index ff704a676..b101f201a 100644
--- a/Foundation/Foundation_x64_vs140.vcxproj
+++ b/Foundation/Foundation_x64_vs140.vcxproj
@@ -823,6 +823,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\SHA2Engine.cpp"/>
     <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1230,6 +1231,7 @@
     <ClInclude Include="include\Poco\Semaphore_POSIX.h"/>
     <ClInclude Include="include\Poco\Semaphore_WIN32.h"/>
     <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\SHA2Engine.h"/>
     <ClInclude Include="include\Poco\SharedLibrary.h"/>
     <ClInclude Include="include\Poco\SharedLibrary_HPUX.h"/>
     <ClInclude Include="include\Poco\SharedLibrary_UNIX.h"/>
diff --git a/Foundation/Foundation_x64_vs140.vcxproj.filters b/Foundation/Foundation_x64_vs140.vcxproj.filters
index 6e7b8aab2..3a32faa67 100644
--- a/Foundation/Foundation_x64_vs140.vcxproj.filters
+++ b/Foundation/Foundation_x64_vs140.vcxproj.filters
@@ -477,6 +477,9 @@
     <ClCompile Include="src\SHA1Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2Engine.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Manifest.cpp">
       <Filter>SharedLibrary\Source Files</Filter>
     </ClCompile>
@@ -1349,6 +1352,9 @@
     <ClInclude Include="include\Poco\SHA1Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SHA2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\ClassLibrary.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/Foundation_x64_vs150.vcxproj b/Foundation/Foundation_x64_vs150.vcxproj
index a1363c41e..683e08868 100644
--- a/Foundation/Foundation_x64_vs150.vcxproj
+++ b/Foundation/Foundation_x64_vs150.vcxproj
@@ -823,6 +823,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\SHA2Engine.cpp"/>
     <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1230,6 +1231,7 @@
     <ClInclude Include="include\Poco\Semaphore_POSIX.h"/>
     <ClInclude Include="include\Poco\Semaphore_WIN32.h"/>
     <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\SHA2Engine.h"/>
     <ClInclude Include="include\Poco\SharedLibrary.h"/>
     <ClInclude Include="include\Poco\SharedLibrary_HPUX.h"/>
     <ClInclude Include="include\Poco\SharedLibrary_UNIX.h"/>
diff --git a/Foundation/Foundation_x64_vs150.vcxproj.filters b/Foundation/Foundation_x64_vs150.vcxproj.filters
index 6e7b8aab2..3a32faa67 100644
--- a/Foundation/Foundation_x64_vs150.vcxproj.filters
+++ b/Foundation/Foundation_x64_vs150.vcxproj.filters
@@ -477,6 +477,9 @@
     <ClCompile Include="src\SHA1Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2Engine.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Manifest.cpp">
       <Filter>SharedLibrary\Source Files</Filter>
     </ClCompile>
@@ -1349,6 +1352,9 @@
     <ClInclude Include="include\Poco\SHA1Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SHA2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\ClassLibrary.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/Foundation_x64_vs90.vcproj b/Foundation/Foundation_x64_vs90.vcproj
index 1aac94c14..26557619f 100644
--- a/Foundation/Foundation_x64_vs90.vcproj
+++ b/Foundation/Foundation_x64_vs90.vcproj
@@ -1763,6 +1763,8 @@
 					RelativePath=".\src\RandomStream.cpp"/>
 				<File
 					RelativePath=".\src\SHA1Engine.cpp"/>
+				<File
+					RelativePath=".\src\SHA2Engine.cpp"/>
 			</Filter>
 			<Filter
 				Name="Header Files">
@@ -1784,6 +1786,8 @@
 					RelativePath=".\include\Poco\RandomStream.h"/>
 				<File
 					RelativePath=".\include\Poco\SHA1Engine.h"/>
+				<File
+					RelativePath=".\include\Poco\SHA2Engine.h"/>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/Foundation/Makefile b/Foundation/Makefile
index a347daacc..7a497e165 100644
--- a/Foundation/Makefile
+++ b/Foundation/Makefile
@@ -23,7 +23,7 @@ objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel \
 	NullStream NumberFormatter NumberParser NumericString AbstractObserver \
 	Path PatternFormatter Process PurgeStrategy RWLock Random RandomStream \
 	DirectoryIteratorStrategy RegularExpression RefCountedObject Runnable RotateStrategy \
-	SHA1Engine Semaphore SharedLibrary SimpleFileChannel \
+	SHA1Engine SHA2Engine Semaphore SharedLibrary SimpleFileChannel \
 	SignalHandler SplitterChannel SortedDirectoryIterator Stopwatch StreamChannel \
 	StreamConverter StreamCopier StreamTokenizer String StringTokenizer SynchronizedObject \
 	Task TaskManager TaskNotification TeeStream Hash HashStatistic \
diff --git a/Foundation/testsuite/Makefile-Driver b/Foundation/testsuite/Makefile-Driver
index 7b94c6225..e107075ae 100644
--- a/Foundation/testsuite/Makefile-Driver
+++ b/Foundation/testsuite/Makefile-Driver
@@ -23,7 +23,7 @@ objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \
 	PriorityNotificationQueueTest TimedNotificationQueueTest \
 	NotificationsTestSuite NullStreamTest NumberFormatterTest \
 	NumberParserTest PathTest PatternFormatterTest PBKDF2EngineTest RWLockTest \
-	RandomStreamTest RandomTest RegularExpressionTest SHA1EngineTest \
+	RandomStreamTest RandomTest RegularExpressionTest SHA1EngineTest SHA2EngineTest \
 	SemaphoreTest MutexTest ConditionTest SharedLibraryTest SharedLibraryTestSuite \
 	SimpleFileChannelTest StopwatchTest \
 	StreamConverterTest StreamCopierTest StreamTokenizerTest \
diff --git a/Foundation/testsuite/TestSuite.vxbuild b/Foundation/testsuite/TestSuite.vxbuild
index 973cc8671..19748f4be 100644
--- a/Foundation/testsuite/TestSuite.vxbuild
+++ b/Foundation/testsuite/TestSuite.vxbuild
@@ -83,6 +83,7 @@ SOURCES="
 	RandomTest.cpp
 	RegularExpressionTest.cpp
 	SHA1EngineTest.cpp
+	SHA2EngineTest.cpp
 	SemaphoreTest.cpp
 	SharedLibraryTest.cpp
 	SharedLibraryTestSuite.cpp
diff --git a/Foundation/testsuite/TestSuite_CE_vs90.vcproj b/Foundation/testsuite/TestSuite_CE_vs90.vcproj
index c8e35f1fa..4fa2f97a2 100644
--- a/Foundation/testsuite/TestSuite_CE_vs90.vcproj
+++ b/Foundation/testsuite/TestSuite_CE_vs90.vcproj
@@ -668,6 +668,8 @@
 					RelativePath=".\src\RandomTest.cpp"/>
 				<File
 					RelativePath=".\src\SHA1EngineTest.cpp"/>
+				<File
+					RelativePath=".\src\SHA2EngineTest.cpp"/>
 			</Filter>
 			<Filter
 				Name="Header Files">
@@ -689,6 +691,8 @@
 					RelativePath=".\src\RandomTest.h"/>
 				<File
 					RelativePath=".\src\SHA1EngineTest.h"/>
+				<File
+					RelativePath=".\src\SHA2EngineTest.h"/>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj b/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj
index fe8ae868b..b4636b89b 100644
--- a/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj
+++ b/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj
@@ -51,6 +51,7 @@
     <ClCompile Include="src\RandomStreamTest.cpp"/>
     <ClCompile Include="src\RandomTest.cpp"/>
     <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\SHA2EngineTest.cpp"/>
     <ClCompile Include="src\NotificationCenterTest.cpp"/>
     <ClCompile Include="src\NotificationQueueTest.cpp"/>
     <ClCompile Include="src\NotificationsTestSuite.cpp"/>
@@ -216,6 +217,7 @@
     <ClInclude Include="src\RandomStreamTest.h"/>
     <ClInclude Include="src\RandomTest.h"/>
     <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\SHA2EngineTest.h"/>
     <ClInclude Include="src\NotificationCenterTest.h"/>
     <ClInclude Include="src\NotificationQueueTest.h"/>
     <ClInclude Include="src\NotificationsTestSuite.h"/>
diff --git a/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
index 7402366dd..35900a77e 100644
--- a/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
@@ -330,6 +330,9 @@
     <ClCompile Include="src\SHA1EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NotificationCenterTest.cpp">
       <Filter>Notifications\Source Files</Filter>
     </ClCompile>
@@ -752,6 +755,9 @@
     <ClInclude Include="src\SHA1EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SHA2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\NotificationCenterTest.h">
       <Filter>Notifications\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj
index 95fe494a6..70dc34e13 100644
--- a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj
+++ b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj
@@ -51,6 +51,7 @@
     <ClCompile Include="src\RandomStreamTest.cpp"/>
     <ClCompile Include="src\RandomTest.cpp"/>
     <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\SHA2EngineTest.cpp"/>
     <ClCompile Include="src\NotificationCenterTest.cpp"/>
     <ClCompile Include="src\NotificationQueueTest.cpp"/>
     <ClCompile Include="src\NotificationsTestSuite.cpp"/>
@@ -216,6 +217,7 @@
     <ClInclude Include="src\RandomStreamTest.h"/>
     <ClInclude Include="src\RandomTest.h"/>
     <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\SHA2EngineTest.h"/>
     <ClInclude Include="src\NotificationCenterTest.h"/>
     <ClInclude Include="src\NotificationQueueTest.h"/>
     <ClInclude Include="src\NotificationsTestSuite.h"/>
diff --git a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
index 9832d0392..28ff7e8bd 100644
--- a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
@@ -330,6 +330,9 @@
     <ClCompile Include="src\SHA1EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NotificationCenterTest.cpp">
       <Filter>Notifications\Source Files</Filter>
     </ClCompile>
@@ -752,6 +755,9 @@
     <ClInclude Include="src\SHA1EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SHA2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\NotificationCenterTest.h">
       <Filter>Notifications\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj b/Foundation/testsuite/TestSuite_vs100.vcxproj
index 520996a5c..06b10a5aa 100644
--- a/Foundation/testsuite/TestSuite_vs100.vcxproj
+++ b/Foundation/testsuite/TestSuite_vs100.vcxproj
@@ -362,6 +362,7 @@
     <ClCompile Include="src\RandomStreamTest.cpp"/>
     <ClCompile Include="src\RandomTest.cpp"/>
     <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\SHA2EngineTest.cpp"/>
     <ClCompile Include="src\NotificationCenterTest.cpp"/>
     <ClCompile Include="src\NotificationQueueTest.cpp"/>
     <ClCompile Include="src\NotificationsTestSuite.cpp"/>
@@ -504,6 +505,7 @@
     <ClInclude Include="src\RandomStreamTest.h"/>
     <ClInclude Include="src\RandomTest.h"/>
     <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\SHA2EngineTest.h"/>
     <ClInclude Include="src\NotificationCenterTest.h"/>
     <ClInclude Include="src\NotificationQueueTest.h"/>
     <ClInclude Include="src\NotificationsTestSuite.h"/>
diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj.filters b/Foundation/testsuite/TestSuite_vs100.vcxproj.filters
index 1a3b49bf5..90ca70ecd 100644
--- a/Foundation/testsuite/TestSuite_vs100.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_vs100.vcxproj.filters
@@ -330,6 +330,9 @@
     <ClCompile Include="src\SHA1EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NotificationCenterTest.cpp">
       <Filter>Notifications\Source Files</Filter>
     </ClCompile>
@@ -752,6 +755,9 @@
     <ClInclude Include="src\SHA1EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SHA2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\NotificationCenterTest.h">
       <Filter>Notifications\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/testsuite/TestSuite_vs110.vcxproj b/Foundation/testsuite/TestSuite_vs110.vcxproj
index 2293199b7..684571876 100644
--- a/Foundation/testsuite/TestSuite_vs110.vcxproj
+++ b/Foundation/testsuite/TestSuite_vs110.vcxproj
@@ -362,6 +362,7 @@
     <ClCompile Include="src\RandomStreamTest.cpp"/>
     <ClCompile Include="src\RandomTest.cpp"/>
     <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\SHA2EngineTest.cpp"/>
     <ClCompile Include="src\NotificationCenterTest.cpp"/>
     <ClCompile Include="src\NotificationQueueTest.cpp"/>
     <ClCompile Include="src\NotificationsTestSuite.cpp"/>
@@ -504,6 +505,7 @@
     <ClInclude Include="src\RandomStreamTest.h"/>
     <ClInclude Include="src\RandomTest.h"/>
     <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\SHA2EngineTest.h"/>
     <ClInclude Include="src\NotificationCenterTest.h"/>
     <ClInclude Include="src\NotificationQueueTest.h"/>
     <ClInclude Include="src\NotificationsTestSuite.h"/>
diff --git a/Foundation/testsuite/TestSuite_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_vs110.vcxproj.filters
index 98c2054a9..b9dd868da 100644
--- a/Foundation/testsuite/TestSuite_vs110.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_vs110.vcxproj.filters
@@ -330,6 +330,9 @@
     <ClCompile Include="src\SHA1EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NotificationCenterTest.cpp">
       <Filter>Notifications\Source Files</Filter>
     </ClCompile>
@@ -752,6 +755,9 @@
     <ClInclude Include="src\SHA1EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SHA2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\NotificationCenterTest.h">
       <Filter>Notifications\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/testsuite/TestSuite_vs120.vcxproj b/Foundation/testsuite/TestSuite_vs120.vcxproj
index c8de003b1..fc6fd3669 100644
--- a/Foundation/testsuite/TestSuite_vs120.vcxproj
+++ b/Foundation/testsuite/TestSuite_vs120.vcxproj
@@ -357,6 +357,7 @@
     <ClCompile Include="src\RandomStreamTest.cpp"/>
     <ClCompile Include="src\RandomTest.cpp"/>
     <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\SHA2EngineTest.cpp"/>
     <ClCompile Include="src\NotificationCenterTest.cpp"/>
     <ClCompile Include="src\NotificationQueueTest.cpp"/>
     <ClCompile Include="src\NotificationsTestSuite.cpp"/>
@@ -499,6 +500,7 @@
     <ClInclude Include="src\RandomStreamTest.h"/>
     <ClInclude Include="src\RandomTest.h"/>
     <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\SHA2EngineTest.h"/>
     <ClInclude Include="src\NotificationCenterTest.h"/>
     <ClInclude Include="src\NotificationQueueTest.h"/>
     <ClInclude Include="src\NotificationsTestSuite.h"/>
diff --git a/Foundation/testsuite/TestSuite_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_vs120.vcxproj.filters
index b90f3c365..b9ee68cfd 100644
--- a/Foundation/testsuite/TestSuite_vs120.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_vs120.vcxproj.filters
@@ -330,6 +330,9 @@
     <ClCompile Include="src\SHA1EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NotificationCenterTest.cpp">
       <Filter>Notifications\Source Files</Filter>
     </ClCompile>
@@ -752,6 +755,9 @@
     <ClInclude Include="src\SHA1EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SHA2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\NotificationCenterTest.h">
       <Filter>Notifications\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/testsuite/TestSuite_vs140.vcxproj b/Foundation/testsuite/TestSuite_vs140.vcxproj
index 6a514742a..87384b95b 100644
--- a/Foundation/testsuite/TestSuite_vs140.vcxproj
+++ b/Foundation/testsuite/TestSuite_vs140.vcxproj
@@ -396,6 +396,7 @@
     <ClCompile Include="src\RWLockTest.cpp"/>
     <ClCompile Include="src\SemaphoreTest.cpp"/>
     <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\SHA2EngineTest.cpp"/>
     <ClCompile Include="src\SharedLibraryTest.cpp"/>
     <ClCompile Include="src\SharedLibraryTestSuite.cpp"/>
     <ClCompile Include="src\SharedMemoryTest.cpp"/>
@@ -537,6 +538,7 @@
     <ClInclude Include="src\RWLockTest.h"/>
     <ClInclude Include="src\SemaphoreTest.h"/>
     <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\SHA2EngineTest.h"/>
     <ClInclude Include="src\SharedLibraryTest.h"/>
     <ClInclude Include="src\SharedLibraryTestSuite.h"/>
     <ClInclude Include="src\SharedMemoryTest.h"/>
diff --git a/Foundation/testsuite/TestSuite_vs140.vcxproj.filters b/Foundation/testsuite/TestSuite_vs140.vcxproj.filters
index 3740ef6aa..339ad14cf 100644
--- a/Foundation/testsuite/TestSuite_vs140.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_vs140.vcxproj.filters
@@ -330,6 +330,9 @@
     <ClCompile Include="src\SHA1EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NotificationCenterTest.cpp">
       <Filter>Notifications\Source Files</Filter>
     </ClCompile>
@@ -752,6 +755,9 @@
     <ClInclude Include="src\SHA1EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SHA2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\NotificationCenterTest.h">
       <Filter>Notifications\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/testsuite/TestSuite_vs150.vcxproj b/Foundation/testsuite/TestSuite_vs150.vcxproj
index 0f60c313e..1ec61f0ce 100644
--- a/Foundation/testsuite/TestSuite_vs150.vcxproj
+++ b/Foundation/testsuite/TestSuite_vs150.vcxproj
@@ -396,6 +396,7 @@
     <ClCompile Include="src\RWLockTest.cpp"/>
     <ClCompile Include="src\SemaphoreTest.cpp"/>
     <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\SHA2EngineTest.cpp"/>
     <ClCompile Include="src\SharedLibraryTest.cpp"/>
     <ClCompile Include="src\SharedLibraryTestSuite.cpp"/>
     <ClCompile Include="src\SharedMemoryTest.cpp"/>
@@ -537,6 +538,7 @@
     <ClInclude Include="src\RWLockTest.h"/>
     <ClInclude Include="src\SemaphoreTest.h"/>
     <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\SHA2EngineTest.h"/>
     <ClInclude Include="src\SharedLibraryTest.h"/>
     <ClInclude Include="src\SharedLibraryTestSuite.h"/>
     <ClInclude Include="src\SharedMemoryTest.h"/>
diff --git a/Foundation/testsuite/TestSuite_vs150.vcxproj.filters b/Foundation/testsuite/TestSuite_vs150.vcxproj.filters
index 3740ef6aa..339ad14cf 100644
--- a/Foundation/testsuite/TestSuite_vs150.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_vs150.vcxproj.filters
@@ -330,6 +330,9 @@
     <ClCompile Include="src\SHA1EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NotificationCenterTest.cpp">
       <Filter>Notifications\Source Files</Filter>
     </ClCompile>
@@ -752,6 +755,9 @@
     <ClInclude Include="src\SHA1EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SHA2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\NotificationCenterTest.h">
       <Filter>Notifications\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/testsuite/TestSuite_vs90.vcproj b/Foundation/testsuite/TestSuite_vs90.vcproj
index eed6d78c1..27970d8ad 100644
--- a/Foundation/testsuite/TestSuite_vs90.vcproj
+++ b/Foundation/testsuite/TestSuite_vs90.vcproj
@@ -649,6 +649,8 @@
 					RelativePath=".\src\RandomTest.cpp"/>
 				<File
 					RelativePath=".\src\SHA1EngineTest.cpp"/>
+				<File
+					RelativePath=".\src\SHA2EngineTest.cpp"/>
 			</Filter>
 			<Filter
 				Name="Header Files">
@@ -670,6 +672,8 @@
 					RelativePath=".\src\RandomTest.h"/>
 				<File
 					RelativePath=".\src\SHA1EngineTest.h"/>
+				<File
+					RelativePath=".\src\SHA2EngineTest.h"/>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj
index 35a66edbb..ba5d66c66 100644
--- a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj
+++ b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj
@@ -362,6 +362,7 @@
     <ClCompile Include="src\RandomStreamTest.cpp"/>
     <ClCompile Include="src\RandomTest.cpp"/>
     <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\SHA2EngineTest.cpp"/>
     <ClCompile Include="src\NotificationCenterTest.cpp"/>
     <ClCompile Include="src\NotificationQueueTest.cpp"/>
     <ClCompile Include="src\NotificationsTestSuite.cpp"/>
@@ -504,6 +505,7 @@
     <ClInclude Include="src\RandomStreamTest.h"/>
     <ClInclude Include="src\RandomTest.h"/>
     <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\SHA2EngineTest.h"/>
     <ClInclude Include="src\NotificationCenterTest.h"/>
     <ClInclude Include="src\NotificationQueueTest.h"/>
     <ClInclude Include="src\NotificationsTestSuite.h"/>
diff --git a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters
index f99164bba..1ca4522e6 100644
--- a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters
@@ -330,6 +330,9 @@
     <ClCompile Include="src\SHA1EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NotificationCenterTest.cpp">
       <Filter>Notifications\Source Files</Filter>
     </ClCompile>
@@ -752,6 +755,9 @@
     <ClInclude Include="src\SHA1EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SHA2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\NotificationCenterTest.h">
       <Filter>Notifications\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj
index f6fd158d9..5dd227519 100644
--- a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj
+++ b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj
@@ -362,6 +362,7 @@
     <ClCompile Include="src\RandomStreamTest.cpp"/>
     <ClCompile Include="src\RandomTest.cpp"/>
     <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\SHA2EngineTest.cpp"/>
     <ClCompile Include="src\NotificationCenterTest.cpp"/>
     <ClCompile Include="src\NotificationQueueTest.cpp"/>
     <ClCompile Include="src\NotificationsTestSuite.cpp"/>
@@ -504,6 +505,7 @@
     <ClInclude Include="src\RandomStreamTest.h"/>
     <ClInclude Include="src\RandomTest.h"/>
     <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\SHA2EngineTest.h"/>
     <ClInclude Include="src\NotificationCenterTest.h"/>
     <ClInclude Include="src\NotificationQueueTest.h"/>
     <ClInclude Include="src\NotificationsTestSuite.h"/>
diff --git a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters
index 98a1d793f..ac180f273 100644
--- a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters
@@ -330,6 +330,9 @@
     <ClCompile Include="src\SHA1EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NotificationCenterTest.cpp">
       <Filter>Notifications\Source Files</Filter>
     </ClCompile>
@@ -752,6 +755,9 @@
     <ClInclude Include="src\SHA1EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SHA2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\NotificationCenterTest.h">
       <Filter>Notifications\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj
index 5a2e22604..b1f284e59 100644
--- a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj
+++ b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj
@@ -359,6 +359,7 @@
     <ClCompile Include="src\RandomStreamTest.cpp"/>
     <ClCompile Include="src\RandomTest.cpp"/>
     <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\SHA2EngineTest.cpp"/>
     <ClCompile Include="src\NotificationCenterTest.cpp"/>
     <ClCompile Include="src\NotificationQueueTest.cpp"/>
     <ClCompile Include="src\NotificationsTestSuite.cpp"/>
@@ -501,6 +502,7 @@
     <ClInclude Include="src\RandomStreamTest.h"/>
     <ClInclude Include="src\RandomTest.h"/>
     <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\SHA2EngineTest.h"/>
     <ClInclude Include="src\NotificationCenterTest.h"/>
     <ClInclude Include="src\NotificationQueueTest.h"/>
     <ClInclude Include="src\NotificationsTestSuite.h"/>
diff --git a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters
index 6cb699597..0e7762981 100644
--- a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters
@@ -330,6 +330,9 @@
     <ClCompile Include="src\SHA1EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NotificationCenterTest.cpp">
       <Filter>Notifications\Source Files</Filter>
     </ClCompile>
@@ -752,6 +755,9 @@
     <ClInclude Include="src\SHA1EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SHA2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\NotificationCenterTest.h">
       <Filter>Notifications\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/testsuite/TestSuite_x64_vs140.vcxproj b/Foundation/testsuite/TestSuite_x64_vs140.vcxproj
index 7e65121e2..c9ad8ed62 100644
--- a/Foundation/testsuite/TestSuite_x64_vs140.vcxproj
+++ b/Foundation/testsuite/TestSuite_x64_vs140.vcxproj
@@ -396,6 +396,7 @@
     <ClCompile Include="src\RWLockTest.cpp"/>
     <ClCompile Include="src\SemaphoreTest.cpp"/>
     <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\SHA2EngineTest.cpp"/>
     <ClCompile Include="src\SharedLibraryTest.cpp"/>
     <ClCompile Include="src\SharedLibraryTestSuite.cpp"/>
     <ClCompile Include="src\SharedMemoryTest.cpp"/>
@@ -537,6 +538,7 @@
     <ClInclude Include="src\RWLockTest.h"/>
     <ClInclude Include="src\SemaphoreTest.h"/>
     <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\SHA2EngineTest.h"/>
     <ClInclude Include="src\SharedLibraryTest.h"/>
     <ClInclude Include="src\SharedLibraryTestSuite.h"/>
     <ClInclude Include="src\SharedMemoryTest.h"/>
diff --git a/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters
index ecac76d45..d4684c03c 100644
--- a/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters
@@ -330,6 +330,9 @@
     <ClCompile Include="src\SHA1EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NotificationCenterTest.cpp">
       <Filter>Notifications\Source Files</Filter>
     </ClCompile>
@@ -752,6 +755,9 @@
     <ClInclude Include="src\SHA1EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SHA2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\NotificationCenterTest.h">
       <Filter>Notifications\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/testsuite/TestSuite_x64_vs150.vcxproj b/Foundation/testsuite/TestSuite_x64_vs150.vcxproj
index 6f4f63844..8f4026c9d 100644
--- a/Foundation/testsuite/TestSuite_x64_vs150.vcxproj
+++ b/Foundation/testsuite/TestSuite_x64_vs150.vcxproj
@@ -396,6 +396,7 @@
     <ClCompile Include="src\RWLockTest.cpp"/>
     <ClCompile Include="src\SemaphoreTest.cpp"/>
     <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\SHA2EngineTest.cpp"/>
     <ClCompile Include="src\SharedLibraryTest.cpp"/>
     <ClCompile Include="src\SharedLibraryTestSuite.cpp"/>
     <ClCompile Include="src\SharedMemoryTest.cpp"/>
@@ -537,6 +538,7 @@
     <ClInclude Include="src\RWLockTest.h"/>
     <ClInclude Include="src\SemaphoreTest.h"/>
     <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\SHA2EngineTest.h"/>
     <ClInclude Include="src\SharedLibraryTest.h"/>
     <ClInclude Include="src\SharedLibraryTestSuite.h"/>
     <ClInclude Include="src\SharedMemoryTest.h"/>
diff --git a/Foundation/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs150.vcxproj.filters
index ecac76d45..d4684c03c 100644
--- a/Foundation/testsuite/TestSuite_x64_vs150.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_x64_vs150.vcxproj.filters
@@ -330,6 +330,9 @@
     <ClCompile Include="src\SHA1EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SHA2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NotificationCenterTest.cpp">
       <Filter>Notifications\Source Files</Filter>
     </ClCompile>
@@ -752,6 +755,9 @@
     <ClInclude Include="src\SHA1EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SHA2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\NotificationCenterTest.h">
       <Filter>Notifications\Header Files</Filter>
     </ClInclude>
diff --git a/Foundation/testsuite/TestSuite_x64_vs90.vcproj b/Foundation/testsuite/TestSuite_x64_vs90.vcproj
index 8c7e40e35..28495cd79 100644
--- a/Foundation/testsuite/TestSuite_x64_vs90.vcproj
+++ b/Foundation/testsuite/TestSuite_x64_vs90.vcproj
@@ -649,6 +649,8 @@
 					RelativePath=".\src\RandomTest.cpp"/>
 				<File
 					RelativePath=".\src\SHA1EngineTest.cpp"/>
+				<File
+					RelativePath=".\src\SHA2EngineTest.cpp"/>
 			</Filter>
 			<Filter
 				Name="Header Files">
@@ -670,6 +672,8 @@
 					RelativePath=".\src\RandomTest.h"/>
 				<File
 					RelativePath=".\src\SHA1EngineTest.h"/>
+				<File
+					RelativePath=".\src\SHA2EngineTest.h"/>
 			</Filter>
 		</Filter>
 		<Filter