Merge pull request #5 from alexinea/master

Start to support SM3 and SM4

Cosmos.Encryption.sln

@@ -1,20 +1,25 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Encryption", "src\Cosmos.Encryption\Cosmos.Encryption.csproj", "{27C23A57-2C63-4C51-A102-A20A7A4D2016}"
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.329
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Encryption", "src\Cosmos.Encryption\Cosmos.Encryption.csproj", "{27C23A57-2C63-4C51-A102-A20A7A4D2016}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FCC067FE-90F6-4E55-8169-7D6982B52A8A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FAB7E90F-6BA0-4305-96C1-B71EB1BBEEC3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Encryption.Tests", "tests\Cosmos.Encryption.Tests\Cosmos.Encryption.Tests.csproj", "{A630520D-F1C3-46C4-92C7-3AB184A26105}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Encryption.Tests", "tests\Cosmos.Encryption.Tests\Cosmos.Encryption.Tests.csproj", "{A630520D-F1C3-46C4-92C7-3AB184A26105}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Encryption.NfxTests", "tests\Cosmos.Encryption.NfxTests\Cosmos.Encryption.NfxTests.csproj", "{F40BFB7E-049F-41E1-AEEA-CDDE1CE85417}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{ACACF492-6B6B-44B7-B5EE-33A18A1C18EF}"
-ProjectSection(SolutionItems) = preProject
-	build\common.props = build\common.props
-	build\version.props = build\version.props
-EndProjectSection
+	ProjectSection(SolutionItems) = preProject
+		build\common.props = build\common.props
+		build\version.props = build\version.props
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Encryption.Tests.TestingConsole", "tests\Cosmos.Encryption.Tests.TestingConsole\Cosmos.Encryption.Tests.TestingConsole.csproj", "{68D978D8-7EA7-4C9B-B4F7-B107A68D558B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,10 +39,21 @@ Global
 		{F40BFB7E-049F-41E1-AEEA-CDDE1CE85417}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F40BFB7E-049F-41E1-AEEA-CDDE1CE85417}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F40BFB7E-049F-41E1-AEEA-CDDE1CE85417}.Release|Any CPU.Build.0 = Release|Any CPU
+		{68D978D8-7EA7-4C9B-B4F7-B107A68D558B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68D978D8-7EA7-4C9B-B4F7-B107A68D558B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68D978D8-7EA7-4C9B-B4F7-B107A68D558B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{68D978D8-7EA7-4C9B-B4F7-B107A68D558B}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{27C23A57-2C63-4C51-A102-A20A7A4D2016} = {FCC067FE-90F6-4E55-8169-7D6982B52A8A}
 		{A630520D-F1C3-46C4-92C7-3AB184A26105} = {FAB7E90F-6BA0-4305-96C1-B71EB1BBEEC3}
 		{F40BFB7E-049F-41E1-AEEA-CDDE1CE85417} = {FAB7E90F-6BA0-4305-96C1-B71EB1BBEEC3}
+		{68D978D8-7EA7-4C9B-B4F7-B107A68D558B} = {FAB7E90F-6BA0-4305-96C1-B71EB1BBEEC3}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D59A7B73-5F98-4002-9551-304D243E4B48}
 	EndGlobalSection
 EndGlobal

README.md

@@ -15,11 +15,13 @@ Install-Package Cosmos.Encryption
 - MD4
 - MD5
 - SHA1/256/384/512
+- SM3
 - HMAC
 - AES
 - DES/TripleDES
 - RC4
 - RCX/ThreeRCX
+- SM4
 - TEA/XTEA/XXTEA
 - DSA
 - RSA
@@ -79,4 +81,6 @@ People or projects that have made a great contribbution to this project:
 
 # License
 
+Member project of [COSMOS LOOPS PROGRAMME](https://github.com/cosmos-loops).
+
 [Apache 2.0 License](/LICENSE)

build/version.props

@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>0</VersionMajor>
 		<VersionMinor>1</VersionMinor>
-		<VersionPatch>1-alpha4-101140</VersionPatch>
+		<VersionPatch>1-alpha5-105001</VersionPatch>
 		<VersionQuality></VersionQuality>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 	</PropertyGroup>