argon2 0.0.1 → 0.0.2

data/ext/phc-winner-argon2/src/thread.c

@@ -0,0 +1,36 @@
+#include "thread.h"
+#if defined(_WIN32)
+#include <Windows.h>
+#endif
+
+int argon2_thread_create(argon2_thread_handle_t *handle,
+                         argon2_thread_func_t func, void *args) {
+    if (NULL == handle || func == NULL) {
+        return -1;
+    }
+#if defined(_WIN32)
+    *handle = _beginthreadex(NULL, 0, func, args, 0, NULL);
+    return *handle != 0 ? 0 : -1;
+#else
+    return pthread_create(handle, NULL, func, args);
+#endif
+}
+
+int argon2_thread_join(argon2_thread_handle_t handle) {
+#if defined(_WIN32)
+    if (WaitForSingleObject((HANDLE)handle, INFINITE) == WAIT_OBJECT_0) {
+        return CloseHandle((HANDLE)handle) != 0 ? 0 : -1;
+    }
+    return -1;
+#else
+    return pthread_join(handle, NULL);
+#endif
+}
+
+void argon2_thread_exit(void) {
+#if defined(_WIN32)
+    _endthreadex(0);
+#else
+    pthread_exit(NULL);
+#endif
+}

data/ext/phc-winner-argon2/src/thread.h

@@ -0,0 +1,46 @@
+#ifndef ARGON2_THREAD_H
+#define ARGON2_THREAD_H
+/*
+        Here we implement an abstraction layer for the simpĺe requirements
+        of the Argon2 code. We only require 3 primitives---thread creation,
+        joining, and termination---so full emulation of the pthreads API
+        is unwarranted. Currently we wrap pthreads and Win32 threads.
+
+        The API defines 2 types: the function pointer type,
+   argon2_thread_func_t,
+        and the type of the thread handle---argon2_thread_handle_t.
+*/
+#if defined(_WIN32)
+#include <process.h>
+typedef unsigned(__stdcall *argon2_thread_func_t)(void *);
+typedef uintptr_t argon2_thread_handle_t;
+#else
+#include <pthread.h>
+typedef void *(*argon2_thread_func_t)(void *);
+typedef pthread_t argon2_thread_handle_t;
+#endif
+
+/* Creates a thread
+ * @param handle pointer to a thread handle, which is the output of this
+ * function. Must not be NULL.
+ * @param func A function pointer for the thread's entry point. Must not be
+ * NULL.
+ * @param args Pointer that is passed as an argument to @func. May be NULL.
+ * @return 0 if @handle and @func are valid pointers and a thread is successfuly
+ * created.
+ */
+int argon2_thread_create(argon2_thread_handle_t *handle,
+                         argon2_thread_func_t func, void *args);
+
+/* Waits for a thread to terminate
+ * @param handle Handle to a thread created with argon2_thread_create.
+ * @return 0 if @handle is a valid handle, and joining completed successfully.
+*/
+int argon2_thread_join(argon2_thread_handle_t handle);
+
+/* Terminate the current thread. Must be run inside a thread created by
+ * argon2_thread_create.
+*/
+void argon2_thread_exit(void);
+
+#endif

data/lib/argon2.rb

@@ -1,38 +1,21 @@
-require "argon2/version"
-require 'ffi'
+require 'argon2/constants'
+require 'argon2/ffi_engine'
+require 'argon2/version'
+require 'argon2/errors'
+require 'argon2/engine.rb'
 
 module Argon2
-  module Ext
-    extend FFI::Library
-    ffi_lib './ext/phc-winner-argon2/libargon2.so'
-#/**
-# * Function to hash the inputs in the memory-hard fashion (uses Argon2i)
-# * @param  out  Pointer to the memory where the hash digest will be written
-# * @param  outlen Digest length in bytes
-# * @param  in Pointer to the input (password)
-# * @param  inlen Input length in bytes
-# * @param  salt Pointer to the salt
-# * @param  saltlen Salt length in bytes
-# * @pre    @a out must have at least @a outlen bytes allocated
-# * @pre    @a in must be at least @inlen bytes long
-# * @pre    @a saltlen must be at least @saltlen bytes long
-# * @return Zero if successful, 1 otherwise.
-# */
-#int hash_argon2i(void *out, size_t outlen, const void *in, size_t inlen,
-#                 const void *salt, size_t saltlen, unsigned int t_cost,
-#                 unsigned int m_cost);
-
-    attach_function :hash_argon2i, [:pointer, :size_t, :pointer, :size_t, 
-   :pointer, :size_t, :uint, :uint ], :int, :blocking => true
-  end
+  class Password
+    def initialize(options = {})
+      #TODO: Verify inputs
+      @t_cost = options[:t_cost] || 2
+      @m_cost = options[:m_cost] || 16
+      @salt = options[:salt_do_not_supply] || Engine.saltgen
+    end
 
-  def Argon2.hash_argon2i(password, salt)
-    result = ''
-    FFI::MemoryPointer.new(:char, 32) do |buffer|
-      ret = Ext.hash_argon2i(buffer, 32, password, password.length, salt, salt.length, 2, (1<<16))
-      fail "Hash failed" unless ret == 0
-      result = buffer.read_string(32)
+    def hash(pass)
+      Argon2::Engine.hash_argon2i_encode(
+              pass, @salt, @t_cost, @m_cost)
     end
-     result.unpack('H*').join
   end
 end

data/lib/argon2/constants.rb

@@ -0,0 +1,6 @@
+module Argon2
+  module Constants
+    SALT_LEN = 16
+    OUT_LEN = 32 #Binary, unencoded output
+  end
+end

data/lib/argon2/engine.rb

@@ -0,0 +1,10 @@
+require 'securerandom'
+
+module Argon2
+  class Engine
+    def self.saltgen
+      SecureRandom.random_bytes(Argon2::Constants::SALT_LEN)
+    end
+  end
+end
+

data/lib/argon2/errors.rb

@@ -0,0 +1,36 @@
+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'
+    ]
+end

data/lib/argon2/ffi_engine.rb

@@ -0,0 +1,47 @@
+require 'ffi'
+require 'ffi-compiler/loader'
+
+module Argon2
+  module Ext
+    extend FFI::Library
+     ffi_lib FFI::Compiler::Loader.find('argon2_wrap')
+#int hash_argon2i(void *out, size_t outlen, const void *in, size_t inlen,
+#                 const void *salt, size_t saltlen, unsigned int t_cost,
+#                 unsigned int m_cost);
+
+   attach_function :hash_argon2i, [:pointer, :size_t, :pointer, :size_t, 
+   :pointer, :size_t, :uint, :uint ], :int, :blocking => true
+
+#void argon2_wrap(uint8_t *out, char *pwd, uint8_t *salt, uint32_t t_cost,
+#        uint32_t m_cost, uint32_t lanes);
+    attach_function :argon2_wrap, [:pointer, :pointer, :pointer, :uint, :uint, :uint], :uint, :blocking => true
+
+  end
+
+  class Engine
+    # The engine class shields users from the FFI interface.
+    # It is generally not advised to directly use this class.
+    def self.hash_argon2i(password, salt, t_cost, m_cost)
+      result = ''
+      FFI::MemoryPointer.new(:char, Constants::OUT_LEN) do |buffer|
+        ret = Ext.hash_argon2i(buffer, Constants::OUT_LEN, password, password.length, salt, salt.length, t_cost, (1<<m_cost))
+        raise ArgonHashFail.new(ERRORS[ret]) unless ret == 0
+        result = buffer.read_string(Constants::OUT_LEN)
+      end
+       result.unpack('H*').join
+    end
+
+    def self.hash_argon2i_encode(password, salt, t_cost, m_cost)
+      result = ''
+      if salt.length != Constants::SALT_LEN
+        raise ArgonHashFail.new("Invalid salt size") 
+      end
+      FFI::MemoryPointer.new(:char, 300) do |buffer|
+        ret = Ext.argon2_wrap(buffer, password, salt, t_cost, (1<<m_cost), 1)
+        raise ArgonHashFail.new(ERRORS[ret]) unless ret == 0
+        result = buffer.read_string(300)
+      end
+      result.gsub("\0", '')
+    end
+  end
+end

data/lib/argon2/version.rb

@@ -1,4 +1,4 @@
 module Argon2
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end
 

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: argon2
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Technion
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,21 +70,22 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 description: Not remotely finished Argon2 binding
 email:
 - technion@lolware.net
 executables: []
-extensions: []
+extensions:
+- ext/argon2_wrap/extconf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -83,7 +98,56 @@ files:
 - argon2.gemspec
 - bin/console
 - bin/setup
+- ext/argon2_wrap/Makefile
+- 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/.gitignore
+- 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/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/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/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/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
+- lib/argon2/errors.rb
+- lib/argon2/ffi_engine.rb
 - lib/argon2/version.rb
 homepage: https://github.com/technion/ruby-argon2
 licenses: