From 4df6dd7a3dc534150d76ab69850efd3a5e2f816e Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 1 Oct 2018 22:25:36 +0200 Subject: [PATCH] Update hashing.php, add argon2id support --- Changelog | 1 + composer.lock | 72 ++++++++++++++++------------------------------ config/hashing.php | 35 +++++++++++++++++++--- 3 files changed, 56 insertions(+), 52 deletions(-) diff --git a/Changelog b/Changelog index db878c26c..0d11168de 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-10-01 DariusIII + * Chg: Update hashing.php, add argon2id support * Chg: Update orangehill/iseed to version 2.6 * Chg: Update extension regexes in NZB class * Fix: Fix wrong dates in Forking backfill functionality diff --git a/composer.lock b/composer.lock index 95e884868..73edc2f9c 100644 --- a/composer.lock +++ b/composer.lock @@ -321,8 +321,7 @@ "Gemfile.lock", "*.md" ] - }, - "time": "2016-06-06T17:37:52+00:00" + } }, { "name": "bower-asset/autosize", @@ -351,8 +350,7 @@ "form", "textarea", "ui" - ], - "time": "2017-05-19T15:36:30+00:00" + ] }, { "name": "bower-asset/bootstrap", @@ -401,8 +399,7 @@ "mobile-first", "responsive", "web" - ], - "time": "2016-07-25T15:51:55+00:00" + ] }, { "name": "bower-asset/bootstrap-3.x", @@ -451,8 +448,7 @@ "mobile-first", "responsive", "web" - ], - "time": "2016-07-25T15:51:55+00:00" + ] }, { "name": "bower-asset/bootstrap-datepicker", @@ -481,8 +477,7 @@ }, "license": [ "Apache-2.0" - ], - "time": "2016-08-05T09:50:13+00:00" + ] }, { "name": "bower-asset/bootstrap-hover-dropdown", @@ -512,8 +507,7 @@ "dropdowns", "hover", "twitter" - ], - "time": "2015-12-01T23:35:57+00:00" + ] }, { "name": "bower-asset/bootstrap-progressbar", @@ -547,8 +541,7 @@ }, "license": [ "MIT" - ], - "time": "2015-05-15T18:56:17+00:00" + ] }, { "name": "bower-asset/bootswatch", @@ -679,8 +672,7 @@ "modal", "popup", "ui" - ], - "time": "2016-05-10T22:21:33+00:00" + ] }, { "name": "bower-asset/datatables", @@ -795,8 +787,7 @@ "tests", "examples" ] - }, - "time": "2015-01-26T21:19:01+00:00" + } }, { "name": "bower-asset/flexboxgrid", @@ -832,8 +823,7 @@ "css", "flexbox", "grid" - ], - "time": "2016-08-14T16:43:18+00:00" + ] }, { "name": "bower-asset/font-awesome", @@ -878,8 +868,7 @@ "src", "build.xml" ] - }, - "time": "2015-07-20T20:04:00+00:00" + } }, { "name": "bower-asset/icheck", @@ -929,8 +918,7 @@ "replacement", "skins", "ui" - ], - "time": "2014-03-03T17:36:28+00:00" + ] }, { "name": "bower-asset/jquery", @@ -993,8 +981,7 @@ "javascript", "jquery", "library" - ], - "time": "2016-05-20T17:24:43+00:00" + ] }, { "name": "bower-asset/jquery-3.2.x", @@ -1061,8 +1048,7 @@ "scroll", "scrolltop", "scrolltotop" - ], - "time": "2017-08-31T15:51:29+00:00" + ] }, { "name": "bower-asset/jquery-migrate-1.4.x", @@ -1081,8 +1067,7 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "jquery-migrate.js" - }, - "time": "2016-04-15T06:38:34+00:00" + } }, { "name": "bower-asset/jquery-migrate-3.0.x", @@ -1101,8 +1086,7 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "jquery-migrate.js" - }, - "time": "2016-06-10T14:28:59+00:00" + } }, { "name": "bower-asset/jquery.nicescroll", @@ -1132,8 +1116,7 @@ "demo", "package.json" ] - }, - "time": "2016-03-01T20:38:24+00:00" + } }, { "name": "bower-asset/material-design-iconic-font", @@ -1172,8 +1155,7 @@ "font", "icons", "material" - ], - "time": "2015-11-08T04:50:28+00:00" + ] }, { "name": "bower-asset/materialize", @@ -1232,8 +1214,7 @@ "responsive", "sass", "ux" - ], - "time": "2017-04-15T01:39:28+00:00" + ] }, { "name": "bower-asset/pace", @@ -1279,8 +1260,7 @@ "progress", "progress", "spinner" - ], - "time": "2014-11-06T16:31:34+00:00" + ] }, { "name": "bower-asset/pnotify", @@ -1332,8 +1312,7 @@ "license": [ "Apache-2.0" ], - "description": "JavaScript notification plugin.", - "time": "2017-07-31T21:50:29+00:00" + "description": "JavaScript notification plugin." }, { "name": "bower-asset/respond", @@ -1357,8 +1336,7 @@ "test" ] }, - "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)", - "time": "2013-12-19T04:44:31+00:00" + "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)" }, { "name": "bower-asset/responsive-tables-js", @@ -1388,8 +1366,7 @@ "jquery", "responsive", "table" - ], - "time": "2015-10-08T14:18:04+00:00" + ] }, { "name": "bower-asset/select2", @@ -1457,8 +1434,7 @@ "scrolling", "slimscroll", "ui" - ], - "time": "2016-06-11T09:19:14+00:00" + ] }, { "name": "bower-asset/tinymce-dist", diff --git a/config/hashing.php b/config/hashing.php index d90d37ac0..b99841c92 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -1,5 +1,4 @@ 'argon', -]; + 'driver' => 'argon2id', + /* + |-------------------------------------------------------------------------- + | Bcrypt Options + |-------------------------------------------------------------------------- + | + | Here you may specify the configuration options that should be used when + | passwords are hashed using the Bcrypt algorithm. This will allow you + | to control the amount of time it takes to hash the given password. + | + */ + 'bcrypt' => [ + 'rounds' => env('BCRYPT_ROUNDS', 10), + ], + /* + |-------------------------------------------------------------------------- + | Argon Options + |-------------------------------------------------------------------------- + | + | Here you may specify the configuration options that should be used when + | passwords are hashed using the Argon algorithm. These will allow you + | to control the amount of time it takes to hash the given password. + | + */ + 'argon' => [ + 'memory' => 1024, + 'threads' => 2, + 'time' => 2, + ], +]; \ No newline at end of file