Merge branch 'development'

Author: lmajano

README.md

@@ -1,4 +1,4 @@
-# BCrypt Module for the ColdBox Framework [![Build Status](https://travis-ci.org/coldbox-modules/bcrypt.svg?branch=development)](https://travis-ci.org/coldbox-modules/bcrypt)
+# BCrypt Module for the ColdBox Framework [![Build Status](https://travis-ci.com/coldbox-modules/bcrypt.svg?branch=development)](https://travis-ci.com/coldbox-modules/bcrypt)
 
 BCrypt's primary usage would be for the secure hashing of passwords.  The hashing method provides a high level of security, but also makes it too slow use as a simple digest. It is also not reversible, and therefore is not suitable for encrypting transmission data.
 

box.json

@@ -1,19 +1,19 @@
 {
-    "name"            : "BCrypt",
-    "version"         : "3.0.0",
-	"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/bcrypt/@build.version@/[email protected]@.zip",
-	"author"          : "Ortus Solutions <[email protected]>",
-    "homepage"        : "https://github.com/coldbox-modules/bcrypt",
-    "documentation"   : "https://github.com/coldbox-modules/bcrypt",
-    "repository"      :{
-        "type"        : "git",
-        "url"         : "https://github.com/coldbox-modules/bcrypt"
+    "name":"BCrypt",
+    "version":"3.0.1",
+    "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/bcrypt/@build.version@/[email protected]@.zip",
+    "author":"Ortus Solutions <[email protected]>",
+    "homepage":"https://github.com/coldbox-modules/bcrypt",
+    "documentation":"https://github.com/coldbox-modules/bcrypt",
+    "repository":{
+        "type":"git",
+        "url":"https://github.com/coldbox-modules/bcrypt"
     },
-    "bugs"            : "https://ortussolutions.atlassian.net/secure/RapidBoard.jspa?projectKey=CCM",
-    "slug"            : "BCrypt",
-    "shortDescription": "A ColdBox module for BCrypt. Creates cryptographically strong (and slow) password hashes.",
-    "type"            : "modules",
-    "contributors"    :[
+    "bugs":"https://ortussolutions.atlassian.net/secure/RapidBoard.jspa?projectKey=CCM",
+    "slug":"BCrypt",
+    "shortDescription":"A ColdBox module for BCrypt. Creates cryptographically strong (and slow) password hashes.",
+    "type":"modules",
+    "contributors":[
         "Seth Feldkamp",
         "Brad Wood <[email protected]>",
         "Luis Majano <[email protected]>",
@@ -23,11 +23,11 @@
         "**/.*",
         "tests",
         "*/.md"
-	],
-	"dependencies"    :{
-        "cbjavaloader": "^2.0.0"
-	},
-	"scripts":{
+    ],
+    "dependencies":{
+        "cbjavaloader":"^2.0.0"
+    },
+    "scripts":{
         "release":"recipe build/release.boxr",
         "format":"cfformat run *.cfc,models/,test-harness/tests/specs",
         "format:watch":"cfformat watch *.cfc,models/,test-harness/tests/specs ./.cfformat.json",

changelog.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ----
 
+## [3.0.1] => 2020-NOV-25
+
+### Fixed
+
+* @wpdebruin <[email protected]> - enabled `workfactor` to be used in `hashPassword()`
+
+----
+
 ## [3.0.0] => 2020-NOV-1
 
 ### Added

models/BCrypt.cfc

@@ -34,7 +34,7 @@ component singleton threadsafe{
 	string function hashPassword(
 		required string password,
 		workFactor=variables.settings.workFactor,
-		salt      =generateSalt()
+		salt      =generateSalt( arguments.workFactor )
 	){
 		return variables.bcrypt.hashpw( arguments.password, arguments.salt );
 	}
@@ -107,4 +107,4 @@ component singleton threadsafe{
 	private boolean function isBCryptLoaded(){
 		return !isNull( variables.bcrypt );
 	}
-}
+}