argon2 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a60b9c207b41c9617c2ab7a2004431db65a55a66bc32c89565a1640d503434a0
-  data.tar.gz: d06a5d2775c37d831d298469d594d9681488adb2d30180294973619efa478e88
+  metadata.gz: 2e60d499987fb2252b9b82636c745797f8277855e443927bb196476d513b5ad3
+  data.tar.gz: 041a7dbdaf46f4c0c9ba32622ac17b59be7058e09f27cbe8033bfbb2705f690a
 SHA512:
-  metadata.gz: e63db7eb3b5fbbffa0291308eecd84b55a315986e124cd353bfad0111d86e1bf5072f42a39913a6b5c31730e65159cfe693694ccfd638996b9204d3b7a2a6d24
-  data.tar.gz: d81718f30c16eb3b504502f437150cc69964375fa0233512edb97d0bf208ee4903bae1911b957f781b6018b52e81eba113e6488ed3e035a417b9d52f9b6f4844
+  metadata.gz: 8feed89a1cadb4581f6aadfd842e8f1d2d58e47c0ffe4049cc6ffa3dd0e6c0a4a3fb3df631d39673e2de46e2009165bfdd52dfc4e3b3b319f9b959d70ffc7a83
+  data.tar.gz: b2ef55f29b6a5da0143cf220eb3bf0fe03b4381defd68befa9d759fce8f03c91b6d77071667095576541b62dbf8535f55026a9c4442f65316510a3fd97cf63f6

data/.travis.yml

@@ -6,8 +6,7 @@ rvm:
   - 2.3.3
   - jruby-9000
 before_install:
-  - gem install bundler
-  - gem update --system
+  - gem install bundler -v "~>1.0"
 install: bin/setup
 script:
   - cd ext/argon2_wrap/ && make test && cd ../..

data/Changelog.md

@@ -1,3 +1,6 @@
+## v2.0.0: 2019-01-06
+- Defaults to Argon2id for new hashes
+
 ## v1.2.0: 2018-11-29
 - Support for verifying Argon2id format
 

data/ext/argon2_wrap/test.c

@@ -83,7 +83,6 @@ int main()
     pwd = strdup(PWD); \
     argon2_wrap(out2, pwd, strlen(PWD), salt, strlen((const char *)salt),T, 1<<M, 1, NULL, 0); \
     free(pwd); \
-    fprintf(stderr,out2); \
     assert(memcmp(out2, REF, strlen(REF)) == 0); \
     printf( "Ref test: %s: PASS\n", REF);
 

data/lib/argon2.rb

@@ -32,10 +32,13 @@ module Argon2
       argon2.create(pass)
     end
 
+    # Supports 1 and argon2id formats.
+    def self.valid_hash?(hash)
+      /^\$argon2i.{,113}/ =~ hash
+    end
+
     def self.verify_password(pass, hash, secret = nil)
-      # Supports argon2i and argon2id formats.
-      raise ArgonHashFail, "Invalid hash" unless
-        /^\$argon2i.{,113}/ =~ hash
+      raise ArgonHashFail, "Invalid hash" unless valid_hash?(hash)
 
       Argon2::Engine.argon2_verify(pass, hash, secret)
     end

data/lib/argon2/ffi_engine.rb

@@ -16,6 +16,14 @@ module Argon2
       :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
+
     # 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,
@@ -47,6 +55,20 @@ module Argon2
       result.unpack('H*').join
     end
 
+    def self.hash_argon2id(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.argon2id_hash_raw(t_cost, 1 << m_cost, 1, 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)
       result = ''
       secretlen = secret.nil? ? 0 : secret.bytesize

data/lib/argon2/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: argon2
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Technion
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-06 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi