argon2 1.0.0 → 1.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +1 -1
- data/README.md +6 -5
- data/ext/argon2_wrap/argon_wrap.c +2 -1
- data/ext/argon2_wrap/test.c +5 -5
- data/ext/phc-winner-argon2/.gitattributes +5 -0
- data/ext/phc-winner-argon2/.gitignore +5 -0
- data/ext/phc-winner-argon2/Argon2.sln +98 -0
- data/ext/phc-winner-argon2/CHANGELOG.md +11 -0
- data/ext/phc-winner-argon2/Makefile +7 -2
- data/ext/phc-winner-argon2/README.md +27 -15
- data/ext/phc-winner-argon2/appveyor.yml +25 -0
- data/ext/phc-winner-argon2/export.sh +7 -0
- data/ext/phc-winner-argon2/include/argon2.h +24 -1
- data/ext/phc-winner-argon2/kats/argon2d +3 -1
- data/ext/phc-winner-argon2/kats/argon2d.shasum +1 -1
- data/ext/phc-winner-argon2/kats/argon2d_v16 +12304 -0
- data/ext/phc-winner-argon2/kats/argon2d_v16.shasum +1 -0
- data/ext/phc-winner-argon2/kats/argon2i +3 -1
- data/ext/phc-winner-argon2/kats/argon2i.shasum +1 -1
- data/ext/phc-winner-argon2/kats/argon2i_v16 +12304 -0
- data/ext/phc-winner-argon2/kats/argon2i_v16.shasum +1 -0
- data/ext/phc-winner-argon2/kats/check-sums.ps1 +42 -0
- data/ext/phc-winner-argon2/kats/check-sums.sh +1 -1
- data/ext/phc-winner-argon2/kats/test.ps1 +50 -0
- data/ext/phc-winner-argon2/kats/test.sh +45 -43
- data/ext/phc-winner-argon2/man/argon2.1 +47 -0
- data/ext/phc-winner-argon2/src/argon2.c +29 -15
- data/ext/phc-winner-argon2/src/bench.c +5 -22
- data/ext/phc-winner-argon2/src/core.c +3 -3
- data/ext/phc-winner-argon2/src/core.h +1 -3
- data/ext/phc-winner-argon2/src/encoding.c +22 -3
- data/ext/phc-winner-argon2/src/encoding.h +6 -0
- data/ext/phc-winner-argon2/src/genkat.c +23 -5
- data/ext/phc-winner-argon2/src/opt.c +42 -2
- data/ext/phc-winner-argon2/src/opt.h +10 -0
- data/ext/phc-winner-argon2/src/ref.c +51 -1
- data/ext/phc-winner-argon2/src/ref.h +10 -0
- data/ext/phc-winner-argon2/src/run.c +67 -42
- data/ext/phc-winner-argon2/src/test.c +160 -68
- data/ext/phc-winner-argon2/src/thread.c +1 -1
- data/ext/phc-winner-argon2/vs2015/Argon2Opt/Argon2Opt.vcxproj +158 -0
- data/ext/phc-winner-argon2/vs2015/Argon2Opt/Argon2Opt.vcxproj.filters +69 -0
- data/ext/phc-winner-argon2/vs2015/Argon2OptBench/Argon2OptBench.vcxproj +158 -0
- data/ext/phc-winner-argon2/vs2015/Argon2OptBench/Argon2OptBench.vcxproj.filters +69 -0
- data/ext/phc-winner-argon2/vs2015/Argon2OptGenKAT/Argon2OptGenKAT.vcxproj +167 -0
- data/ext/phc-winner-argon2/vs2015/Argon2OptGenKAT/Argon2OptGenKAT.vcxproj.filters +72 -0
- data/ext/phc-winner-argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj +159 -0
- data/ext/phc-winner-argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj.filters +69 -0
- data/ext/phc-winner-argon2/vs2015/Argon2Ref/Argon2Ref.vcxproj +158 -0
- data/ext/phc-winner-argon2/vs2015/Argon2Ref/Argon2Ref.vcxproj.filters +69 -0
- data/ext/phc-winner-argon2/vs2015/Argon2RefBench/Argon2RefBench.vcxproj +158 -0
- data/ext/phc-winner-argon2/vs2015/Argon2RefBench/Argon2RefBench.vcxproj.filters +69 -0
- data/ext/phc-winner-argon2/vs2015/Argon2RefGenKAT/Argon2RefGenKAT.vcxproj +159 -0
- data/ext/phc-winner-argon2/vs2015/Argon2RefGenKAT/Argon2RefGenKAT.vcxproj.filters +72 -0
- data/ext/phc-winner-argon2/vs2015/Argon2RefTestCI/Argon2RefTestCI.vcxproj +158 -0
- data/ext/phc-winner-argon2/vs2015/Argon2RefTestCI/Argon2RefTestCI.vcxproj.filters +69 -0
- data/lib/argon2.rb +5 -1
- data/lib/argon2/version.rb +1 -1
- metadata +29 -3
@@ -0,0 +1,72 @@
|
|
1
|
+
<?xml version="1.0" encoding="utf-8"?>
|
2
|
+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
3
|
+
<ItemGroup>
|
4
|
+
<Filter Include="Source Files">
|
5
|
+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
6
|
+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
7
|
+
</Filter>
|
8
|
+
<Filter Include="Header Files">
|
9
|
+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
10
|
+
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
|
11
|
+
</Filter>
|
12
|
+
<Filter Include="Resource Files">
|
13
|
+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
14
|
+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
15
|
+
</Filter>
|
16
|
+
</ItemGroup>
|
17
|
+
<ItemGroup>
|
18
|
+
<ClInclude Include="..\..\include\argon2.h">
|
19
|
+
<Filter>Header Files</Filter>
|
20
|
+
</ClInclude>
|
21
|
+
<ClInclude Include="..\..\src\core.h">
|
22
|
+
<Filter>Header Files</Filter>
|
23
|
+
</ClInclude>
|
24
|
+
<ClInclude Include="..\..\src\encoding.h">
|
25
|
+
<Filter>Header Files</Filter>
|
26
|
+
</ClInclude>
|
27
|
+
<ClInclude Include="..\..\src\genkat.h">
|
28
|
+
<Filter>Header Files</Filter>
|
29
|
+
</ClInclude>
|
30
|
+
<ClInclude Include="..\..\src\ref.h">
|
31
|
+
<Filter>Header Files</Filter>
|
32
|
+
</ClInclude>
|
33
|
+
<ClInclude Include="..\..\src\thread.h">
|
34
|
+
<Filter>Header Files</Filter>
|
35
|
+
</ClInclude>
|
36
|
+
<ClInclude Include="..\..\src\blake2\blake2.h">
|
37
|
+
<Filter>Header Files</Filter>
|
38
|
+
</ClInclude>
|
39
|
+
<ClInclude Include="..\..\src\blake2\blake2-impl.h">
|
40
|
+
<Filter>Header Files</Filter>
|
41
|
+
</ClInclude>
|
42
|
+
<ClInclude Include="..\..\src\blake2\blamka-round-opt.h">
|
43
|
+
<Filter>Header Files</Filter>
|
44
|
+
</ClInclude>
|
45
|
+
<ClInclude Include="..\..\src\blake2\blamka-round-ref.h">
|
46
|
+
<Filter>Header Files</Filter>
|
47
|
+
</ClInclude>
|
48
|
+
</ItemGroup>
|
49
|
+
<ItemGroup>
|
50
|
+
<ClCompile Include="..\..\src\blake2\blake2b.c">
|
51
|
+
<Filter>Source Files</Filter>
|
52
|
+
</ClCompile>
|
53
|
+
<ClCompile Include="..\..\src\argon2.c">
|
54
|
+
<Filter>Source Files</Filter>
|
55
|
+
</ClCompile>
|
56
|
+
<ClCompile Include="..\..\src\core.c">
|
57
|
+
<Filter>Source Files</Filter>
|
58
|
+
</ClCompile>
|
59
|
+
<ClCompile Include="..\..\src\encoding.c">
|
60
|
+
<Filter>Source Files</Filter>
|
61
|
+
</ClCompile>
|
62
|
+
<ClCompile Include="..\..\src\genkat.c">
|
63
|
+
<Filter>Source Files</Filter>
|
64
|
+
</ClCompile>
|
65
|
+
<ClCompile Include="..\..\src\ref.c">
|
66
|
+
<Filter>Source Files</Filter>
|
67
|
+
</ClCompile>
|
68
|
+
<ClCompile Include="..\..\src\thread.c">
|
69
|
+
<Filter>Source Files</Filter>
|
70
|
+
</ClCompile>
|
71
|
+
</ItemGroup>
|
72
|
+
</Project>
|
@@ -0,0 +1,158 @@
|
|
1
|
+
<?xml version="1.0" encoding="utf-8"?>
|
2
|
+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
3
|
+
<ItemGroup Label="ProjectConfigurations">
|
4
|
+
<ProjectConfiguration Include="Debug|Win32">
|
5
|
+
<Configuration>Debug</Configuration>
|
6
|
+
<Platform>Win32</Platform>
|
7
|
+
</ProjectConfiguration>
|
8
|
+
<ProjectConfiguration Include="Release|Win32">
|
9
|
+
<Configuration>Release</Configuration>
|
10
|
+
<Platform>Win32</Platform>
|
11
|
+
</ProjectConfiguration>
|
12
|
+
<ProjectConfiguration Include="Debug|x64">
|
13
|
+
<Configuration>Debug</Configuration>
|
14
|
+
<Platform>x64</Platform>
|
15
|
+
</ProjectConfiguration>
|
16
|
+
<ProjectConfiguration Include="Release|x64">
|
17
|
+
<Configuration>Release</Configuration>
|
18
|
+
<Platform>x64</Platform>
|
19
|
+
</ProjectConfiguration>
|
20
|
+
</ItemGroup>
|
21
|
+
<PropertyGroup Label="Globals">
|
22
|
+
<ProjectGuid>{8A1F7F84-34AF-4DB2-9D58-D4823DFE79E9}</ProjectGuid>
|
23
|
+
<RootNamespace>Argon2RefTestCI</RootNamespace>
|
24
|
+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
25
|
+
</PropertyGroup>
|
26
|
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
27
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
28
|
+
<ConfigurationType>Application</ConfigurationType>
|
29
|
+
<UseDebugLibraries>true</UseDebugLibraries>
|
30
|
+
<PlatformToolset>v140</PlatformToolset>
|
31
|
+
<CharacterSet>MultiByte</CharacterSet>
|
32
|
+
</PropertyGroup>
|
33
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
34
|
+
<ConfigurationType>Application</ConfigurationType>
|
35
|
+
<UseDebugLibraries>false</UseDebugLibraries>
|
36
|
+
<PlatformToolset>v140</PlatformToolset>
|
37
|
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
38
|
+
<CharacterSet>MultiByte</CharacterSet>
|
39
|
+
</PropertyGroup>
|
40
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
41
|
+
<ConfigurationType>Application</ConfigurationType>
|
42
|
+
<UseDebugLibraries>true</UseDebugLibraries>
|
43
|
+
<PlatformToolset>v140</PlatformToolset>
|
44
|
+
<CharacterSet>MultiByte</CharacterSet>
|
45
|
+
</PropertyGroup>
|
46
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
47
|
+
<ConfigurationType>Application</ConfigurationType>
|
48
|
+
<UseDebugLibraries>false</UseDebugLibraries>
|
49
|
+
<PlatformToolset>v140</PlatformToolset>
|
50
|
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
51
|
+
<CharacterSet>MultiByte</CharacterSet>
|
52
|
+
</PropertyGroup>
|
53
|
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
54
|
+
<ImportGroup Label="ExtensionSettings">
|
55
|
+
</ImportGroup>
|
56
|
+
<ImportGroup Label="Shared">
|
57
|
+
</ImportGroup>
|
58
|
+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
59
|
+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
60
|
+
</ImportGroup>
|
61
|
+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
62
|
+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
63
|
+
</ImportGroup>
|
64
|
+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
65
|
+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
66
|
+
</ImportGroup>
|
67
|
+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
68
|
+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
69
|
+
</ImportGroup>
|
70
|
+
<PropertyGroup Label="UserMacros" />
|
71
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
72
|
+
<IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
|
73
|
+
<OutDir>$(SolutionDir)vs2015\build\</OutDir>
|
74
|
+
<IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
|
75
|
+
</PropertyGroup>
|
76
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
77
|
+
<IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
|
78
|
+
<OutDir>$(SolutionDir)vs2015\build\</OutDir>
|
79
|
+
<IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
|
80
|
+
</PropertyGroup>
|
81
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
82
|
+
<IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
|
83
|
+
<OutDir>$(SolutionDir)vs2015\build\</OutDir>
|
84
|
+
<IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
|
85
|
+
</PropertyGroup>
|
86
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
87
|
+
<IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
|
88
|
+
<OutDir>$(SolutionDir)vs2015\build\</OutDir>
|
89
|
+
<IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
|
90
|
+
</PropertyGroup>
|
91
|
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
92
|
+
<ClCompile>
|
93
|
+
<WarningLevel>Level3</WarningLevel>
|
94
|
+
<Optimization>Disabled</Optimization>
|
95
|
+
<SDLCheck>true</SDLCheck>
|
96
|
+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
97
|
+
</ClCompile>
|
98
|
+
</ItemDefinitionGroup>
|
99
|
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
100
|
+
<ClCompile>
|
101
|
+
<WarningLevel>Level3</WarningLevel>
|
102
|
+
<Optimization>Disabled</Optimization>
|
103
|
+
<SDLCheck>true</SDLCheck>
|
104
|
+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
105
|
+
</ClCompile>
|
106
|
+
</ItemDefinitionGroup>
|
107
|
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
108
|
+
<ClCompile>
|
109
|
+
<WarningLevel>Level3</WarningLevel>
|
110
|
+
<Optimization>MaxSpeed</Optimization>
|
111
|
+
<FunctionLevelLinking>true</FunctionLevelLinking>
|
112
|
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
113
|
+
<SDLCheck>true</SDLCheck>
|
114
|
+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
115
|
+
</ClCompile>
|
116
|
+
<Link>
|
117
|
+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
118
|
+
<OptimizeReferences>true</OptimizeReferences>
|
119
|
+
</Link>
|
120
|
+
</ItemDefinitionGroup>
|
121
|
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
122
|
+
<ClCompile>
|
123
|
+
<WarningLevel>Level3</WarningLevel>
|
124
|
+
<Optimization>MaxSpeed</Optimization>
|
125
|
+
<FunctionLevelLinking>true</FunctionLevelLinking>
|
126
|
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
127
|
+
<SDLCheck>true</SDLCheck>
|
128
|
+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
129
|
+
</ClCompile>
|
130
|
+
<Link>
|
131
|
+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
132
|
+
<OptimizeReferences>true</OptimizeReferences>
|
133
|
+
</Link>
|
134
|
+
</ItemDefinitionGroup>
|
135
|
+
<ItemGroup>
|
136
|
+
<ClCompile Include="..\..\src\argon2.c" />
|
137
|
+
<ClCompile Include="..\..\src\blake2\blake2b.c" />
|
138
|
+
<ClCompile Include="..\..\src\core.c" />
|
139
|
+
<ClCompile Include="..\..\src\encoding.c" />
|
140
|
+
<ClCompile Include="..\..\src\ref.c" />
|
141
|
+
<ClCompile Include="..\..\src\test.c" />
|
142
|
+
<ClCompile Include="..\..\src\thread.c" />
|
143
|
+
</ItemGroup>
|
144
|
+
<ItemGroup>
|
145
|
+
<ClInclude Include="..\..\include\argon2.h" />
|
146
|
+
<ClInclude Include="..\..\src\blake2\blake2-impl.h" />
|
147
|
+
<ClInclude Include="..\..\src\blake2\blake2.h" />
|
148
|
+
<ClInclude Include="..\..\src\blake2\blamka-round-opt.h" />
|
149
|
+
<ClInclude Include="..\..\src\blake2\blamka-round-ref.h" />
|
150
|
+
<ClInclude Include="..\..\src\core.h" />
|
151
|
+
<ClInclude Include="..\..\src\encoding.h" />
|
152
|
+
<ClInclude Include="..\..\src\ref.h" />
|
153
|
+
<ClInclude Include="..\..\src\thread.h" />
|
154
|
+
</ItemGroup>
|
155
|
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
156
|
+
<ImportGroup Label="ExtensionTargets">
|
157
|
+
</ImportGroup>
|
158
|
+
</Project>
|
@@ -0,0 +1,69 @@
|
|
1
|
+
<?xml version="1.0" encoding="utf-8"?>
|
2
|
+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
3
|
+
<ItemGroup>
|
4
|
+
<Filter Include="Source Files">
|
5
|
+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
6
|
+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
7
|
+
</Filter>
|
8
|
+
<Filter Include="Header Files">
|
9
|
+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
10
|
+
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
|
11
|
+
</Filter>
|
12
|
+
<Filter Include="Resource Files">
|
13
|
+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
14
|
+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
15
|
+
</Filter>
|
16
|
+
</ItemGroup>
|
17
|
+
<ItemGroup>
|
18
|
+
<ClCompile Include="..\..\src\argon2.c">
|
19
|
+
<Filter>Source Files</Filter>
|
20
|
+
</ClCompile>
|
21
|
+
<ClCompile Include="..\..\src\core.c">
|
22
|
+
<Filter>Source Files</Filter>
|
23
|
+
</ClCompile>
|
24
|
+
<ClCompile Include="..\..\src\encoding.c">
|
25
|
+
<Filter>Source Files</Filter>
|
26
|
+
</ClCompile>
|
27
|
+
<ClCompile Include="..\..\src\ref.c">
|
28
|
+
<Filter>Source Files</Filter>
|
29
|
+
</ClCompile>
|
30
|
+
<ClCompile Include="..\..\src\test.c">
|
31
|
+
<Filter>Source Files</Filter>
|
32
|
+
</ClCompile>
|
33
|
+
<ClCompile Include="..\..\src\thread.c">
|
34
|
+
<Filter>Source Files</Filter>
|
35
|
+
</ClCompile>
|
36
|
+
<ClCompile Include="..\..\src\blake2\blake2b.c">
|
37
|
+
<Filter>Source Files</Filter>
|
38
|
+
</ClCompile>
|
39
|
+
</ItemGroup>
|
40
|
+
<ItemGroup>
|
41
|
+
<ClInclude Include="..\..\include\argon2.h">
|
42
|
+
<Filter>Header Files</Filter>
|
43
|
+
</ClInclude>
|
44
|
+
<ClInclude Include="..\..\src\blake2\blake2.h">
|
45
|
+
<Filter>Header Files</Filter>
|
46
|
+
</ClInclude>
|
47
|
+
<ClInclude Include="..\..\src\blake2\blake2-impl.h">
|
48
|
+
<Filter>Header Files</Filter>
|
49
|
+
</ClInclude>
|
50
|
+
<ClInclude Include="..\..\src\core.h">
|
51
|
+
<Filter>Header Files</Filter>
|
52
|
+
</ClInclude>
|
53
|
+
<ClInclude Include="..\..\src\encoding.h">
|
54
|
+
<Filter>Header Files</Filter>
|
55
|
+
</ClInclude>
|
56
|
+
<ClInclude Include="..\..\src\ref.h">
|
57
|
+
<Filter>Header Files</Filter>
|
58
|
+
</ClInclude>
|
59
|
+
<ClInclude Include="..\..\src\thread.h">
|
60
|
+
<Filter>Header Files</Filter>
|
61
|
+
</ClInclude>
|
62
|
+
<ClInclude Include="..\..\src\blake2\blamka-round-opt.h">
|
63
|
+
<Filter>Header Files</Filter>
|
64
|
+
</ClInclude>
|
65
|
+
<ClInclude Include="..\..\src\blake2\blamka-round-ref.h">
|
66
|
+
<Filter>Header Files</Filter>
|
67
|
+
</ClInclude>
|
68
|
+
</ItemGroup>
|
69
|
+
</Project>
|
data/lib/argon2.rb
CHANGED
@@ -30,7 +30,11 @@ module Argon2
|
|
30
30
|
|
31
31
|
def self.verify_password(pass, hash, secret = nil)
|
32
32
|
raise ArgonHashFail, "Invalid hash" unless
|
33
|
-
/^\$argon2i\$.{,
|
33
|
+
/^\$argon2i\$.{,112}/ =~ hash
|
34
|
+
|
35
|
+
hash.gsub! "argon2$", "argon2$v=19$" unless
|
36
|
+
/^\$argon2i\$v=/ =~ hash
|
37
|
+
|
34
38
|
Argon2::Engine.argon2i_verify(pass, hash, secret)
|
35
39
|
end
|
36
40
|
end
|
data/lib/argon2/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: argon2
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Technion
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-05-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: ffi
|
@@ -146,22 +146,32 @@ files:
|
|
146
146
|
- ext/argon2_wrap/extconf.rb
|
147
147
|
- ext/argon2_wrap/libargon2_wrap.so
|
148
148
|
- ext/argon2_wrap/test.c
|
149
|
-
- ext/argon2_wrap/tests
|
150
149
|
- ext/phc-winner-argon2/.git
|
150
|
+
- ext/phc-winner-argon2/.gitattributes
|
151
151
|
- ext/phc-winner-argon2/.gitignore
|
152
152
|
- ext/phc-winner-argon2/.travis.yml
|
153
|
+
- ext/phc-winner-argon2/Argon2.sln
|
153
154
|
- ext/phc-winner-argon2/CHANGELOG.md
|
154
155
|
- ext/phc-winner-argon2/LICENSE
|
155
156
|
- ext/phc-winner-argon2/Makefile
|
156
157
|
- ext/phc-winner-argon2/README.md
|
158
|
+
- ext/phc-winner-argon2/appveyor.yml
|
157
159
|
- ext/phc-winner-argon2/argon2-specs.pdf
|
160
|
+
- ext/phc-winner-argon2/export.sh
|
158
161
|
- ext/phc-winner-argon2/include/argon2.h
|
159
162
|
- ext/phc-winner-argon2/kats/argon2d
|
160
163
|
- ext/phc-winner-argon2/kats/argon2d.shasum
|
164
|
+
- ext/phc-winner-argon2/kats/argon2d_v16
|
165
|
+
- ext/phc-winner-argon2/kats/argon2d_v16.shasum
|
161
166
|
- ext/phc-winner-argon2/kats/argon2i
|
162
167
|
- ext/phc-winner-argon2/kats/argon2i.shasum
|
168
|
+
- ext/phc-winner-argon2/kats/argon2i_v16
|
169
|
+
- ext/phc-winner-argon2/kats/argon2i_v16.shasum
|
170
|
+
- ext/phc-winner-argon2/kats/check-sums.ps1
|
163
171
|
- ext/phc-winner-argon2/kats/check-sums.sh
|
172
|
+
- ext/phc-winner-argon2/kats/test.ps1
|
164
173
|
- ext/phc-winner-argon2/kats/test.sh
|
174
|
+
- ext/phc-winner-argon2/man/argon2.1
|
165
175
|
- ext/phc-winner-argon2/opt.o
|
166
176
|
- ext/phc-winner-argon2/src/argon2.c
|
167
177
|
- ext/phc-winner-argon2/src/bench.c
|
@@ -184,6 +194,22 @@ files:
|
|
184
194
|
- ext/phc-winner-argon2/src/test.c
|
185
195
|
- ext/phc-winner-argon2/src/thread.c
|
186
196
|
- ext/phc-winner-argon2/src/thread.h
|
197
|
+
- ext/phc-winner-argon2/vs2015/Argon2Opt/Argon2Opt.vcxproj
|
198
|
+
- ext/phc-winner-argon2/vs2015/Argon2Opt/Argon2Opt.vcxproj.filters
|
199
|
+
- ext/phc-winner-argon2/vs2015/Argon2OptBench/Argon2OptBench.vcxproj
|
200
|
+
- ext/phc-winner-argon2/vs2015/Argon2OptBench/Argon2OptBench.vcxproj.filters
|
201
|
+
- ext/phc-winner-argon2/vs2015/Argon2OptGenKAT/Argon2OptGenKAT.vcxproj
|
202
|
+
- ext/phc-winner-argon2/vs2015/Argon2OptGenKAT/Argon2OptGenKAT.vcxproj.filters
|
203
|
+
- ext/phc-winner-argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj
|
204
|
+
- ext/phc-winner-argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj.filters
|
205
|
+
- ext/phc-winner-argon2/vs2015/Argon2Ref/Argon2Ref.vcxproj
|
206
|
+
- ext/phc-winner-argon2/vs2015/Argon2Ref/Argon2Ref.vcxproj.filters
|
207
|
+
- ext/phc-winner-argon2/vs2015/Argon2RefBench/Argon2RefBench.vcxproj
|
208
|
+
- ext/phc-winner-argon2/vs2015/Argon2RefBench/Argon2RefBench.vcxproj.filters
|
209
|
+
- ext/phc-winner-argon2/vs2015/Argon2RefGenKAT/Argon2RefGenKAT.vcxproj
|
210
|
+
- ext/phc-winner-argon2/vs2015/Argon2RefGenKAT/Argon2RefGenKAT.vcxproj.filters
|
211
|
+
- ext/phc-winner-argon2/vs2015/Argon2RefTestCI/Argon2RefTestCI.vcxproj
|
212
|
+
- ext/phc-winner-argon2/vs2015/Argon2RefTestCI/Argon2RefTestCI.vcxproj.filters
|
187
213
|
- lib/argon2.rb
|
188
214
|
- lib/argon2/constants.rb
|
189
215
|
- lib/argon2/engine.rb
|