argon2 2.0.1 → 2.1.1

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

@@ -32,43 +32,44 @@
     <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>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -154,6 +155,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -169,6 +171,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -183,6 +186,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
@@ -198,6 +202,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

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

@@ -32,43 +32,44 @@
     <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>
-    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -154,6 +155,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -169,6 +171,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -183,6 +186,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
@@ -198,6 +202,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

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

@@ -32,43 +32,44 @@
     <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>
-    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -154,6 +155,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -169,6 +171,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -183,6 +186,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
@@ -198,6 +202,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

data/lib/argon2/ffi_engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 require 'ffi-compiler/loader'
 
@@ -5,37 +7,40 @@ module Argon2
   # Direct external bindings. Call these methods via the Engine class to ensure points are dealt with
   module Ext
     extend FFI::Library
-    ffi_lib FFI::Compiler::Loader.find('argon2_wrap')
+    ffi_lib FFI::Compiler::Loader.find(FFI::Platform.windows? ? 'libargon2_wrap' : 'argon2_wrap')
 
     # int argon2i_hash_raw(const uint32_t t_cost, const uint32_t m_cost,
     #   const uint32_t parallelism, const void *pwd,
     #   const size_t pwdlen, const void *salt,
     #   const size_t saltlen, void *hash, const size_t hashlen);
 
-    attach_function :argon2i_hash_raw, [
-      :uint, :uint, :uint, :pointer,
-      :size_t, :pointer, :size_t, :pointer, :size_t], :int, :blocking => true
+    attach_function :argon2i_hash_raw, %i[
+      uint uint uint pointer
+      size_t pointer size_t pointer size_t
+    ], :int, :blocking => true
 
     # int argon2id_hash_raw(const uint32_t t_cost, const uint32_t m_cost,
     #   const uint32_t parallelism, const void *pwd,
     #   const size_t pwdlen, const void *salt,
     #   const size_t saltlen, void *hash, const size_t hashlen)
-    attach_function :argon2id_hash_raw, [
-      :uint, :uint, :uint, :pointer,
-      :size_t, :pointer, :size_t, :pointer, :size_t], :int, :blocking => true
+    attach_function :argon2id_hash_raw, %i[
+      uint uint uint pointer
+      size_t pointer size_t pointer size_t
+    ], :int, :blocking => true
 
     # void argon2_wrap(uint8_t *out, char *pwd, size_t pwdlen,
     # uint8_t *salt, uint32_t saltlen, uint32_t t_cost,
     #    uint32_t m_cost, uint32_t lanes,
     #    uint8_t *secret, uint32_t secretlen)
-    attach_function :argon2_wrap, [
-      :pointer, :pointer, :size_t, :pointer, :uint, :uint,
-      :uint, :uint, :pointer, :size_t], :int, :blocking => true
+    attach_function :argon2_wrap, %i[
+      pointer pointer size_t pointer uint uint
+      uint uint pointer size_t
+    ], :int, :blocking => true
 
     # int argon2i_verify(const char *encoded, const void *pwd,
     # const size_t pwdlen);
-    attach_function :wrap_argon2_verify, [:pointer, :pointer, :size_t,
-      :pointer, :size_t], :int, :blocking => true
+    attach_function :wrap_argon2_verify, %i[pointer pointer size_t
+      pointer size_t], :int, :blocking => true
   end
 
   # The engine class shields users from the FFI interface.
@@ -44,43 +49,47 @@ module Argon2
     def self.hash_argon2i(password, salt, t_cost, m_cost, out_len = nil)
       out_len = (out_len || Constants::OUT_LEN).to_i
       raise ArgonHashFail, "Invalid output length" if out_len < 1
+
       result = ''
       FFI::MemoryPointer.new(:char, out_len) do |buffer|
         ret = Ext.argon2i_hash_raw(t_cost, 1 << m_cost, 1, password,
-           password.length, salt, salt.length,
-            buffer, out_len)
+                                   password.length, salt, salt.length,
+                                   buffer, out_len)
         raise ArgonHashFail, ERRORS[ret.abs] unless ret.zero?
+
         result = buffer.read_string(out_len)
       end
       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 ArgonHashFail, "Invalid output length" 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,
-           password.length, salt, salt.length,
-            buffer, out_len)
+        ret = Ext.argon2id_hash_raw(t_cost, 1 << m_cost, p_cost, password,
+                                    password.length, salt, salt.length,
+                                    buffer, out_len)
         raise ArgonHashFail, ERRORS[ret.abs] unless ret.zero?
+
         result = buffer.read_string(out_len)
       end
       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
-      if salt.length != Constants::SALT_LEN
-        raise ArgonHashFail, "Invalid salt size"
-      end
+      raise ArgonHashFail, "Invalid salt size" if salt.length != Constants::SALT_LEN
+
       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)
+                              salt, salt.length, t_cost, (1 << m_cost),
+                              p_cost, secret, secretlen)
         raise ArgonHashFail, ERRORS[ret.abs] unless ret.zero?
+
         result = buffer.read_string(Constants::ENCODE_LEN)
       end
       result.delete "\0"
@@ -93,6 +102,7 @@ module Argon2
       ret = Ext.wrap_argon2_verify(hash, pwd, passwordlen, secret, secretlen)
       return false if ERRORS[ret.abs] == 'ARGON2_DECODING_FAIL'
       raise ArgonHashFail, ERRORS[ret.abs] unless ret.zero?
+
       true
     end
   end

data/lib/argon2/hash_format.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Argon2
+  ##
+  # Get the values from an Argon2 compatible string.
+  #
+  class HashFormat
+    attr_reader :variant, :version, :t_cost, :m_cost, :p_cost, :salt, :checksum
+
+    # FIXME: Reduce complexity/AbcSize
+    # rubocop:disable Metrics/AbcSize
+    def initialize(digest)
+      digest = digest.to_s unless digest.is_a?(String)
+
+      raise Argon2::ArgonHashFail, 'Invalid Argon2 hash' unless self.class.valid_hash?(digest)
+
+      _, variant, version, config, salt, checksum = digest.split('$')
+      # Regex magic to extract the values for each setting
+      version = /v=(\d+)/.match(version)
+      t_cost  = /t=(\d+),/.match(config)
+      m_cost  = /m=(\d+),/.match(config)
+      p_cost  = /p=(\d+)/.match(config)
+
+      # Make sure none of the values are missing
+      raise Argon2::ArgonHashFail, 'Invalid Argon2 version' if version.nil?
+      raise Argon2::ArgonHashFail, 'Invalid Argon2 time cost' if t_cost.nil?
+      raise Argon2::ArgonHashFail, 'Invalid Argon2 memory cost' if m_cost.nil?
+      raise Argon2::ArgonHashFail, 'Invalid Argon2 parallelism cost' if p_cost.nil?
+
+      @variant  = variant.to_str
+      @version  = version[1].to_i
+      @t_cost   = t_cost[1].to_i
+      @m_cost   = m_cost[1].to_i
+      @p_cost   = p_cost[1].to_i
+      @salt     = salt.to_str
+      @checksum = checksum.to_str
+    end
+    # rubocop:enable Metrics/AbcSize
+
+    ##
+    # Checks whether a given digest is a valid Argon2 hash.
+    #
+    # Supports 1 and argon2id formats.
+    #
+    def self.valid_hash?(digest)
+      /^\$argon2(id?|d).{,113}/ =~ digest
+    end
+  end
+end

data/lib/argon2/version.rb

@@ -3,5 +3,5 @@
 # Standard Gem version constant.
 
 module Argon2
-  VERSION = "2.0.1".freeze
+  VERSION = "2.1.1"
 end

data/lib/argon2.rb

@@ -4,7 +4,8 @@ require 'argon2/constants'
 require 'argon2/ffi_engine'
 require 'argon2/version'
 require 'argon2/errors'
-require 'argon2/engine.rb'
+require 'argon2/engine'
+require 'argon2/hash_format'
 
 module Argon2
   # Front-end API for the Argon2 module.
@@ -12,9 +13,14 @@ module Argon2
     def initialize(options = {})
       @t_cost = options[:t_cost] || 2
       raise ArgonHashFail, "Invalid t_cost" if @t_cost < 1 || @t_cost > 750
+
       @m_cost = options[:m_cost] || 16
       raise ArgonHashFail, "Invalid m_cost" if @m_cost < 1 || @m_cost > 31
-      @salt = options[:salt_do_not_supply] || Engine.saltgen
+
+      @p_cost = options[:p_cost] || 1
+      raise ArgonHashFail, "Invalid p_cost" if @p_cost < 1 || @p_cost > 8
+
+      @salt_do_not_supply = options[:salt_do_not_supply]
       @secret = options[:secret]
     end
 
@@ -22,19 +28,21 @@ module Argon2
       raise ArgonHashFail, "Invalid password (expected string)" unless
         pass.is_a?(String)
 
+      # Ensure salt is freshly generated unless it was intentionally supplied.
+      salt = @salt_do_not_supply || Engine.saltgen
+
       Argon2::Engine.hash_argon2id_encode(
-              pass, @salt, @t_cost, @m_cost, @secret)
+        pass, salt, @t_cost, @m_cost, @p_cost, @secret)
     end
 
     # Helper class, just creates defaults and calls hash()
-    def self.create(pass)
-      argon2 = Argon2::Password.new
+    def self.create(pass, options = {})
+      argon2 = Argon2::Password.new(options)
       argon2.create(pass)
     end
 
-    # Supports 1 and argon2id formats.
     def self.valid_hash?(hash)
-      /^\$argon2i.{,113}/ =~ hash
+      Argon2::HashFormat.valid_hash?(hash)
     end
 
     def self.verify_password(pass, hash, secret = nil)

data/sig/argon2.rbs

@@ -0,0 +1,16 @@
+# Classes
+module Argon2
+  class Password
+    @t_cost: Integer
+    @m_cost: Integer
+    @p_cost: Integer
+    @salt: nil | String
+    @secret: nil | String
+
+    def initialize: (?Hash[Symbol, Integer] options) -> (nil | String)
+    def create: (String pass) -> untyped
+    def self.create: (String pass) -> untyped
+    def self.valid_hash?: (string hash) -> Integer?
+    def self.verify_password: (untyped pass, untyped hash, ?nil secret) -> untyped
+  end
+end

data/sig/constants.rbs

@@ -0,0 +1,8 @@
+# Classes
+module Argon2
+  module Constants
+    SALT_LEN: Integer
+    OUT_LEN: Integer
+    ENCODE_LEN: Integer
+  end
+end

data/sig/version.rbs

@@ -0,0 +1,4 @@
+# Classes
+module Argon2
+  VERSION: String
+end