argon2 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32024a89ef551d5e36ea1f33be4d8c9be3dd37bd
-  data.tar.gz: f1ea4e67f60ad84df06ddd60662b25a594537bda
+  metadata.gz: 94502c59e36f3822c681b2fe0810810618b609ce
+  data.tar.gz: cacc9e8da502df18f4ec2e5f868a8bd49359d6f9
 SHA512:
-  metadata.gz: 15e9b77c5fd46fa4dfe2a81c5bb5272971167f41ff6a2091e0a619606e63e0ba9d6a55ff39efc6e7ca5f6bb2ead09f7d1965a1095c88cb0b1d25c814b8cea582
-  data.tar.gz: af39dbc7405bcaf1d9860a3f4b4cd111ecf27e39575c61de757cc668e1eb000d874a17d66d7fa361077676f1212908e6db11270f68c259012a03ce4000ec9bdd
+  metadata.gz: fd0db288ae3e11d110bc384982520d021b81d63e617bab5b952c4f112f0d6a384a299c358236dce001c05b45629871b1bfab79935c7ad5829c9a4a557cf9764f
+  data.tar.gz: 25ba334f4a68f15b594970416188e6cc52d713aadfa8663b895875ba6ce43720305aa270bf915f53505db0e70f43db1ab2baaa357df4dd361a0d5722b8b02a5c

data/ext/argon2_wrap/argon_wrap.c

@@ -33,9 +33,9 @@ static int wrap_compare(const uint8_t *b1, const uint8_t *b2, size_t len) {
     return (int)((1 & ((d - 1) >> 8)) - 1);
 }
 
-unsigned int argon2_wrap(char *out, const char *pwd, size_t pwd_length,
+int argon2_wrap_version(char *out, const char *pwd, size_t pwd_length,
         uint8_t *salt,  uint32_t saltlen, uint32_t t_cost, uint32_t m_cost, 
-        uint32_t lanes, uint8_t *secret, size_t secretlen)
+        uint32_t lanes, uint8_t *secret, size_t secretlen, uint32_t version)
 {
     uint8_t hash[OUT_LEN];
     argon2_context context;
@@ -65,7 +65,7 @@ unsigned int argon2_wrap(char *out, const char *pwd, size_t pwd_length,
     context.allocate_cbk = NULL;
     context.free_cbk = NULL;
     context.flags = 0;
-    context.version = ARGON2_VERSION_13;
+    context.version = version;
 
     int result = argon2i_ctx(&context);
     if (result != ARGON2_OK)
@@ -75,6 +75,17 @@ unsigned int argon2_wrap(char *out, const char *pwd, size_t pwd_length,
     return ARGON2_OK;
 }
  
+/* Since all new hashes will use latest version, this wraps the 
+   * function including the version
+   */
+int argon2_wrap(char *out, const char *pwd, size_t pwd_length,
+        uint8_t *salt,  uint32_t saltlen, uint32_t t_cost, uint32_t m_cost, 
+        uint32_t lanes, uint8_t *secret, size_t secretlen)
+{
+    return argon2_wrap_version(out, pwd, pwd_length, salt, saltlen,
+            t_cost, m_cost, lanes, secret, secretlen, ARGON2_VERSION_13);
+}
+
 int wrap_argon2_verify(const char *encoded, const char *pwd,
     const size_t pwdlen,
     uint8_t *secret, size_t secretlen)
@@ -111,8 +122,9 @@ int wrap_argon2_verify(const char *encoded, const char *pwd,
         return ARGON2_DECODING_FAIL;
     }
 
-    ret = argon2_wrap(out, pwd, pwdlen, ctx.salt, ctx.saltlen, ctx.t_cost, 
-           ctx.m_cost, ctx.lanes, secret, secretlen);
+    ret = argon2_wrap_version(out, pwd, pwdlen, ctx.salt, ctx.saltlen,
+            ctx.t_cost, ctx.m_cost, ctx.lanes, secret, secretlen,
+            ctx.version);
 
     free(ctx.salt);
 

data/ext/phc-winner-argon2/.gitattributes

@@ -1,5 +1,10 @@
+# Export ignore
 .gitattributes export-ignore
 .gitignore export-ignore
 .travis.yml export-ignore
 appveyor.yml export-ignore
 export.sh export-ignore
+latex/* export-ignore
+
+# Linguist documentation
+latex/* linguist-documentation

data/ext/phc-winner-argon2/latex/Makefile

@@ -0,0 +1,18 @@
+TEX = pdflatex
+BIB = bibtex
+
+PROJECT = argon2-specs
+
+.PHONY: all clean update
+
+all:
+	$(TEX) $(PROJECT).tex
+	$(BIB) $(PROJECT).aux
+	$(TEX) $(PROJECT).tex
+	$(TEX) $(PROJECT).tex
+
+clean:
+	rm -rf *.aux *.bbl *.blg *.log *.out *.pdf *.toc *~
+
+update:
+	mv $(PROJECT).pdf ./../$(PROJECT).pdf

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

@@ -72,6 +72,10 @@ int argon2_ctx(argon2_context *context, argon2_type type) {
     instance.threads = context->threads;
     instance.type = type;
 
+    if (instance.threads > instance.lanes) {
+        instance.threads = instance.lanes;
+    }
+
     /* 3. Initialization: Hashing inputs, allocating memory, filling first
      * blocks
      */
@@ -104,6 +108,14 @@ int argon2_hash(const uint32_t t_cost, const uint32_t m_cost,
     int result;
     uint8_t *out;
 
+    if (pwdlen > ARGON2_MAX_PWD_LENGTH) {
+        return ARGON2_PWD_TOO_LONG;
+    }
+
+    if (saltlen > ARGON2_MAX_SALT_LENGTH) {
+        return ARGON2_SALT_TOO_LONG;
+    }
+
     if (hashlen > ARGON2_MAX_OUTLEN) {
         return ARGON2_OUTPUT_TOO_LONG;
     }
@@ -245,6 +257,10 @@ int argon2_verify(const char *encoded, const void *pwd, const size_t pwdlen,
     size_t encoded_len;
     uint32_t max_field_len;
 
+    if (pwdlen > ARGON2_MAX_PWD_LENGTH) {
+        return ARGON2_PWD_TOO_LONG;
+    }
+
     if (encoded == NULL) {
         return ARGON2_DECODING_FAIL;
     }
@@ -268,7 +284,7 @@ int argon2_verify(const char *encoded, const void *pwd, const size_t pwdlen,
     }
 
     ctx.pwd = (uint8_t *)pwd;
-    ctx.pwdlen = pwdlen;
+    ctx.pwdlen = (uint32_t)pwdlen;
 
     ret = decode_string(&ctx, encoded, type);
     if (ret != ARGON2_OK) {

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

@@ -288,6 +288,19 @@ int decode_string(argon2_context *ctx, const char *str, argon2_type type) {
         (x) = dec_x;                                                           \
     } while ((void)0, 0)
 
+
+/* Decoding prefix into uint32_t decimal */
+#define DECIMAL_U32(x)                                                         \
+    do {                                                                       \
+        unsigned long dec_x;                                                   \
+        str = decode_decimal(str, &dec_x);                                     \
+        if (str == NULL || dec_x > UINT32_MAX) {                               \
+            return ARGON2_DECODING_FAIL;                                       \
+        }                                                                      \
+        (x) = (uint32_t)dec_x;                                                 \
+    } while ((void)0, 0)
+
+
 /* Decoding base64 into a binary buffer */
 #define BIN(buf, max_len, len)                                                 \
     do {                                                                       \
@@ -315,14 +328,14 @@ int decode_string(argon2_context *ctx, const char *str, argon2_type type) {
 
     /* Reading the version number if the default is suppressed */
     ctx->version = ARGON2_VERSION_10;
-    CC_opt("$v=", DECIMAL(ctx->version));
+    CC_opt("$v=", DECIMAL_U32(ctx->version));
 
     CC("$m=");
-    DECIMAL(ctx->m_cost);
+    DECIMAL_U32(ctx->m_cost);
     CC(",t=");
-    DECIMAL(ctx->t_cost);
+    DECIMAL_U32(ctx->t_cost);
     CC(",p=");
-    DECIMAL(ctx->lanes);
+    DECIMAL_U32(ctx->lanes);
     ctx->threads = ctx->lanes;
 
     CC("$");

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

@@ -20,13 +20,22 @@
 #include <stdlib.h>
 
 #include "argon2.h"
-#include "opt.h"
+#include "core.h"
 
 #include "blake2/blake2.h"
 #include "blake2/blamka-round-opt.h"
 
-void fill_block(__m128i *state, const block *ref_block, block *next_block,
-                int with_xor) {
+/*
+ * Function fills a new memory block and optionally XORs the old block over the new one.
+ * Memory must be initialized.
+ * @param state Pointer to the just produced block. Content will be updated(!)
+ * @param ref_block Pointer to the reference block
+ * @param next_block Pointer to the block to be XORed over. May coincide with @ref_block
+ * @param with_xor Whether to XOR into the new block (1) or just overwrite (0)
+ * @pre all block pointers must be valid
+ */
+static void fill_block(__m128i *state, const block *ref_block,
+                       block *next_block, int with_xor) {
     __m128i block_XY[ARGON2_OWORDS_IN_BLOCK];
     unsigned int i;
 

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

@@ -20,15 +20,24 @@
 #include <stdlib.h>
 
 #include "argon2.h"
-#include "ref.h"
+#include "core.h"
 
 #include "blake2/blamka-round-ref.h"
 #include "blake2/blake2-impl.h"
 #include "blake2/blake2.h"
 
 
-void fill_block(const block *prev_block, const block *ref_block,
-                block *next_block, int with_xor) {
+/*
+ * Function fills a new memory block and optionally XORs the old block over the new one.
+ * @next_block must be initialized.
+ * @param prev_block Pointer to the previous block
+ * @param ref_block Pointer to the reference block
+ * @param next_block Pointer to the block to be constructed
+ * @param with_xor Whether to XOR into the new block (1) or just overwrite (0)
+ * @pre all block pointers must be valid
+ */
+static void fill_block(const block *prev_block, const block *ref_block,
+                       block *next_block, int with_xor) {
     block blockR, block_tmp;
     unsigned i;
 

data/lib/argon2/ffi_engine.rb

@@ -22,7 +22,7 @@ module Argon2
     #    uint8_t *secret, uint32_t secretlen)
     attach_function :argon2_wrap, [
       :pointer, :pointer, :size_t, :pointer, :uint, :uint,
-      :uint, :uint, :pointer, :size_t], :uint, :blocking => true
+      :uint, :uint, :pointer, :size_t], :int, :blocking => true
 
     # int argon2i_verify(const char *encoded, const void *pwd,
     # const size_t pwdlen);

data/lib/argon2/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: argon2
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Technion
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-25 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -144,7 +144,6 @@ files:
 - 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
@@ -177,7 +176,8 @@ files:
 - 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/argon2-spec.tex
+- 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
@@ -200,9 +200,7 @@ files:
 - 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/run.c
 - ext/phc-winner-argon2/src/test.c
 - ext/phc-winner-argon2/src/thread.c

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

@@ -1,35 +0,0 @@
-/*
- * Argon2 reference source code package - reference C implementations
- *
- * Copyright 2015
- * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
- *
- * You may use this work under the terms of a Creative Commons CC0 1.0 
- * License/Waiver or the Apache Public License 2.0, at your option. The terms of
- * these licenses can be found at:
- *
- * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
- *
- * You should have received a copy of both of these licenses along with this
- * software. If not, they may be obtained at the above URLs.
- */
-
-#ifndef ARGON2_OPT_H
-#define ARGON2_OPT_H
-
-#include "core.h"
-#include <emmintrin.h>
-
-/*
- * Function fills a new memory block and optionally XORs the old block over the new one.
- * Memory must be initialized.
- * @param state Pointer to the just produced block. Content will be updated(!)
- * @param ref_block Pointer to the reference block
- * @param next_block Pointer to the block to be XORed over. May coincide with @ref_block
- * @param with_xor Whether to XOR into the new block (1) or just overwrite (0)
- * @pre all block pointers must be valid
- */
-void fill_block(__m128i *s, const block *ref_block, block *next_block, int with_xor);
-
-#endif /* ARGON2_OPT_H */

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

@@ -1,35 +0,0 @@
-/*
- * Argon2 reference source code package - reference C implementations
- *
- * Copyright 2015
- * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
- *
- * You may use this work under the terms of a Creative Commons CC0 1.0 
- * License/Waiver or the Apache Public License 2.0, at your option. The terms of
- * these licenses can be found at:
- *
- * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
- *
- * You should have received a copy of both of these licenses along with this
- * software. If not, they may be obtained at the above URLs.
- */
-
-#ifndef ARGON2_REF_H
-#define ARGON2_REF_H
-
-#include "core.h"
-
-/*
- * Function fills a new memory block and optionally XORs the old block over the new one.
- * @next_block must be initialized.
- * @param prev_block Pointer to the previous block
- * @param ref_block Pointer to the reference block
- * @param next_block Pointer to the block to be constructed
- * @param with_xor Whether to XOR into the new block (1) or just overwrite (0)
- * @pre all block pointers must be valid
- */
-void fill_block(const block *prev_block, const block *ref_block,
-                block *next_block, int with_xor);
-
-#endif /* ARGON2_REF_H */