argon2 0.1.4 → 1.0.0

data/lib/argon2.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'argon2/constants'
 require 'argon2/ffi_engine'
 require 'argon2/version'
@@ -16,20 +17,20 @@ module Argon2
       @secret = options[:secret]
     end
 
-    def hash(pass)
+    def create(pass)
       Argon2::Engine.hash_argon2i_encode(
               pass, @salt, @t_cost, @m_cost, @secret)
     end
 
-    #Helper class, just creates defaults and calls hash()
-    def self.hash(pass)
+    # Helper class, just creates defaults and calls hash()
+    def self.create(pass)
       argon2 = Argon2::Password.new
-      argon2.hash(pass)
+      argon2.create(pass)
     end
 
     def self.verify_password(pass, hash, secret = nil)
       raise ArgonHashFail, "Invalid hash" unless
-        /^\$argon2i\$.{,110}/.match hash
+        /^\$argon2i\$.{,110}/ =~ hash
       Argon2::Engine.argon2i_verify(pass, hash, secret)
     end
   end

data/lib/argon2/constants.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 module Argon2
   # Constants utilised in several parts of the Argon2 module
   # SALT_LEN is a standard recommendation from the Argon2 spec.
   module Constants
     SALT_LEN = 16
-    OUT_LEN = 32 #Binary, unencoded output
-    ENCODE_LEN = 108 #Encoded output
+    OUT_LEN = 32 # Binary, unencoded output
+    ENCODE_LEN = 108 # Encoded output
   end
 end

data/lib/argon2/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'securerandom'
 
 module Argon2

data/lib/argon2/errors.rb

@@ -1,41 +1,42 @@
+# frozen_string_literal: true
 # Defines an array of errors that matches the enum list of errors from
 # argon2.h. This allows return values to propagate errors through the FFI.
 module Argon2
   class ArgonHashFail < StandardError; end
-  ERRORS = [
-    'ARGON2_OK',
-    'ARGON2_OUTPUT_PTR_NULL',
-    'ARGON2_OUTPUT_TOO_SHORT',
-    'ARGON2_OUTPUT_TOO_LONG',
-    'ARGON2_PWD_TOO_SHORT',
-    'ARGON2_PWD_TOO_LONG',
-    'ARGON2_SALT_TOO_SHORT',
-    'ARGON2_SALT_TOO_LONG',
-    'ARGON2_AD_TOO_SHORT',
-    'ARGON2_AD_TOO_LONG',
-    'ARGON2_SECRET_TOO_SHORT',
-    'ARGON2_SECRET_TOO_LONG',
-    'ARGON2_TIME_TOO_SMALL',
-    'ARGON2_TIME_TOO_LARGE',
-    'ARGON2_MEMORY_TOO_LITTLE',
-    'ARGON2_MEMORY_TOO_MUCH',
-    'ARGON2_LANES_TOO_FEW',
-    'ARGON2_LANES_TOO_MANY',
-    'ARGON2_PWD_PTR_MISMATCH',
-    'ARGON2_SALT_PTR_MISMATCH',
-    'ARGON2_SECRET_PTR_MISMATCH',
-    'ARGON2_AD_PTR_MISMATCH',
-    'ARGON2_MEMORY_ALLOCATION_ERROR',
-    'ARGON2_FREE_MEMORY_CBK_NULL',
-    'ARGON2_ALLOCATE_MEMORY_CBK_NULL',
-    'ARGON2_INCORRECT_PARAMETER',
-    'ARGON2_INCORRECT_TYPE',
-    'ARGON2_OUT_PTR_MISMATCH',
-    'ARGON2_THREADS_TOO_FEW',
-    'ARGON2_THREADS_TOO_MANY',
-    'ARGON2_MISSING_ARGS',
-    'ARGON2_ENCODING_FAIL',
-    'ARGON2_DECODING_FAIL'
-
-    ]
+  ERRORS = %w(
+    ARGON2_OK
+    ARGON2_OUTPUT_PTR_NULL
+    ARGON2_OUTPUT_TOO_SHORT
+    ARGON2_OUTPUT_TOO_LONG
+    ARGON2_PWD_TOO_SHORT
+    ARGON2_PWD_TOO_LONG
+    ARGON2_SALT_TOO_SHORT
+    ARGON2_SALT_TOO_LONG
+    ARGON2_AD_TOO_SHORT
+    ARGON2_AD_TOO_LONG
+    ARGON2_SECRET_TOO_SHORT
+    ARGON2_SECRET_TOO_LONG
+    ARGON2_TIME_TOO_SMALL
+    ARGON2_TIME_TOO_LARGE
+    ARGON2_MEMORY_TOO_LITTLE
+    ARGON2_MEMORY_TOO_MUCH
+    ARGON2_LANES_TOO_FEW
+    ARGON2_LANES_TOO_MANY
+    ARGON2_PWD_PTR_MISMATCH
+    ARGON2_SALT_PTR_MISMATCH
+    ARGON2_SECRET_PTR_MISMATCH
+    ARGON2_AD_PTR_MISMATCH
+    ARGON2_MEMORY_ALLOCATION_ERROR
+    ARGON2_FREE_MEMORY_CBK_NULL
+    ARGON2_ALLOCATE_MEMORY_CBK_NULL
+    ARGON2_INCORRECT_PARAMETER
+    ARGON2_INCORRECT_TYPE
+    ARGON2_OUT_PTR_MISMATCH
+    ARGON2_THREADS_TOO_FEW
+    ARGON2_THREADS_TOO_MANY
+    ARGON2_MISSING_ARGS
+    ARGON2_ENCODING_FAIL
+    ARGON2_DECODING_FAIL
+    ARGON2_THREAD_FAIL
+    ).freeze
 end

data/lib/argon2/ffi_engine.rb

@@ -2,12 +2,12 @@ require 'ffi'
 require 'ffi-compiler/loader'
 
 module Argon2
-  #Direct external bindings. Call these methods via the Engine class to ensure points are dealt with
+  # 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')
 
-    #int argon2i_hash_raw(const uint32_t t_cost, const uint32_t m_cost,
+    # 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);
@@ -16,16 +16,16 @@ module Argon2
       :uint, :uint, :uint, :pointer,
       :size_t, :pointer, :size_t, :pointer, :size_t], :int, :blocking => true
 
-    #void argon2_wrap(uint8_t *out, char *pwd, size_it pwdlen,
-    #uint8_t *salt, uint32_t t_cost,
+    # void argon2_wrap(uint8_t *out, char *pwd, size_it pwdlen,
+    # uint8_t *salt, 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, :pointer, :size_t], :uint, :blocking => true
 
-    #int argon2i_verify(const char *encoded, const void *pwd,
-    #const size_t pwdlen);
+    # 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
   end
@@ -39,7 +39,7 @@ module Argon2
         ret = Ext.argon2i_hash_raw(t_cost, 1 << m_cost, 1, password,
            password.length, salt, salt.length,
             buffer, Constants::OUT_LEN)
-        raise ArgonHashFail, ERRORS[ret] unless ret == 0
+        raise ArgonHashFail, ERRORS[ret.abs] unless ret == 0
         result = buffer.read_string(Constants::OUT_LEN)
       end
       result.unpack('H*').join
@@ -56,7 +56,7 @@ module Argon2
         ret = Ext.argon2_wrap(buffer, password, passwordlen,
             salt, t_cost, (1 << m_cost),
             1, secret, secretlen)
-        raise ArgonHashFail, ERRORS[ret] unless ret == 0
+        raise ArgonHashFail, ERRORS[ret.abs] unless ret == 0
         result = buffer.read_string(Constants::ENCODE_LEN)
       end
       result.delete "\0"
@@ -67,8 +67,8 @@ module Argon2
       passwordlen = pwd.nil? ? 0 : pwd.bytesize
 
       ret = Ext.wrap_argon2_verify(hash, pwd, passwordlen, secret, secretlen)
-      return false if ERRORS[ret] == 'ARGON2_DECODING_FAIL'
-      raise ArgonHashFail, ERRORS[ret] unless ret == 0
+      return false if ERRORS[ret.abs] == 'ARGON2_DECODING_FAIL'
+      raise ArgonHashFail, ERRORS[ret.abs] unless ret == 0
       true
     end
   end

data/lib/argon2/version.rb

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 # Standard Gem version constant.
 module Argon2
-  VERSION = "0.1.4"
+  VERSION = "1.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: argon2
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Technion
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -132,6 +132,7 @@ files:
 - ".gitmodules"
 - ".rubocop.yml"
 - ".travis.yml"
+- CONTRIBUTING.md
 - Changelog.md
 - Gemfile
 - LICENSE.txt
@@ -148,47 +149,41 @@ files:
 - ext/argon2_wrap/tests
 - ext/phc-winner-argon2/.git
 - ext/phc-winner-argon2/.gitignore
+- ext/phc-winner-argon2/.travis.yml
 - ext/phc-winner-argon2/CHANGELOG.md
 - ext/phc-winner-argon2/LICENSE
 - ext/phc-winner-argon2/Makefile
 - ext/phc-winner-argon2/README.md
-- ext/phc-winner-argon2/argon2
 - ext/phc-winner-argon2/argon2-specs.pdf
+- 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/argon2i
 - ext/phc-winner-argon2/kats/argon2i.shasum
 - ext/phc-winner-argon2/kats/check-sums.sh
 - ext/phc-winner-argon2/kats/test.sh
-- ext/phc-winner-argon2/libargon2.a
-- ext/phc-winner-argon2/libargon2.so
+- ext/phc-winner-argon2/opt.o
 - ext/phc-winner-argon2/src/argon2.c
-- ext/phc-winner-argon2/src/argon2.h
-- ext/phc-winner-argon2/src/argon2.o
 - 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/blake2b.o
 - 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/core.o
 - ext/phc-winner-argon2/src/encoding.c
 - ext/phc-winner-argon2/src/encoding.h
-- ext/phc-winner-argon2/src/encoding.o
 - 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/opt.h
 - ext/phc-winner-argon2/src/ref.c
 - ext/phc-winner-argon2/src/ref.h
-- ext/phc-winner-argon2/src/ref.o
 - 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/src/thread.o
 - lib/argon2.rb
 - lib/argon2/constants.rb
 - lib/argon2/engine.rb