argon2 0.1.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4946951c753bf3429884bd17d5ab2f20a5b03ed
-  data.tar.gz: d03d063894871e688f6ec7550799760e81b79200
+  metadata.gz: 1ce063f0a857005f2e3c1e33d0313cf6c2dbe7a4
+  data.tar.gz: c080ce2b9067066a59dac49655d6e43582efcc1d
 SHA512:
-  metadata.gz: 635d587da7ae973027dac2527cc447cb12e320fe8fb11d9b58c43c59edf758a19ee74dd51e1fd481f696d71ea2b02f3d1f7b624da3b513cc20446226ea5d3112
-  data.tar.gz: 886f3914110033c14cc0d7ce17c3bffba83e1f58620771e3eb9e1e9d7498d350d5a2bcf847e3aa3849dbceaa1d8c141472575167e573e44c3a6aaf2ee79faf6a
+  metadata.gz: 7742082e8db62329c94941512676a40536145ce52b7e2b4d3ba9f7a2cd25fe06eadb35811bb2eb9493aae67f4ae4f663a49f1158fdbea42f34ad7420d9b94321
+  data.tar.gz: b2ef7db8cbcbd54f411481995fb53ba76c15810b3c816cae5dfd664ab832279609f2a194951d5c882ab8b2a44755a63bc14b902e1c6b6f20d77dcb6d87c4490a

data/.rubocop.yml

@@ -1,11 +1,14 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
+#. `rubocop --auto-gen-config`
 Metrics/AbcSize:
-  Max: 16
+  Max: 18
 Metrics/CyclomaticComplexity:
   Enabled: false
 Metrics/PerceivedComplexity:
   Enabled: false
+Style/MutableConstant:
+  Exclude:
+    - 'test/key_test.rb'
 
 Metrics/LineLength:
   Max: 160
@@ -48,13 +51,6 @@ Style/IndentArray:
 Style/LeadingCommentSpace:
   Exclude:
     - 'ext/argon2_wrap/extconf.rb'
-    - 'lib/argon2.rb'
-    - 'lib/argon2/constants.rb'
-    - 'lib/argon2/ffi_engine.rb'
-    - 'test/api_test.rb'
-    - 'test/low_level_test.rb'
-    - 'test/util.rb'
-    - 'test/util_lib.rb'
 
 Style/SignalException:
   Enabled: false

data/.travis.yml

@@ -8,4 +8,3 @@ install: bin/setup
 script:
   - cd ext/argon2_wrap/ && make test && cd ../..
   - CODECLIMATE_REPO_TOKEN=28e3d5d04f4ec87d0899784e6aecc13d7787343b2634b3c94fc1216993d443c2 rake test
-  - rake rubocop

data/CONTRIBUTING.md

@@ -0,0 +1,12 @@
+# Contribution Guidelines
+
+Any form of contribution is accepted, however, please note the following.
+
+## Please note noncompliant issues or PRs will be closed without discussion
+
+- Note the [Design Goals](https://github.com/technion/ruby-argon2/blob/master/README.md#design) documented for the project and work within them
+- Commits should be squashed to a single commit per pull. An exception is that a test suite add or change, followed by code update, may be presented as two commits in one pull
+- Each individual commit should have a descriptive commit message. "Update <file>" is not suitable
+- This is a coding project. Your political goals are not relevant
+- Any complex or large code will probably require a test
+- If an issue is felt to be a security concern, please contact me privately on: technion@lolware.net

data/Changelog.md

@@ -1,17 +1,16 @@
-v0.1.0: 2015-11-10
-- Initial release
+## v1.0.0: 2015-03-07
+- API change - 'new' becomes 'create'
+- Version 1.3 of the Argon2 algorithm pulled in
 
-v0.1.1: 2015-11-26
-- Use $CC instead of hardcoded gcc. Allows builds on more systems.
+## v0.1.3: 2015-11-30
+- Fix bug on verifying binary password
 
-v0.1.2: 2015-11-30
+## v0.1.2: 2015-11-30
 - Introduce handling of binary input, including NULL containing UTF-16
 - Implement property testing variable TEST_CHECKS
 
-v0.1.3: 2015-11-30
-- Fix bug on verifying binary password
-
-v0.1.4: 2016-01-11
-- Improved OSX compatibility
-- Fix broken m_cost check
+## v0.1.1: 2015-11-26
+- Use $CC instead of hardcoded gcc. Allows builds on more systems.
 
+## v0.1.0: 2015-11-10
+- Initial release

data/README.md

@@ -2,7 +2,6 @@
 
 This Ruby Gem provides FFI bindings, and a simplified interface, to the Argon2 algorithm. [Argon2](https://github.com/P-H-C/phc-winner-argon2) is the official winner of the Password Hashing Competition, a several year project to identify a successor to bcrypt/PBKDF/scrypt methods of securely storing passwords. This is an independant project and not official from the PHC team.
 
-This project is now considered stable.
 
 [![Build Status](https://travis-ci.org/technion/ruby-argon2.svg?branch=master)](https://travis-ci.org/technion/ruby-argon2)
 [![Code Climate](https://codeclimate.com/github/technion/ruby-argon2/badges/gpa.svg)](https://codeclimate.com/github/technion/ruby-argon2)
@@ -15,7 +14,7 @@ This project has several key tenants to its design:
 * The reference Argon2 implementation is to be used "unaltered". To ensure compliance wit this goal, and encourage regular updates from upstream, this is implemented as a git submodule, and is intended to stay that way.
 * The FFI interface is kept as slim as possible, with wrapper classes preferred to implementing context structs in FFI
 * Security and maintainability take top priority. This can have an impact on platform support. A PR that contains platform specific code paths is unlikely to be accepted.
-* Tested platforms are MRI Ruby 2.2 and JRuby 9000. No assertions are made on other platforms.
+* Tested platforms are MRI Ruby 2.2, 2.3 and JRuby 9000. No assertions are made on other platforms.
 * Errors from the C interface are raised as Exceptions. There are a lot of exception classes, but they tend to relate to things like very broken input, and code bugs. Calls to this library should generally not require a rescue.
 * Test suits should aim for 100% code coverage.
 * Default work values should not be considered constants. I will increase them from time to time.
@@ -34,22 +33,22 @@ To generate a hash using specific time and memory cost:
 
 ```ruby
 hasher = Argon2::Password.new(t_cost: 2, m_cost: 16)
-hasher.hash("password")
-     => "$argon2i$m=65536,t=2,p=1$mLa9JT3Y9P2XhB5Mtuj+yQ$rojObVNKe/ehgd9SWQBB+8nJ8L34Aj3Kiz+aNrWvrx4"
+hasher.create("password")
+     => "$argon2i$m=65536,t=2,p=1$6ua7khmHLZwIHnjV2A6nSw$Kak8CTBN/yUYAESSxJKO/jfWH+40c0JQtc7EXhLm0SU"
 ```
 
 To utilise default costs:
 
 ```ruby
 hasher = Argon2::Password.new
-hasher.hash("password")
+hasher.create("password")
 ```
 
 Alternatively, use this shotcut:
 
 ```ruby
-Argon2::Password.hash("password")
-     => "$argon2i$m=65536,t=2,p=1$AZwVlHIbgRC7yQhkPKa4tA$F5eM2Zzt4GhIVnR8SNOh3ysyMvGxAO6omsw8kzjbcs4"
+Argon2::Password.create("password")
+     => "$argon2i$m=65536,t=2,p=1$VYXqHZe+5OpNzhbU0LvMZA$XGmkk9tzjYtjatmS5VvuovLvUCfijevwgDzvIkOF+bs"
 ```
 
 You can then use this function to verify a password against a given hash. Will return either true or false.
@@ -63,13 +62,22 @@ Argon2 supports an optional key value. This should be stored securely on your se
 ```ruby
 KEY = "A key"
 argon = Argon2::Password.new(t_cost: 2, m_cost: 16, secret: KEY)
-myhash = argon.hash("A password")
+myhash = argon.create("A password")
 Argon2::Password.verify_password("A password", myhash, KEY)
 ```
 
-## OSX 'El Capitan' Issues
+## Important notes regarding version 1.0 upgrade
+Version 1.0.0 included a major version bump over 0.1.4 due to several breaking changes. The first of these was an API change, which you can read the background on [here](https://github.com/technion/ruby-argon2/issues/9).
 
-The default installation workflow has caused issues with a number of gems under this update. There is some excellent documentation on the issue and some workarounds in the [Jekyll Documentation](http://jekyllrb.com/docs/troubleshooting/#jekyll-amp-mac-os-x-1011).
+The second of these is that the reference Argon2 implementation introduced an algorithm change, which produces a hash which is not backwards compatible. This is documented on [this PR on the C library](https://github.com/P-H-C/phc-winner-argon2/pull/115). This was a regrettable requirement to address a security concern in the algorithm itself.
+
+As the crypt format did not change, there is no simple way to identify an original, or improved hash. To support existing users, I'll be maintaining the 0.1.x branch with patches and bugfixes for the immediate future.
+
+## Platform Issues
+
+The default installation workflow has caused issues with a number of gems under the latest OSX. There is some excellent documentation on the issue and some workarounds in the [Jekyll Documentation](http://jekyllrb.com/docs/troubleshooting/#jekyll-amp-mac-os-x-1011). With this in mind, OSX is a fully supported OS.
+
+Windows is not. Nobody anywhere has the resources to support Ruby FFI code on Windows.
 
 ## RubyDocs documentation
 
@@ -78,9 +86,11 @@ The default installation workflow has caused issues with a number of gems under
 ## FAQ
 ### Don't roll your own crypto!
 
-This gets its own section because someone will raise it. I did not invent or alter this algorithm, or implement it directly.
+This gets its own section because someone will raise it. I did not invent or alter this algorithm, or implement it directly. These bindings were written following [considerable involvement with the C reference](https://github.com/P-H-C/phc-winner-argon2/commits/master?author=technion), and a strong focus has been made on following the intent of the algorithm.
+
+It is strongly advised to avoid implementations that utilise off-spec methods of introducing salts, invent imaginary parameters, or which use the word "encryption" in describing the password hashing process
 
-### "Secure wipe is useless"
+### Secure wipe is useless
 
 Although the low level C contains support for "secure memory wipe", any code hitting that layer has copied your password to a dozen places in memory. It should be assumed that such functionality does not exist.
 
@@ -94,9 +104,8 @@ If you are providing your own salt, you are probably using it wrong. The design
 
 ## Contributing
 
-Any form of contribution is appreciated, however, please note the design goals above and work within them.
+Any form of contribution is appreciated, however, please review [CONTRIBUTING.md](CONTRIBUTING.md).
 
-If an issue is felt to be a security concern, please contact me privately on: technion@lolware.net. If required, you may encrypt with [my GPG key](https://lolware.net/technion-GPG-KEY).
 
 ## Building locally/Tests
 

data/ext/argon2_wrap/Makefile

@@ -12,16 +12,18 @@ DIST_SRC = ../phc-winner-argon2/src
 SRC = $(DIST_SRC)/argon2.c $(DIST_SRC)/core.c $(DIST_SRC)/blake2/blake2b.c $(DIST_SRC)/thread.c $(DIST_SRC)/encoding.c argon_wrap.c
 OBJ = $(SRC:.c=.o)
 
-CFLAGS = -std=c89 -pthread -O3 -Wall -g
+CFLAGS = -pthread -O3 -Wall -g -I../phc-winner-argon2/include -I../phc-winner-argon2/src
 
-OPT=TRUE
-ifeq ($(OPT), TRUE)
+OPTTEST := $(shell $(CC) -Iinclude -Isrc -march=native src/opt.c -c 2>/dev/null; echo $$?)
+# Detect compatible platform
+ifneq ($(OPTTEST), 0)
+	SRC += $(DIST_SRC)/ref.c
+else
 	CFLAGS += -march=native
 	SRC += $(DIST_SRC)/opt.c
-else
-	SRC += $(DIST_SRC)/ref.c
 endif
 
+
 BUILD_PATH := $(shell pwd)
 KERNEL_NAME := $(shell uname -s)
 
@@ -56,7 +58,7 @@ libs: $(SRC)
 #Deliberately avoiding the CFLAGS for our test cases - disable optimise and
 #C89
 test: $(SRC) test.c
-	clang -pthread -O3 -fsanitize=address -fsanitize=undefined -Wall -g $^ -o tests
+	clang -pthread -O3 -fsanitize=address -fsanitize=undefined -Wall -g $^ -o tests $(CFLAGS)
 	./tests
 
 clean:

data/ext/argon2_wrap/argon_wrap.c

@@ -10,9 +10,9 @@
 #include <string.h>
 #include <time.h>
 
-#include "../phc-winner-argon2/src/argon2.h"
-#include "../phc-winner-argon2/src/core.h"
-#include "../phc-winner-argon2/src/encoding.h"
+#include "argon2.h"
+#include "core.h"
+#include "encoding.h"
 
 #define T_COST_DEF 3
 #define LOG_M_COST_DEF 12 /* 2^12 = 4 MiB */
@@ -22,7 +22,16 @@
 #define SALT_LEN 16
 #define ENCODE_LEN 108
 
-int argon2_compare(const uint8_t *b1, const uint8_t *b2, size_t len);
+/* Workaround for https://github.com/technion/ruby-argon2/issues/8. Hopefully temporary */
+static int wrap_compare(const uint8_t *b1, const uint8_t *b2, size_t len) {
+    size_t i;
+    uint8_t d = 0U;
+
+    for (i = 0U; i < len; i++) {
+        d |= b1[i] ^ b2[i];
+    }
+    return (int)((1 & ((d - 1) >> 8)) - 1);
+}
 
 unsigned int argon2_wrap(char *out, const char *pwd, size_t pwd_length,
         uint8_t *salt, uint32_t t_cost, uint32_t m_cost, uint32_t lanes, 
@@ -57,7 +66,7 @@ unsigned int argon2_wrap(char *out, const char *pwd, size_t pwd_length,
     context.free_cbk = NULL;
     context.flags = 0;
 
-    int result = argon2i(&context);
+    int result = argon2i_ctx(&context);
     if (result != ARGON2_OK)
         return result;
 
@@ -73,11 +82,13 @@ int wrap_argon2_verify(const char *encoded, const char *pwd,
     int ret;
     char out[ENCODE_LEN];
     memset(&ctx, 0, sizeof(argon2_context));
-
-    /* max values, to be updated in decode_string */
-    ctx.adlen = 512;
-    ctx.saltlen = 512;
-    ctx.outlen = 512;
+    size_t encoded_len;
+    
+    encoded_len = strlen(encoded);
+    /* larger than max possible values */
+    ctx.adlen = encoded_len;
+    ctx.saltlen = encoded_len;
+    ctx.outlen = encoded_len;
 
     ctx.ad = malloc(ctx.adlen);
     ctx.salt = malloc(ctx.saltlen);
@@ -89,7 +100,7 @@ int wrap_argon2_verify(const char *encoded, const char *pwd,
         return ARGON2_MEMORY_ALLOCATION_ERROR;
     }
 
-    if(decode_string(&ctx, encoded, Argon2_i) != 1) {
+    if(decode_string(&ctx, encoded, Argon2_i) != ARGON2_OK) {
         free(ctx.ad);
         free(ctx.salt);
         free(ctx.out);
@@ -102,7 +113,7 @@ int wrap_argon2_verify(const char *encoded, const char *pwd,
     free(ctx.ad);
     free(ctx.salt);
 
-    if (ret != ARGON2_OK || argon2_compare((uint8_t*)out, (uint8_t*)encoded, 
+    if (ret != ARGON2_OK || wrap_compare((uint8_t*)out, (uint8_t*)encoded, 
                 strlen(encoded))) {
         free(ctx.out);
         return ARGON2_DECODING_FAIL;

data/ext/argon2_wrap/test.c

@@ -10,7 +10,7 @@
 #include <time.h>
 #include <assert.h>
 
-#include "../phc-winner-argon2/src/argon2.h"
+#include "argon2.h"
 
 #define OUT_LEN 32
 #define SALT_LEN 16
@@ -48,7 +48,7 @@ int wrap_argon2_verify(const char *encoded, const char *pwd,
 int main()
 {
     unsigned char out[OUT_LEN];
-    unsigned char hex_out[OUT_LEN*2];
+    unsigned char hex_out[OUT_LEN*2 + 4]; /* Allow space for NULL byute */
     char out2[300];
     char *pwd = NULL;
     uint8_t salt[SALT_LEN];
@@ -58,24 +58,6 @@ int main()
     memcpy(salt, "somesalt", 8);
 
 
-    /* ./argon2 password somesalt -t 2 -m 16
-     *  Hash: 894af4ff2e2d26f3ce15f77a7e1c25db45b4e20439e9961772ba199caddb001e
-     * ./argon2 password somesalt -t 2 -m 20
-     * Hash: 58d4d929aeeafa40cc049f032035784fb085e8e0d0c5a51ea067341a93d6d286
-     * ./argon2 password somesalt -t 2 -m 18
-     * Hash: 55292398cce8fc78685e610d004ca9bda5c325a0a2e6285a0de5f816df139aa6
-     * ./argon2 password somesalt -t 2 -m 8
-     * Hash: e346b1e1aa7ca58c9bb862e223ba5604064398d4394e49e90972c6b54cef43ed
-     * ./argon2 password somesalt -t 1 -m 16
-     * Hash: b49199e4ecb0f6659e6947f945e391c940b17106e1d0b0a9888006c7f87a789b
-     * ./argon2 password somesalt -t 4 -m 16
-     * Hash: 72207b3312d79995fbe7b30664837ae1246f9a98e07eac34835ca3498e705f85
-     * ./argon2 differentpassword somesalt -t 2 -m 16 -p 1
-     * Hash: 8e286f605ed7383987a4aac25a28a04808593b6e17613bc31457146c4f3f4361
-     * ./argon2 password diffsalt -t 2 -m 16 -p 1
-     * Hash: 8f65b47d902fb2aee5e0b2bdc9041b249fc11f06f35551e0bee52716b41e8311
-     */
-
 #define RAWTEST(T, M, P, PWD, REF) \
     pwd = strdup(PWD); \
     assert(pwd); \
@@ -87,15 +69,14 @@ int main()
     free(pwd); \
     printf( "Ref test: %s: PASS\n", REF);
 
-    RAWTEST(2, 16, 1, "password", "894af4ff2e2d26f3ce15f77a7e1c25db45b4e20439e9961772ba199caddb001e");
-    RAWTEST(2, 20, 1, "password", "58d4d929aeeafa40cc049f032035784fb085e8e0d0c5a51ea067341a93d6d286");
-    RAWTEST(2, 18, 1, "password", "55292398cce8fc78685e610d004ca9bda5c325a0a2e6285a0de5f816df139aa6");
-    RAWTEST(2, 8, 1, "password", "e346b1e1aa7ca58c9bb862e223ba5604064398d4394e49e90972c6b54cef43ed");
-    RAWTEST(1, 16, 1, "password", "b49199e4ecb0f6659e6947f945e391c940b17106e1d0b0a9888006c7f87a789b");
-    RAWTEST(4, 16, 1, "password", "72207b3312d79995fbe7b30664837ae1246f9a98e07eac34835ca3498e705f85");
-    RAWTEST(2, 16, 1, "differentpassword", "8e286f605ed7383987a4aac25a28a04808593b6e17613bc31457146c4f3f4361");
+    RAWTEST(2, 16, 1, "password", "1c7eeef9e0e969b3024722fc864a1ca9f6ca20da73f9bf3f1731881beae2039e");
+    RAWTEST(2, 18, 1, "password", "5c6dfd2712110cf88f1426059b01d87f8210d5368da0e7ee68586e9d4af4954b");
+    RAWTEST(2, 8, 1, "password", "dfebf9d4eadd6859f4cc6a9bb20043fd9da7e1e36bdacdbb05ca569f463269f8");
+    RAWTEST(1, 16, 1, "password", "fabd1ddbd86a101d326ac2abe79660202b10192925d2fd2483085df94df0c91a");
+    RAWTEST(4, 16, 1, "password", "b3b4cb3d6e2c1cb1e7bffdb966ab3ceafae701d6b7789c3f1e6c6b22d82d99d5");
+    RAWTEST(2, 16, 1, "differentpassword", "b2db9d7c0d1288951aec4b6e1cd3835ea29a7da2ac13e6f48554a26b127146f9");
     memcpy(salt, "diffsalt", 8);
-    RAWTEST(2, 16, 1, "password", "8f65b47d902fb2aee5e0b2bdc9041b249fc11f06f35551e0bee52716b41e8311");
+    RAWTEST(2, 16, 1, "password", "bb6686865f2c1093f70f543c9535f807d5b42d5dc6d71f14a4a7a291913e05e0");
 
 
 #define WRAP_TEST(T, M, PWD, REF) \
@@ -106,25 +87,16 @@ int main()
     printf( "Ref test: %s: PASS\n", REF);
 
     memcpy(salt, "somesalt", 8);
-    /* echo password | ./argon2 somesalt -t 2 -m 16
-     * $argon2i$m=65536,t=2,p=1$c29tZXNhbHQAAAAAAAAAAA$iUr0/y4tJvPOFfd6fhwl20W04gQ56ZYXcroZnK3bAB4
-     */
     WRAP_TEST(2, 16, "password", 
-            "$argon2i$m=65536,t=2,p=1$c29tZXNhbHQAAAAAAAAAAA$iUr0/y4tJvPOFfd6fhwl20W04gQ56ZYXcroZnK3bAB4");
+            "$argon2i$m=65536,t=2,p=1$c29tZXNhbHQAAAAAAAAAAA$HH7u+eDpabMCRyL8hkocqfbKINpz+b8/FzGIG+riA54");
 
-    /* echo password | ./argon2 somesalt -t 2 -m 8
-     * $argon2i$m=256,t=2,p=1$c29tZXNhbHQAAAAAAAAAAA$40ax4ap8pYybuGLiI7pWBAZDmNQ5TknpCXLGtUzvQ+0
-     */
     WRAP_TEST(2, 8, "password", 
-            "$argon2i$m=256,t=2,p=1$c29tZXNhbHQAAAAAAAAAAA$40ax4ap8pYybuGLiI7pWBAZDmNQ5TknpCXLGtUzvQ+0");
+            "$argon2i$m=256,t=2,p=1$c29tZXNhbHQAAAAAAAAAAA$3+v51OrdaFn0zGqbsgBD/Z2n4eNr2s27BcpWn0Yyafg");
 
-    /* echo diffpassword | ./argon2 somesalt -t 2 -m 16
-     * $argon2i$m=65536,t=2,p=1$c29tZXNhbHQAAAAAAAAAAA$y/IeiuTydN/Sud4UzLqv6Spx8Eqree6FoP088X6WyW4
-     */
-    WRAP_TEST(2, 16, "diffpassword", 
-            "$argon2i$m=65536,t=2,p=1$c29tZXNhbHQAAAAAAAAAAA$y/IeiuTydN/Sud4UzLqv6Spx8Eqree6FoP088X6WyW4");
+    WRAP_TEST(2, 16, "differentpassword", 
+            "$argon2i$m=65536,t=2,p=1$c29tZXNhbHQAAAAAAAAAAA$studfA0SiJUa7EtuHNODXqKafaKsE+b0hVSiaxJxRvk");
 
-    ret = wrap_argon2_verify("$argon2i$m=65536,t=2,p=1$c29tZXNhbHQAAAAAAAAAAA$iUr0/y4tJvPOFfd6fhwl20W04gQ56ZYXcroZnK3bAB4", "password",
+    ret = wrap_argon2_verify("$argon2i$m=256,t=2,p=1$c29tZXNhbHQAAAAAAAAAAA$3+v51OrdaFn0zGqbsgBD/Z2n4eNr2s27BcpWn0Yyafg", "password",
             strlen("password"), NULL, 0);
     assert(ret == ARGON2_OK);
     printf("Verify OK test: PASS\n");

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

@@ -6,6 +6,10 @@ libargon2.dylib
 src/*.o
 src/blake2/*.o
 genkat
-test.c
 .idea
 *.pyc
+testcase
+*.gcda
+*.gcno
+*.gcov
+bench

data/ext/phc-winner-argon2/.travis.yml

@@ -0,0 +1,14 @@
+language: c
+
+compiler:
+  - clang
+  - gcc
+
+os:
+  - linux
+  - osx
+
+script: make && make testci
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

data/ext/phc-winner-argon2/Makefile

@@ -19,14 +19,17 @@ SRC_BENCH = src/bench.c
 SRC_GENKAT = src/genkat.c
 OBJ = $(SRC:.c=.o)
 
-CFLAGS = -std=c89 -pthread -O3 -Wall -g
+CFLAGS += -std=c89 -pthread -O3 -Wall -g -Iinclude -Isrc
+CI_CFLAGS := $(CFLAGS) -Werror=declaration-after-statement -D_FORTIFY_SOURCE=2 \
+				-Wextra -Wno-type-limits -Werror -coverage
 
-#OPT=TRUE
-ifeq ($(OPT), TRUE)
+OPTTEST := $(shell $(CC) -Iinclude -Isrc -march=native src/opt.c -c 2>/dev/null; echo $$?)
+# Detect compatible platform
+ifneq ($(OPTTEST), 0)
+	SRC += src/ref.c
+else
 	CFLAGS += -march=native
 	SRC += src/opt.c
-else
-	SRC += src/ref.c
 endif
 
 BUILD_PATH := $(shell pwd)
@@ -35,7 +38,8 @@ KERNEL_NAME := $(shell uname -s)
 LIB_NAME=argon2
 ifeq ($(KERNEL_NAME), Linux)
 	LIB_EXT := so
-	LIB_CFLAGS := -shared -fPIC
+	LIB_CFLAGS := -shared -fPIC -fvisibility=hidden -DA2_VISCTL=1
+	SO_LDFLAGS := -Wl,-soname,libargon2.so.0
 endif
 ifeq ($(KERNEL_NAME), NetBSD)
 	LIB_EXT := so
@@ -54,6 +58,12 @@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_NAME),OpenBSD FreeBSD))
 	LIB_CFLAGS := -shared -fPIC
 endif
 
+ifeq ($(KERNEL_NAME), Linux)
+ifeq ($(CC), clang)
+	CI_CFLAGS += -fsanitize=address -fsanitize=undefined
+endif
+endif
+
 LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
 LIB_ST := lib$(LIB_NAME).a
 
@@ -63,16 +73,16 @@ all: clean $(RUN) libs
 libs: $(LIB_SH) $(LIB_ST)
 
 $(RUN):	        $(SRC) $(SRC_RUN)
-		$(CC) $(CFLAGS) $^ -Isrc  -o $@
+		$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
 
 $(BENCH):       $(SRC) $(SRC_BENCH)
-		$(CC) $(CFLAGS) $^ -Isrc  -o $@
+		$(CC) $(CFLAGS) $^ -o $@
 
 $(GENKAT):      $(SRC) $(SRC_GENKAT)
-		$(CC) $(CFLAGS) $^ -Isrc  -o $@ -DGENKAT
+		$(CC) $(CFLAGS) $^ -o $@ -DGENKAT
 
 $(LIB_SH): 	$(SRC)
-		$(CC) $(CFLAGS) $(LIB_CFLAGS) $^ -Isrc -o $@
+		$(CC) $(CFLAGS) $(LIB_CFLAGS) $(LDFLAGS) $(SO_LDFLAGS) $^ -o $@
 
 $(LIB_ST): 	$(OBJ)
 		ar rcs $@ $^
@@ -80,6 +90,7 @@ $(LIB_ST): 	$(OBJ)
 clean:
 		rm -f $(RUN) $(BENCH) $(GENKAT)
 		rm -f $(LIB_SH) $(LIB_ST) kat-argon2* 
+		rm -f testcase
 		rm -rf *.dSYM
 		cd src/ && rm -f *.o
 		cd src/blake2/ && rm -f *.o
@@ -89,8 +100,18 @@ dist:
 		cd ..; \
 		tar -c --exclude='.??*' -z -f $(DIST)-`date "+%Y%m%d"`.tgz $(DIST)/*
 
-test:
+test:   $(SRC) src/test.c
+		$(CC) $(CFLAGS)  -Wextra -Wno-type-limits $^ -o testcase
 		@sh kats/test.sh
+		./testcase
+
+testci:   $(SRC) src/test.c
+		$(CC) $(CI_CFLAGS) $^ -o testcase
+		@sh kats/test.sh
+		./testcase
+
+.PHONY: test
 
 format:
-		clang-format -style="{BasedOnStyle: llvm, IndentWidth: 4}" -i src/*.c src/*.h src/blake2/*.c src/blake2/*.h
+		clang-format -style="{BasedOnStyle: llvm, IndentWidth: 4}" \
+			-i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h