From 4f8a093dcc347e830023e3d1e5a8c9060120e573 Mon Sep 17 00:00:00 2001 From: Hugues Joyal Date: Sun, 18 Mar 2018 07:47:34 -0400 Subject: [PATCH 1/7] Add hashing configuration --- config/hashing.php | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/config/hashing.php b/config/hashing.php index f929cf0c..6156519b 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -17,4 +17,43 @@ 'driver' => 'bcrypt', + /* + |-------------------------------------------------------------------------- + | bcrypt options + |-------------------------------------------------------------------------- + | + | We could define the number of rounds the bcrypt algo will be using. + | + | The two digit cost parameter is the base-2 logarithm of the iteration + | count for the underlying Blowfish-based hashing algorithmeter and must + | be in range 04-31, values outside this range will cause crypt() to fail + | + | Default: 10 + */ + 'bcrypt' => [ + 'rounds' => 10 + ], + + /* + |-------------------------------------------------------------------------- + | argon options + |-------------------------------------------------------------------------- + | + | These settings could be adjusted depending on your hardware. + | + | time: Maximum amount of time it may take to compute the Argon2 hash. + | (default: 2) + | + | memory: Maximum memory (in bytes) that may be used to compute the Argon2 hash + | (default : 1024) + | + | threads: Number of threads to use for computing the Argon2 hash + | (default : 2) + | + */ + 'argon' => [ + 'time' => 2, + 'memory' => 1024, + 'threads' => 2 + ] ]; From 010d7138984bbc77a10eb1bdb2206be6e3abd1d2 Mon Sep 17 00:00:00 2001 From: Hugues Joyal Date: Sun, 18 Mar 2018 07:50:27 -0400 Subject: [PATCH 2/7] style-ci fix --- config/hashing.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/hashing.php b/config/hashing.php index 6156519b..f31f4c2a 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -31,7 +31,7 @@ | Default: 10 */ 'bcrypt' => [ - 'rounds' => 10 + 'rounds' => 10, ], /* @@ -54,6 +54,6 @@ 'argon' => [ 'time' => 2, 'memory' => 1024, - 'threads' => 2 - ] + 'threads' => 2, + ], ]; From 18701f51eab923cf53f1e3dd2cf22b7aa5700109 Mon Sep 17 00:00:00 2001 From: Hugues Joyal Date: Sun, 18 Mar 2018 08:38:20 -0400 Subject: [PATCH 3/7] New line formating --- config/hashing.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/hashing.php b/config/hashing.php index f31f4c2a..6cf05673 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -30,6 +30,7 @@ | | Default: 10 */ + 'bcrypt' => [ 'rounds' => 10, ], @@ -51,6 +52,7 @@ | (default : 2) | */ + 'argon' => [ 'time' => 2, 'memory' => 1024, From af91d97b68d903fd08ac4cce26c0318c407185d2 Mon Sep 17 00:00:00 2001 From: Hugues Joyal Date: Sun, 18 Mar 2018 08:59:04 -0400 Subject: [PATCH 4/7] better comment formating --- config/hashing.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/config/hashing.php b/config/hashing.php index 6cf05673..d470eb40 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -24,11 +24,11 @@ | | We could define the number of rounds the bcrypt algo will be using. | - | The two digit cost parameter is the base-2 logarithm of the iteration - | count for the underlying Blowfish-based hashing algorithmeter and must - | be in range 04-31, values outside this range will cause crypt() to fail - | - | Default: 10 + | rounds: The two digit cost parameter is the base-2 logarithm of the + | iteration count for the underlying Blowfish-based hashing + | algorithmeter and must be in range 04-31, values outside this + | range will cause crypt() to fail. + | (default: 10) */ 'bcrypt' => [ @@ -42,14 +42,15 @@ | | These settings could be adjusted depending on your hardware. | - | time: Maximum amount of time it may take to compute the Argon2 hash. - | (default: 2) + | time: Maximum amount of time it may take to compute the Argon2 hash. + | (default: 2) | - | memory: Maximum memory (in bytes) that may be used to compute the Argon2 hash - | (default : 1024) + | memory: Maximum memory (in bytes) that may be used to compute the Argon2 + | hash. + | (default : 1024) | - | threads: Number of threads to use for computing the Argon2 hash - | (default : 2) + | threads: Number of threads to use for computing the Argon2 hash. + | (default : 2) | */ From 7259889fcd6284065a2f010f583c354f878bf9b8 Mon Sep 17 00:00:00 2001 From: Hugues Joyal Date: Mon, 19 Mar 2018 13:29:20 -0400 Subject: [PATCH 5/7] missing newline --- config/hashing.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/hashing.php b/config/hashing.php index d470eb40..8005524a 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -59,4 +59,5 @@ 'memory' => 1024, 'threads' => 2, ], + ]; From d79e7ccb8b26d5ff77582f700fd83195b5e8184a Mon Sep 17 00:00:00 2001 From: Hugues Joyal Date: Mon, 19 Mar 2018 15:15:25 -0400 Subject: [PATCH 6/7] fix styling --- config/hashing.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/hashing.php b/config/hashing.php index 8005524a..581b2acc 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -45,8 +45,8 @@ | time: Maximum amount of time it may take to compute the Argon2 hash. | (default: 2) | - | memory: Maximum memory (in bytes) that may be used to compute the Argon2 - | hash. + | memory: Maximum memory (in bytes) that may be used to compute the + | Argon2 hash. | (default : 1024) | | threads: Number of threads to use for computing the Argon2 hash. From f33dc10bed088b40672ad2960fa11ac258bfaad6 Mon Sep 17 00:00:00 2001 From: Hugues Joyal Date: Mon, 19 Mar 2018 15:26:46 -0400 Subject: [PATCH 7/7] gammar --- config/hashing.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/hashing.php b/config/hashing.php index 581b2acc..92ade748 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -22,7 +22,7 @@ | bcrypt options |-------------------------------------------------------------------------- | - | We could define the number of rounds the bcrypt algo will be using. + | Here you can define the number of rounds the bcrypt algo will be using. | | rounds: The two digit cost parameter is the base-2 logarithm of the | iteration count for the underlying Blowfish-based hashing @@ -40,7 +40,7 @@ | argon options |-------------------------------------------------------------------------- | - | These settings could be adjusted depending on your hardware. + | These settings can be adjusted depending on your hardware. | | time: Maximum amount of time it may take to compute the Argon2 hash. | (default: 2)