From 9cee47408ffca6b05dd0471843db79bcffbcef87 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Thu, 12 Nov 2020 14:32:22 -0600 Subject: [PATCH 1/3] version bump --- box.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/box.json b/box.json index 4f4f5c1..58a6bd2 100644 --- a/box.json +++ b/box.json @@ -1,19 +1,19 @@ { - "name" : "BCrypt", - "version" : "3.0.0", - "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/bcrypt/@build.version@/bcrypt-@build.version@.zip", - "author" : "Ortus Solutions ", - "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.1.0", + "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/bcrypt/@build.version@/bcrypt-@build.version@.zip", + "author":"Ortus Solutions ", + "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 ", "Luis Majano ", @@ -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", From 72e9c495fc6e31319344b065e893fb6e7c8e8318 Mon Sep 17 00:00:00 2001 From: wpdebruin Date: Fri, 20 Nov 2020 11:47:23 +0100 Subject: [PATCH 2/3] Update BCrypt.cfc enabled workfactor in hasspassword --- models/BCrypt.cfc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/BCrypt.cfc b/models/BCrypt.cfc index c4a1cfb..2b3d45e 100644 --- a/models/BCrypt.cfc +++ b/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 ); } -} \ No newline at end of file +} From 25c8133b603015103730903050ff40d50a9f4b6f Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Wed, 25 Nov 2020 14:26:34 -0600 Subject: [PATCH 3/3] finalized for release --- README.md | 2 +- box.json | 2 +- changelog.md | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cff207a..08bddc1 100644 --- a/README.md +++ b/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. diff --git a/box.json b/box.json index 58a6bd2..a125399 100644 --- a/box.json +++ b/box.json @@ -1,6 +1,6 @@ { "name":"BCrypt", - "version":"3.1.0", + "version":"3.0.1", "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/bcrypt/@build.version@/bcrypt-@build.version@.zip", "author":"Ortus Solutions ", "homepage":"https://github.com/coldbox-modules/bcrypt", diff --git a/changelog.md b/changelog.md index 2158a61..3624fce 100644 --- a/changelog.md +++ b/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 - enabled `workfactor` to be used in `hashPassword()` + +---- + ## [3.0.0] => 2020-NOV-1 ### Added