sorcery-argon2 1.0.0 → 1.2.0

data/ext/phc-winner-argon2/vs2015/Argon2RefGenKAT/Argon2RefGenKAT.vcxproj.filters

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\argon2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\core.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\encoding.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\genkat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ref.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\thread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\blake2\blake2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\blake2\blake2-impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\blake2\blamka-round-opt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\blake2\blamka-round-ref.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\blake2\blake2b.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\argon2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\core.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\encoding.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\genkat.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ref.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\thread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

data/ext/phc-winner-argon2/vs2015/Argon2RefTestCI/Argon2RefTestCI.vcxproj

@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseStatic|Win32">
+      <Configuration>ReleaseStatic</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseStatic|x64">
+      <Configuration>ReleaseStatic</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8A1F7F84-34AF-4DB2-9D58-D4823DFE79E9}</ProjectGuid>
+    <RootNamespace>Argon2RefTestCI</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <!-- Set DefaultPlatformToolset to v100 (VS2010) if not defined -->
+  <PropertyGroup Label="EmptyDefaultPlatformToolset">
+    <DefaultPlatformToolset Condition=" '$(DefaultPlatformToolset)' == '' ">v100</DefaultPlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="PlatformToolset">
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
+    <OutDir>$(SolutionDir)vs2015\build\</OutDir>
+    <IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
+    <OutDir>$(SolutionDir)vs2015\build\</OutDir>
+    <IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
+    <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
+    <OutDir>$(SolutionDir)vs2015\build\</OutDir>
+    <IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
+    <OutDir>$(SolutionDir)vs2015\build\</OutDir>
+    <IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
+    <OutDir>$(SolutionDir)vs2015\build\</OutDir>
+    <IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
+    <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
+    <OutDir>$(SolutionDir)vs2015\build\</OutDir>
+    <IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\argon2.c" />
+    <ClCompile Include="..\..\src\blake2\blake2b.c" />
+    <ClCompile Include="..\..\src\core.c" />
+    <ClCompile Include="..\..\src\encoding.c" />
+    <ClCompile Include="..\..\src\ref.c" />
+    <ClCompile Include="..\..\src\test.c" />
+    <ClCompile Include="..\..\src\thread.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\argon2.h" />
+    <ClInclude Include="..\..\src\blake2\blake2-impl.h" />
+    <ClInclude Include="..\..\src\blake2\blake2.h" />
+    <ClInclude Include="..\..\src\blake2\blamka-round-opt.h" />
+    <ClInclude Include="..\..\src\blake2\blamka-round-ref.h" />
+    <ClInclude Include="..\..\src\core.h" />
+    <ClInclude Include="..\..\src\encoding.h" />
+    <ClInclude Include="..\..\src\ref.h" />
+    <ClInclude Include="..\..\src\thread.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

data/ext/phc-winner-argon2/vs2015/Argon2RefTestCI/Argon2RefTestCI.vcxproj.filters

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\argon2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\core.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\encoding.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ref.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\thread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\blake2\blake2b.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\argon2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\blake2\blake2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\blake2\blake2-impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\core.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\encoding.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ref.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\thread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\blake2\blamka-round-opt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\blake2\blamka-round-ref.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

data/lib/argon2/ffi_engine.rb

@@ -67,13 +67,13 @@ module Argon2
       result.unpack('H*').join
     end
 
-    def self.hash_argon2id(password, salt, t_cost, m_cost, out_len = nil)
+    def self.hash_argon2id(password, salt, t_cost, m_cost, p_cost, out_len = nil)
       out_len = (out_len || Constants::OUT_LEN).to_i
       raise ::Argon2::Errors::InvalidOutputLength if out_len < 1
 
       result = ''
       FFI::MemoryPointer.new(:char, out_len) do |buffer|
-        ret = Ext.argon2id_hash_raw(t_cost, 1 << m_cost, 1, password,
+        ret = Ext.argon2id_hash_raw(t_cost, 1 << m_cost, p_cost, password,
                                     password.length, salt, salt.length,
                                     buffer, out_len)
         raise ::Argon2::Errors::ExtError, ERRORS[ret.abs] unless ret.zero?
@@ -83,7 +83,7 @@ module Argon2
       result.unpack('H*').join
     end
 
-    def self.hash_argon2id_encode(password, salt, t_cost, m_cost, secret)
+    def self.hash_argon2id_encode(password, salt, t_cost, m_cost, p_cost, secret)
       result = ''
       secretlen = secret.nil? ? 0 : secret.bytesize
       passwordlen = password.nil? ? 0 : password.bytesize
@@ -92,7 +92,7 @@ module Argon2
       FFI::MemoryPointer.new(:char, Constants::ENCODE_LEN) do |buffer|
         ret = Ext.argon2_wrap(buffer, password, passwordlen,
                               salt, salt.length, t_cost, (1 << m_cost),
-                              1, secret, secretlen)
+                              p_cost, secret, secretlen)
         raise ::Argon2::Errors::ExtError, ERRORS[ret.abs] unless ret.zero?
 
         result = buffer.read_string(Constants::ENCODE_LEN)

data/lib/argon2/password.rb

@@ -19,11 +19,33 @@ module Argon2
     MIN_M_COST = 3
     # Used to validate the maximum acceptable memory cost
     MAX_M_COST = 31
+    # Used as the default parallelism cost if one isn't provided when calling
+    # Argon2::Password.create
+    DEFAULT_P_COST = 1
+    # Used to validate the minimum acceptable parallelism cost
+    MIN_P_COST = 1
+    # Used to validate the maximum acceptable parallelism cost
+    MAX_P_COST = 8
     # The complete Argon2 digest string (not to be confused with the checksum).
+    #
+    # For a detailed description of the digest format, please see:
+    # https://github.com/P-H-C/phc-string-format/blob/master/phc-sf-spec.md
     attr_reader :digest
-    # The hash portion of the stored password hash.
+    # The hash portion of the stored password hash. This is Base64 encoded by
+    # default.
     attr_reader :checksum
-    # The salt of the stored password hash.
+    # The salt of the stored password hash. This is Base64 encoded by default.
+    #
+    # To retrieve the original salt:
+    #
+    #    require 'base64'
+    #
+    #    argon2 = Argon2::Password.new(digest)
+    #
+    #    argon2.salt
+    #    => Base64 encoded salt
+    #    Base64.decode64(argon2.salt)
+    #    => original salt
     attr_reader :salt
     # Variant used (argon2i / argon2d / argon2id)
     attr_reader :variant
@@ -55,6 +77,7 @@ module Argon2
       #
       # * :t_cost
       # * :m_cost
+      # * :p_cost
       # * :secret
       #
       def create(password, options = {})
@@ -62,18 +85,18 @@ module Argon2
 
         t_cost = options[:t_cost] || DEFAULT_T_COST
         m_cost = options[:m_cost] || DEFAULT_M_COST
+        p_cost = options[:p_cost] || DEFAULT_P_COST
 
         raise Argon2::Errors::InvalidTCost if t_cost < MIN_T_COST || t_cost > MAX_T_COST
         raise Argon2::Errors::InvalidMCost if m_cost < MIN_M_COST || m_cost > MAX_M_COST
-
-        # TODO: Add support for changing the p_cost
+        raise Argon2::Errors::InvalidPCost if p_cost < MIN_P_COST || p_cost > MAX_P_COST
 
         salt = Engine.saltgen
         secret = options[:secret]
 
         Argon2::Password.new(
           Argon2::Engine.hash_argon2id_encode(
-            password, salt, t_cost, m_cost, secret
+            password, salt, t_cost, m_cost, p_cost, secret
           )
         )
       end

data/lib/argon2/version.rb

@@ -4,5 +4,5 @@ module Argon2
   ##
   # Standard Gem version constant.
   #
-  VERSION = '1.0.0'
+  VERSION = '1.2.0'
 end

data/sorcery-argon2.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |s|
     'bug_tracker_uri' => "#{repo_url}/issues",
     'changelog_uri' => "#{repo_url}/releases/tag/v#{version}",
     'documentation_uri' => 'https://rubydoc.info/gems/sorcery-argon2',
-    'source_code_uri' => "#{repo_url}/tree/v#{version}"
+    'source_code_uri' => "#{repo_url}/tree/v#{version}",
+    'rubygems_mfa_required' => 'true'
   }
 
   s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -35,7 +36,7 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'ffi',          '~> 1.14'
+  s.add_dependency 'ffi',          '~> 1.15'
   s.add_dependency 'ffi-compiler', '~> 1.0'
 
   # Gems required for testing the wrapper locally.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorcery-argon2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Josh Buker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/ISSUE_TEMPLATE/need_help.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/codeql.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".gitmodules"
@@ -149,10 +150,91 @@ files:
 - bin/console
 - bin/setup
 - bin/test
-- ext/argon2_wrap/Makefile
+- ext/argon2_wrap/Makefile.real
 - ext/argon2_wrap/argon_wrap.c
 - ext/argon2_wrap/extconf.rb
+- ext/argon2_wrap/libargon2_wrap.so
 - ext/argon2_wrap/test.c
+- ext/argon2_wrap/tests
+- ext/phc-winner-argon2/.git
+- ext/phc-winner-argon2/.gitattributes
+- ext/phc-winner-argon2/.gitignore
+- ext/phc-winner-argon2/.travis.yml
+- ext/phc-winner-argon2/Argon2.sln
+- ext/phc-winner-argon2/CHANGELOG.md
+- ext/phc-winner-argon2/LICENSE
+- ext/phc-winner-argon2/Makefile
+- ext/phc-winner-argon2/Package.swift
+- ext/phc-winner-argon2/README.md
+- ext/phc-winner-argon2/appveyor.yml
+- ext/phc-winner-argon2/argon2-specs.pdf
+- ext/phc-winner-argon2/export.sh
+- ext/phc-winner-argon2/include/argon2.h
+- ext/phc-winner-argon2/kats/argon2d
+- ext/phc-winner-argon2/kats/argon2d.shasum
+- ext/phc-winner-argon2/kats/argon2d_v16
+- ext/phc-winner-argon2/kats/argon2d_v16.shasum
+- ext/phc-winner-argon2/kats/argon2i
+- ext/phc-winner-argon2/kats/argon2i.shasum
+- ext/phc-winner-argon2/kats/argon2i_v16
+- ext/phc-winner-argon2/kats/argon2i_v16.shasum
+- ext/phc-winner-argon2/kats/argon2id
+- ext/phc-winner-argon2/kats/argon2id.shasum
+- ext/phc-winner-argon2/kats/argon2id_v16
+- ext/phc-winner-argon2/kats/argon2id_v16.shasum
+- ext/phc-winner-argon2/kats/check-sums.ps1
+- ext/phc-winner-argon2/kats/check-sums.sh
+- ext/phc-winner-argon2/kats/test.ps1
+- ext/phc-winner-argon2/kats/test.sh
+- ext/phc-winner-argon2/latex/IEEEtran.cls
+- ext/phc-winner-argon2/latex/Makefile
+- ext/phc-winner-argon2/latex/argon2-specs.tex
+- ext/phc-winner-argon2/latex/pics/argon2-par.pdf
+- ext/phc-winner-argon2/latex/pics/compression.pdf
+- ext/phc-winner-argon2/latex/pics/generic.pdf
+- ext/phc-winner-argon2/latex/pics/power-distribution.jpg
+- ext/phc-winner-argon2/latex/tradeoff.bib
+- ext/phc-winner-argon2/libargon2.pc.in
+- ext/phc-winner-argon2/man/argon2.1
+- ext/phc-winner-argon2/src/argon2.c
+- ext/phc-winner-argon2/src/bench.c
+- ext/phc-winner-argon2/src/blake2/blake2-impl.h
+- ext/phc-winner-argon2/src/blake2/blake2.h
+- ext/phc-winner-argon2/src/blake2/blake2b.c
+- ext/phc-winner-argon2/src/blake2/blamka-round-opt.h
+- ext/phc-winner-argon2/src/blake2/blamka-round-ref.h
+- ext/phc-winner-argon2/src/core.c
+- ext/phc-winner-argon2/src/core.h
+- ext/phc-winner-argon2/src/encoding.c
+- ext/phc-winner-argon2/src/encoding.h
+- ext/phc-winner-argon2/src/genkat.c
+- ext/phc-winner-argon2/src/genkat.h
+- ext/phc-winner-argon2/src/opt.c
+- ext/phc-winner-argon2/src/ref.c
+- ext/phc-winner-argon2/src/run.c
+- ext/phc-winner-argon2/src/test.c
+- ext/phc-winner-argon2/src/thread.c
+- ext/phc-winner-argon2/src/thread.h
+- ext/phc-winner-argon2/vs2015/Argon2Opt/Argon2Opt.vcxproj
+- ext/phc-winner-argon2/vs2015/Argon2Opt/Argon2Opt.vcxproj.filters
+- ext/phc-winner-argon2/vs2015/Argon2OptBench/Argon2OptBench.vcxproj
+- ext/phc-winner-argon2/vs2015/Argon2OptBench/Argon2OptBench.vcxproj.filters
+- ext/phc-winner-argon2/vs2015/Argon2OptDll/Argon2OptDll.vcxproj
+- ext/phc-winner-argon2/vs2015/Argon2OptDll/Argon2OptDll.vcxproj.filters
+- ext/phc-winner-argon2/vs2015/Argon2OptGenKAT/Argon2OptGenKAT.vcxproj
+- ext/phc-winner-argon2/vs2015/Argon2OptGenKAT/Argon2OptGenKAT.vcxproj.filters
+- ext/phc-winner-argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj
+- ext/phc-winner-argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj.filters
+- ext/phc-winner-argon2/vs2015/Argon2Ref/Argon2Ref.vcxproj
+- ext/phc-winner-argon2/vs2015/Argon2Ref/Argon2Ref.vcxproj.filters
+- ext/phc-winner-argon2/vs2015/Argon2RefBench/Argon2RefBench.vcxproj
+- ext/phc-winner-argon2/vs2015/Argon2RefBench/Argon2RefBench.vcxproj.filters
+- ext/phc-winner-argon2/vs2015/Argon2RefDll/Argon2RefDll.vcxproj
+- ext/phc-winner-argon2/vs2015/Argon2RefDll/Argon2RefDll.vcxproj.filters
+- ext/phc-winner-argon2/vs2015/Argon2RefGenKAT/Argon2RefGenKAT.vcxproj
+- ext/phc-winner-argon2/vs2015/Argon2RefGenKAT/Argon2RefGenKAT.vcxproj.filters
+- ext/phc-winner-argon2/vs2015/Argon2RefTestCI/Argon2RefTestCI.vcxproj
+- ext/phc-winner-argon2/vs2015/Argon2RefTestCI/Argon2RefTestCI.vcxproj.filters
 - lib/argon2.rb
 - lib/argon2/constants.rb
 - lib/argon2/engine.rb
@@ -166,9 +248,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/sorcery/argon2/issues
-  changelog_uri: https://github.com/sorcery/argon2/releases/tag/v1.0.0
+  changelog_uri: https://github.com/sorcery/argon2/releases/tag/v1.2.0
   documentation_uri: https://rubydoc.info/gems/sorcery-argon2
-  source_code_uri: https://github.com/sorcery/argon2/tree/v1.0.0
+  source_code_uri: https://github.com/sorcery/argon2/tree/v1.2.0
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -184,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper for the Argon2 Password hashing algorithm