summaryrefslogtreecommitdiff
path: root/rel
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2018-03-08 17:47:24 +0100
committerJan Lehnardt <jan@apache.org>2018-03-08 18:39:09 +0100
commit817b2b6f5f0883092df60c1ec8ec7ec6d6094a23 (patch)
tree9dce127981866e54ed3a94f8255699691505371b /rel
parentba624ea7c26984b8ea52ec5e20534dc5f8508d3a (diff)
downloadcouchdb-817b2b6f5f0883092df60c1ec8ec7ec6d6094a23.tar.gz
Add bcrypt hashing option
Diffstat (limited to 'rel')
-rw-r--r--rel/overlay/etc/default.ini3
-rw-r--r--rel/reltool.config2
2 files changed, 4 insertions, 1 deletions
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 9762536ac..df4387735 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -189,7 +189,8 @@ require_valid_user = false
timeout = 600 ; number of seconds before automatic logout
auth_cache_size = 50 ; size is number of cache entries
allow_persistent_cookies = false ; set to true to allow persistent cookies
-iterations = 10 ; iterations for password hashing
+iterations = 10 ; iterations for PBKDF2 password hashing
+log_rounds = 10 ; 2^log_rounds iterations for Bcrypt password hashing
; min_iterations = 1
; max_iterations = 1000000000
; password_scheme = pbkdf2
diff --git a/rel/reltool.config b/rel/reltool.config
index 464f5f4fe..aa3100647 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -15,6 +15,7 @@
{rel, "couchdb", "2.2.0", [
%% stdlib
asn1,
+ bcrypt,
compiler,
crypto,
inets,
@@ -66,6 +67,7 @@
%% stdlib
{app, asn1, [{incl_cond, include}]},
+ {app, bcrypt, [{incl_cond, include}]},
{app, compiler, [{incl_cond, include}]},
{app, crypto, [{incl_cond, include}]},
{app, inets, [{incl_cond, include}]},