From 2ca590773a1ea66bf5f2f01e1dac6846632e8e60 Mon Sep 17 00:00:00 2001 From: Dan Shumow Date: Wed, 29 Mar 2017 15:36:55 -0700 Subject: Add visual studio 2015 solution/project files. --- src/main.c | 22 +++ vs2015/sha1collisiondetection.vs2015.sln | 41 +++++ .../sha1collisiondetection.vcxproj | 134 +++++++++++++++++ .../sha1collisiondetection.vcxproj.filters | 33 ++++ vs2015/sha1dcsum/sha1dcsum.vcxproj | 166 +++++++++++++++++++++ vs2015/sha1dcsum/sha1dcsum.vcxproj.filters | 22 +++ 6 files changed, 418 insertions(+) create mode 100644 vs2015/sha1collisiondetection.vs2015.sln create mode 100644 vs2015/sha1collisiondetection/sha1collisiondetection.vcxproj create mode 100644 vs2015/sha1collisiondetection/sha1collisiondetection.vcxproj.filters create mode 100644 vs2015/sha1dcsum/sha1dcsum.vcxproj create mode 100644 vs2015/sha1dcsum/sha1dcsum.vcxproj.filters diff --git a/src/main.c b/src/main.c index c671e8b..cdf0fa5 100644 --- a/src/main.c +++ b/src/main.c @@ -8,10 +8,32 @@ #include #include #include +#ifndef _WIN32 #include +#endif #include "sha1.h" +#ifdef _WIN32 +char* basename(char* path) +{ + char *base = NULL, *cur = NULL; + + base = path; + cur = path; + while (0 != *cur) + { + if ('\\' == *cur) + { + base = cur + 1; + } + cur++; + } + + return base; +} +#endif + int main(int argc, char** argv) { FILE* fd; diff --git a/vs2015/sha1collisiondetection.vs2015.sln b/vs2015/sha1collisiondetection.vs2015.sln new file mode 100644 index 0000000..5269f65 --- /dev/null +++ b/vs2015/sha1collisiondetection.vs2015.sln @@ -0,0 +1,41 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sha1collisiondetection", "sha1collisiondetection\sha1collisiondetection.vcxproj", "{9F5DD75D-8369-49F8-9D7C-F6C21D1EA735}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sha1dcsum", "sha1dcsum\sha1dcsum.vcxproj", "{100B9E3C-A787-4FF4-8C4F-65A5618D928E}" + ProjectSection(ProjectDependencies) = postProject + {9F5DD75D-8369-49F8-9D7C-F6C21D1EA735} = {9F5DD75D-8369-49F8-9D7C-F6C21D1EA735} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9F5DD75D-8369-49F8-9D7C-F6C21D1EA735}.Debug|x64.ActiveCfg = Debug|x64 + {9F5DD75D-8369-49F8-9D7C-F6C21D1EA735}.Debug|x64.Build.0 = Debug|x64 + {9F5DD75D-8369-49F8-9D7C-F6C21D1EA735}.Debug|x86.ActiveCfg = Debug|Win32 + {9F5DD75D-8369-49F8-9D7C-F6C21D1EA735}.Debug|x86.Build.0 = Debug|Win32 + {9F5DD75D-8369-49F8-9D7C-F6C21D1EA735}.Release|x64.ActiveCfg = Release|x64 + {9F5DD75D-8369-49F8-9D7C-F6C21D1EA735}.Release|x64.Build.0 = Release|x64 + {9F5DD75D-8369-49F8-9D7C-F6C21D1EA735}.Release|x86.ActiveCfg = Release|Win32 + {9F5DD75D-8369-49F8-9D7C-F6C21D1EA735}.Release|x86.Build.0 = Release|Win32 + {100B9E3C-A787-4FF4-8C4F-65A5618D928E}.Debug|x64.ActiveCfg = Debug|x64 + {100B9E3C-A787-4FF4-8C4F-65A5618D928E}.Debug|x64.Build.0 = Debug|x64 + {100B9E3C-A787-4FF4-8C4F-65A5618D928E}.Debug|x86.ActiveCfg = Debug|Win32 + {100B9E3C-A787-4FF4-8C4F-65A5618D928E}.Debug|x86.Build.0 = Debug|Win32 + {100B9E3C-A787-4FF4-8C4F-65A5618D928E}.Release|x64.ActiveCfg = Release|x64 + {100B9E3C-A787-4FF4-8C4F-65A5618D928E}.Release|x64.Build.0 = Release|x64 + {100B9E3C-A787-4FF4-8C4F-65A5618D928E}.Release|x86.ActiveCfg = Release|Win32 + {100B9E3C-A787-4FF4-8C4F-65A5618D928E}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vs2015/sha1collisiondetection/sha1collisiondetection.vcxproj b/vs2015/sha1collisiondetection/sha1collisiondetection.vcxproj new file mode 100644 index 0000000..5c5bffe --- /dev/null +++ b/vs2015/sha1collisiondetection/sha1collisiondetection.vcxproj @@ -0,0 +1,134 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + {9F5DD75D-8369-49F8-9D7C-F6C21D1EA735} + sha1collisiondetection + 8.1 + + + + StaticLibrary + true + v140 + NotSet + + + StaticLibrary + false + v140 + true + NotSet + + + StaticLibrary + true + v140 + NotSet + + + StaticLibrary + false + v140 + true + NotSet + + + + + + + + + + + + + + + + + + + + + .lib + + + .lib + + + .lib + + + .lib + + + + Level3 + Disabled + true + + + + + Level3 + Disabled + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + + + + + + \ No newline at end of file diff --git a/vs2015/sha1collisiondetection/sha1collisiondetection.vcxproj.filters b/vs2015/sha1collisiondetection/sha1collisiondetection.vcxproj.filters new file mode 100644 index 0000000..0b1e03f --- /dev/null +++ b/vs2015/sha1collisiondetection/sha1collisiondetection.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/vs2015/sha1dcsum/sha1dcsum.vcxproj b/vs2015/sha1dcsum/sha1dcsum.vcxproj new file mode 100644 index 0000000..8c19aca --- /dev/null +++ b/vs2015/sha1dcsum/sha1dcsum.vcxproj @@ -0,0 +1,166 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + {100B9E3C-A787-4FF4-8C4F-65A5618D928E} + sha1dcsum + 8.1 + + + + Application + true + v140 + NotSet + + + Application + false + v140 + true + NotSet + + + Application + true + v140 + NotSet + + + Application + false + v140 + true + NotSet + + + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + true + $(SolutionDir)..\lib\;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS; + + + sha1collisiondetection.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + + + copy /y $(TargetPath) $(OutDir)$(TargetName)_partial$(TargetExt) +copy /y $(OutDir)$(TargetName).pdb $(OutDir)$(TargetName)_partial.pdb + + + Copy collision detection program to partial detection version. + + + + + Level3 + Disabled + true + $(SolutionDir)..\lib\;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS; + + + sha1collisiondetection.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + + + copy /y $(TargetPath) $(OutDir)$(TargetName)_partial$(TargetExt) +copy /y $(OutDir)$(TargetName).pdb $(OutDir)$(TargetName)_partial.pdb + + + Copy collision detection program to partial detection version. + + + + + Level3 + MaxSpeed + true + true + true + $(SolutionDir)..\lib\;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS; + + + true + true + sha1collisiondetection.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + + + copy /y $(TargetPath) $(OutDir)$(TargetName)_partial$(TargetExt) +copy /y $(OutDir)$(TargetName).pdb $(OutDir)$(TargetName)_partial.pdb + + + Copy collision detection program to partial detection version. + + + + + Level3 + MaxSpeed + true + true + true + $(SolutionDir)..\lib\;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS; + + + true + true + sha1collisiondetection.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + + + copy /y $(TargetPath) $(OutDir)$(TargetName)_partial$(TargetExt) +copy /y $(OutDir)$(TargetName).pdb $(OutDir)$(TargetName)_partial.pdb + + + Copy collision detection program to partial detection version. + + + + + + \ No newline at end of file diff --git a/vs2015/sha1dcsum/sha1dcsum.vcxproj.filters b/vs2015/sha1dcsum/sha1dcsum.vcxproj.filters new file mode 100644 index 0000000..ce31430 --- /dev/null +++ b/vs2015/sha1dcsum/sha1dcsum.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file -- cgit v1.2.3 From 40642d28d044ba02b1f56f5638c86da41f7ee92b Mon Sep 17 00:00:00 2001 From: Dan Shumow Date: Fri, 31 Mar 2017 13:10:39 -0700 Subject: Turns up warning levels for visual studio build. --- lib/sha1.c | 9 +++ lib/sha1.h | 66 ++++++++++------------ src/main.c | 4 ++ .../sha1collisiondetection.vcxproj | 12 ++-- vs2015/sha1dcsum/sha1dcsum.vcxproj | 12 ++-- 5 files changed, 59 insertions(+), 44 deletions(-) diff --git a/lib/sha1.c b/lib/sha1.c index 939b9b0..6b454eb 100644 --- a/lib/sha1.c +++ b/lib/sha1.c @@ -876,6 +876,11 @@ static void sha1recompress_fast_ ## t (uint32_t ihvin[5], uint32_t ihvout[5], co ihvout[0] = ihvin[0] + a; ihvout[1] = ihvin[1] + b; ihvout[2] = ihvin[2] + c; ihvout[3] = ihvin[3] + d; ihvout[4] = ihvin[4] + e; \ } +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable: 4127) /* Complier complains about the checks in the above macro being constant. */ +#endif + #ifdef DOSTORESTATE0 SHA1_RECOMPRESS(0) #endif @@ -1196,6 +1201,10 @@ SHA1_RECOMPRESS(78) SHA1_RECOMPRESS(79) #endif +#ifdef _MSC_VER +#pragma warning(pop) +#endif + static void sha1_recompression_step(uint32_t step, uint32_t ihvin[5], uint32_t ihvout[5], const uint32_t me2[80], const uint32_t state[5]) { switch (step) diff --git a/lib/sha1.h b/lib/sha1.h index 07e943f..ccc4a12 100644 --- a/lib/sha1.h +++ b/lib/sha1.h @@ -14,36 +14,26 @@ extern "C" { #include -/* uses SHA-1 message expansion to expand the first 16 words of W[] to 80 words */ -/* void sha1_message_expansion(uint32_t W[80]); */ - -/* sha-1 compression function; first version takes a message block pre-parsed as 16 32-bit integers, second version takes an already expanded message) */ -/* void sha1_compression(uint32_t ihv[5], const uint32_t m[16]); -void sha1_compression_W(uint32_t ihv[5], const uint32_t W[80]); */ - -/* same as sha1_compression_W, but additionally store intermediate states */ +/* sha-1 compression function that takes an already expanded message, and additionally store intermediate states */ /* only stores states ii (the state between step ii-1 and step ii) when DOSTORESTATEii is defined in ubc_check.h */ void sha1_compression_states(uint32_t[5], const uint32_t[16], uint32_t[80], uint32_t[80][5]); /* -// function type for sha1_recompression_step_T (uint32_t ihvin[5], uint32_t ihvout[5], const uint32_t me2[80], const uint32_t state[5]) -// where 0 <= T < 80 -// me2 is an expanded message (the expansion of an original message block XOR'ed with a disturbance vector's message block difference) -// state is the internal state (a,b,c,d,e) before step T of the SHA-1 compression function while processing the original message block -// the function will return: -// ihvin: the reconstructed input chaining value -// ihvout: the reconstructed output chaining value +// Function type for sha1_recompression_step_T (uint32_t ihvin[5], uint32_t ihvout[5], const uint32_t me2[80], const uint32_t state[5]). +// Where 0 <= T < 80 +// me2 is an expanded message (the expansion of an original message block XOR'ed with a disturbance vector's message block difference.) +// state is the internal state (a,b,c,d,e) before step T of the SHA-1 compression function while processing the original message block. +// The function will return: +// ihvin: The reconstructed input chaining value. +// ihvout: The reconstructed output chaining value. */ typedef void(*sha1_recompression_type)(uint32_t*, uint32_t*, const uint32_t*, const uint32_t*); -/* table of sha1_recompression_step_0, ... , sha1_recompression_step_79 */ -/* extern sha1_recompression_type sha1_recompression_step[80];*/ - -/* a callback function type that can be set to be called when a collision block has been found: */ +/* A callback function type that can be set to be called when a collision block has been found: */ /* void collision_block_callback(uint64_t byteoffset, const uint32_t ihvin1[5], const uint32_t ihvin2[5], const uint32_t m1[80], const uint32_t m2[80]) */ typedef void(*collision_block_callback)(uint64_t, const uint32_t*, const uint32_t*, const uint32_t*, const uint32_t*); -/* the SHA-1 context */ +/* The SHA-1 context. */ typedef struct { uint64_t total; uint32_t ihv[5]; @@ -62,30 +52,34 @@ typedef struct { uint32_t states[80][5]; } SHA1_CTX; -/* initialize SHA-1 context */ +/* Initialize SHA-1 context. */ void SHA1DCInit(SHA1_CTX*); /* -// function to enable safe SHA-1 hashing: -// collision attacks are thwarted by hashing a detected near-collision block 3 times -// think of it as extending SHA-1 from 80-steps to 240-steps for such blocks: -// the best collision attacks against SHA-1 have complexity about 2^60, -// thus for 240-steps an immediate lower-bound for the best cryptanalytic attacks would 2^180 -// an attacker would be better off using a generic birthday search of complexity 2^80 -// -// enabling safe SHA-1 hashing will result in the correct SHA-1 hash for messages where no collision attack was detected -// but it will result in a different SHA-1 hash for messages where a collision attack was detected -// this will automatically invalidate SHA-1 based digital signature forgeries -// enabled by default + Function to enable safe SHA-1 hashing: + Collision attacks are thwarted by hashing a detected near-collision block 3 times. + Think of it as extending SHA-1 from 80-steps to 240-steps for such blocks: + The best collision attacks against SHA-1 have complexity about 2^60, + thus for 240-steps an immediate lower-bound for the best cryptanalytic attacks would be 2^180. + An attacker would be better off using a generic birthday search of complexity 2^80. + + Enabling safe SHA-1 hashing will result in the correct SHA-1 hash for messages where no collision attack was detected, + but it will result in a different SHA-1 hash for messages where a collision attack was detected. + This will automatically invalidate SHA-1 based digital signature forgeries. + Enabled by default. */ void SHA1DCSetSafeHash(SHA1_CTX*, int); -/* function to disable or enable the use of Unavoidable Bitconditions (provides a significant speed up) */ -/* enabled by default */ +/* + Function to disable or enable the use of Unavoidable Bitconditions (provides a significant speed up). + Enabled by default + */ void SHA1DCSetUseUBC(SHA1_CTX*, int); -/* function to disable or enable the use of Collision Detection */ -/* enabled by default */ +/* + Function to disable or enable the use of Collision Detection. + Enabled by default. + */ void SHA1DCSetUseDetectColl(SHA1_CTX*, int); /* function to disable or enable the detection of reduced-round SHA-1 collisions */ diff --git a/src/main.c b/src/main.c index cdf0fa5..ce3df75 100644 --- a/src/main.c +++ b/src/main.c @@ -104,3 +104,7 @@ int main(int argc, char** argv) } return 0; } + +#ifdef _MSC_VER +#pragma warning(disable : 4710 ) /* 4710 -- compiler complains about printf,sprintf not being inlined. */ +#endif diff --git a/vs2015/sha1collisiondetection/sha1collisiondetection.vcxproj b/vs2015/sha1collisiondetection/sha1collisiondetection.vcxproj index 5c5bffe..850ada3 100644 --- a/vs2015/sha1collisiondetection/sha1collisiondetection.vcxproj +++ b/vs2015/sha1collisiondetection/sha1collisiondetection.vcxproj @@ -90,25 +90,28 @@ - Level3 + EnableAllWarnings Disabled true + true - Level3 + EnableAllWarnings Disabled true + true - Level3 + EnableAllWarnings MaxSpeed true true true + true true @@ -117,11 +120,12 @@ - Level3 + EnableAllWarnings MaxSpeed true true true + true true diff --git a/vs2015/sha1dcsum/sha1dcsum.vcxproj b/vs2015/sha1dcsum/sha1dcsum.vcxproj index 8c19aca..709112e 100644 --- a/vs2015/sha1dcsum/sha1dcsum.vcxproj +++ b/vs2015/sha1dcsum/sha1dcsum.vcxproj @@ -74,11 +74,12 @@ - Level3 + EnableAllWarnings Disabled true $(SolutionDir)..\lib\;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS; + true sha1collisiondetection.lib;%(AdditionalDependencies) @@ -94,11 +95,12 @@ copy /y $(OutDir)$(TargetName).pdb $(OutDir)$(TargetName)_partial.pdb - Level3 + EnableAllWarnings Disabled true $(SolutionDir)..\lib\;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS; + true sha1collisiondetection.lib;%(AdditionalDependencies) @@ -114,13 +116,14 @@ copy /y $(OutDir)$(TargetName).pdb $(OutDir)$(TargetName)_partial.pdb - Level3 + EnableAllWarnings MaxSpeed true true true $(SolutionDir)..\lib\;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS; + true true @@ -138,13 +141,14 @@ copy /y $(OutDir)$(TargetName).pdb $(OutDir)$(TargetName)_partial.pdb - Level3 + EnableAllWarnings MaxSpeed true true true $(SolutionDir)..\lib\;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS; + true true -- cgit v1.2.3