Skip to content

Support for different hash algorithms in HASH system function (CORE-4436) #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfernandes merged 10 commits into from
Jul 25, 2017
Merged

Support for different hash algorithms in HASH system function (CORE-4436) #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7fe1fbb
Refactor introducing HashContext and WeakHashContext.
asfernandes Jul 19, 2017
adfbf10
Import unmodified files (some) from libtomcrypt 1.17.
asfernandes Jul 21, 2017
bbe0b20
Fix libtomcrypt compilation problems.
asfernandes Jul 21, 2017
c3b5420
Customize algorithms imported from libtomcrypt.
asfernandes Jul 21, 2017
8885d22
Configure libtomcrypt to not use assembly.
asfernandes Jul 21, 2017
ca33f71
Added src/common/tomcrypt to POSIX build.
asfernandes Jul 21, 2017
987e85f
Added wrapper classes for libtomcrypt's hash algorithms.
asfernandes Jul 21, 2017
3a1a9b9
Support for different hashes algorithms in HASH system function.
asfernandes Jul 21, 2017
3b14537
Adjust Windows build
hvlad Jul 24, 2017
5ba4754
Rework on HashAlgorithmDescriptor initialization.
asfernandes Jul 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@
* [CORE-5064](http://tracker.firebirdsql.org/browse/CORE-5064): Add datatypes (VAR)BINARY(n) and BINARY VARYING(n) as aliases for (VAR)CHAR(n) CHARACTER SET OCTETS
Contributor(s): Dimitry Sibiryakov

* [CORE-4436](http://tracker.firebirdsql.org/browse/CORE-4436): Support for different hash algorithms in HASH system function
Reference(s): [doc/sql.extensions/README.builtin_functions.txt](https://github.com/FirebirdSQL/firebird/raw/master/doc/sql.extensions/README.builtin_functions.txt)
Contributor(s): Adriano dos Santos Fernandes

* [CORE-2557](http://tracker.firebirdsql.org/browse/CORE-2557): Grants on MON$ tables
Contributor(s): Alex Peshkoff

Expand Down
9 changes: 5 additions & 4 deletions builds/posix/make.shared.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ AllObjects=
CO1:= $(call dirObjects,common)
CO2:= $(call dirObjects,common/classes)
CO3:= $(call dirObjects,common/config)
#CO4:= $(call dirObjects,common/exceptions)
#CO5:= $(call dirObjects,common/sync)
Common_Objects:= $(CO1) $(CO2) $(CO3)
# $(CO4) $(CO5)
CO4:= $(call dirObjects,common/tomcrypt)
#CO5:= $(call dirObjects,common/exceptions)
#CO6:= $(call dirObjects,common/sync)
Common_Objects:= $(CO1) $(CO2) $(CO3) $(CO4)
# $(CO5) $(CO6)

AllObjects += $(Common_Objects)

Expand Down
29 changes: 25 additions & 4 deletions builds/win32/msvc10/common.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<ClCompile Include="..\..\..\src\common\classes\SyncObject.cpp" />
<ClCompile Include="..\..\..\src\common\classes\TempFile.cpp" />
<ClCompile Include="..\..\..\src\common\classes\timestamp.cpp" />
<ClCompile Include="..\..\..\src\common\classes\TomCryptHash.cpp" />
<ClCompile Include="..\..\..\src\common\classes\UserBlob.cpp" />
<ClCompile Include="..\..\..\src\common\config\config.cpp" />
<ClCompile Include="..\..\..\src\common\config\ConfigCache.cpp" />
Expand All @@ -62,6 +63,7 @@
</ClCompile>
<ClCompile Include="..\..\..\src\common\cvt.cpp" />
<ClCompile Include="..\..\..\src\common\db_alias.cpp" />
<ClCompile Include="..\..\..\src\common\DecFloat.cpp" />
<ClCompile Include="..\..\..\src\common\dllinst.cpp" />
<ClCompile Include="..\..\..\src\common\dsc.cpp" />
<ClCompile Include="..\..\..\src\common\DynamicStrings.cpp" />
Expand Down Expand Up @@ -91,6 +93,11 @@
<ClCompile Include="..\..\..\src\common\ThreadData.cpp" />
<ClCompile Include="..\..\..\src\common\ThreadStart.cpp" />
<ClCompile Include="..\..\..\src\common\Tokens.cpp" />
<ClCompile Include="..\..\..\src\common\tomcrypt\crypt_argchk.c">
<ClCompile Include="..\..\..\src\common\tomcrypt\md5.c" />
<ClCompile Include="..\..\..\src\common\tomcrypt\sha1.c" />
<ClCompile Include="..\..\..\src\common\tomcrypt\sha256.c" />
<ClCompile Include="..\..\..\src\common\tomcrypt\sha512.c" />
<ClCompile Include="..\..\..\src\common\unicode_util.cpp" />
<ClCompile Include="..\..\..\src\common\utils.cpp" />
<ClCompile Include="..\..\..\src\common\UtilSvc.cpp" />
Expand Down Expand Up @@ -158,6 +165,7 @@
<ClInclude Include="..\..\..\src\common\CsConvert.h" />
<ClInclude Include="..\..\..\src\common\cvt.h" />
<ClInclude Include="..\..\..\src\common\db_alias.h" />
<ClInclude Include="..\..\..\src\common\DecFloat.h" />
<ClInclude Include="..\..\..\src\common\dllinst.h" />
<ClInclude Include="..\..\..\src\common\dsc.h" />
<ClInclude Include="..\..\..\src\common\dsc_proto.h" />
Expand Down Expand Up @@ -196,6 +204,19 @@
<ClInclude Include="..\..\..\src\common\ThreadData.h" />
<ClInclude Include="..\..\..\src\common\ThreadStart.h" />
<ClInclude Include="..\..\..\src\common\Tokens.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_argchk.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cfg.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cipher.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_custom.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_hash.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_mac.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_macros.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_math.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_misc.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pk.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pkcs.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_prng.h" />
<ClInclude Include="..\..\..\src\common\unicode_util.h" />
<ClInclude Include="..\..\..\src\common\UtilSvc.h" />
<ClInclude Include="..\..\..\src\common\utils_proto.h" />
Expand Down Expand Up @@ -283,7 +304,7 @@
<Culture>0x041d</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Release\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Expand All @@ -299,7 +320,7 @@
<Culture>0x041d</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Debug\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -318,7 +339,7 @@
<Culture>0x041d</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Release\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -336,7 +357,7 @@
<Culture>0x041d</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Debug\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
66 changes: 66 additions & 0 deletions builds/win32/msvc10/common.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
<Filter Include="headers">
<UniqueIdentifier>{03f83331-723e-4ba5-9ebb-348f0554a088}</UniqueIdentifier>
</Filter>
<Filter Include="tomcrypt">
<UniqueIdentifier>{dd0bb92e-0a1e-4406-96ff-5265e8d28258}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\common\xdr.cpp">
Expand Down Expand Up @@ -214,6 +217,27 @@
<Filter>classes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\CRC32C.cpp">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\DecFloat.cpp">
<Filter>classes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\crypt_argchk.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\md5.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha1.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha256.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha512.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\classes\TomCryptHash.cpp">
<Filter>classes</Filter>
</ClCompile>
</ItemGroup>
Expand Down Expand Up @@ -530,5 +554,47 @@
<ClInclude Include="..\..\..\src\common\Tokens.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\DecFloat.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_argchk.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cfg.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cipher.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_custom.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_hash.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_mac.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_macros.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_math.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_misc.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pk.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pkcs.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_prng.h">
<Filter>headers</Filter>
</ClInclude>
</ItemGroup>
</Project>
19 changes: 19 additions & 0 deletions builds/win32/msvc12/common.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<ClCompile Include="..\..\..\src\common\classes\SyncObject.cpp" />
<ClCompile Include="..\..\..\src\common\classes\TempFile.cpp" />
<ClCompile Include="..\..\..\src\common\classes\timestamp.cpp" />
<ClCompile Include="..\..\..\src\common\classes\TomCryptHash.cpp" />
<ClCompile Include="..\..\..\src\common\classes\UserBlob.cpp" />
<ClCompile Include="..\..\..\src\common\config\config.cpp" />
<ClCompile Include="..\..\..\src\common\config\ConfigCache.cpp" />
Expand Down Expand Up @@ -88,6 +89,11 @@
<ClCompile Include="..\..\..\src\common\ThreadData.cpp" />
<ClCompile Include="..\..\..\src\common\ThreadStart.cpp" />
<ClCompile Include="..\..\..\src\common\Tokens.cpp" />
<ClCompile Include="..\..\..\src\common\tomcrypt\crypt_argchk.c">
<ClCompile Include="..\..\..\src\common\tomcrypt\md5.c" />
<ClCompile Include="..\..\..\src\common\tomcrypt\sha1.c" />
<ClCompile Include="..\..\..\src\common\tomcrypt\sha256.c" />
<ClCompile Include="..\..\..\src\common\tomcrypt\sha512.c" />
<ClCompile Include="..\..\..\src\common\unicode_util.cpp" />
<ClCompile Include="..\..\..\src\common\utils.cpp" />
<ClCompile Include="..\..\..\src\common\UtilSvc.cpp" />
Expand Down Expand Up @@ -194,6 +200,19 @@
<ClInclude Include="..\..\..\src\common\ThreadData.h" />
<ClInclude Include="..\..\..\src\common\ThreadStart.h" />
<ClInclude Include="..\..\..\src\common\Tokens.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_argchk.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cfg.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cipher.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_custom.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_hash.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_mac.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_macros.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_math.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_misc.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pk.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pkcs.h" />
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_prng.h" />
<ClInclude Include="..\..\..\src\common\unicode_util.h" />
<ClInclude Include="..\..\..\src\common\UtilSvc.h" />
<ClInclude Include="..\..\..\src\common\utils_proto.h" />
Expand Down
60 changes: 60 additions & 0 deletions builds/win32/msvc12/common.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
<Filter Include="headers">
<UniqueIdentifier>{03f83331-723e-4ba5-9ebb-348f0554a088}</UniqueIdentifier>
</Filter>
<Filter Include="tomcrypt">
<UniqueIdentifier>{dd0bb92e-0a1e-4406-96ff-5265e8d28258}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\common\xdr.cpp">
Expand Down Expand Up @@ -219,6 +222,24 @@
<ClCompile Include="..\..\..\src\common\DecFloat.cpp">
<Filter>classes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\crypt_argchk.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\md5.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha1.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha256.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\tomcrypt\sha512.c">
<Filter>tomcrypt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\classes\TomCryptHash.cpp">
<Filter>classes</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\common\xdr_proto.h">
Expand Down Expand Up @@ -536,5 +557,44 @@
<ClInclude Include="..\..\..\src\common\DecFloat.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_argchk.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cfg.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_cipher.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_custom.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_hash.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_mac.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_macros.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_math.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_misc.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pk.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_pkcs.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\tomcrypt\tomcrypt_prng.h">
<Filter>headers</Filter>
</ClInclude>
</ItemGroup>
</Project>
Loading