diff options
| author | Joan Touzet <joant@atypical.net> | 2018-07-18 12:31:42 -0400 |
|---|---|---|
| committer | Joan Touzet <wohali@users.noreply.github.com> | 2018-07-18 14:31:35 -0400 |
| commit | 7597abf850870bb63e115ec004106b403a9be42c (patch) | |
| tree | aa43f5285658cf4719e207f2495f4e48d050df71 /rel | |
| parent | 91f84f3314b4e54767e43f57d46a3724b6e69db6 (diff) | |
| download | couchdb-7597abf850870bb63e115ec004106b403a9be42c.tar.gz | |
Revert "Add bcrypt hashing option"
This reverts commit 817b2b6f5f0883092df60c1ec8ec7ec6d6094a23.
Diffstat (limited to 'rel')
| -rw-r--r-- | rel/overlay/etc/default.ini | 3 | ||||
| -rw-r--r-- | rel/reltool.config | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini index 77f0e387c..aa9763ce0 100644 --- a/rel/overlay/etc/default.ini +++ b/rel/overlay/etc/default.ini @@ -206,8 +206,7 @@ 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 PBKDF2 password hashing -log_rounds = 10 ; 2^log_rounds iterations for Bcrypt password hashing +iterations = 10 ; iterations for password hashing ; min_iterations = 1 ; max_iterations = 1000000000 ; password_scheme = pbkdf2 diff --git a/rel/reltool.config b/rel/reltool.config index 5e86d9643..2c55d0900 100644 --- a/rel/reltool.config +++ b/rel/reltool.config @@ -15,7 +15,6 @@ {rel, "couchdb", "2.2.0", [ %% stdlib asn1, - bcrypt, compiler, crypto, inets, @@ -68,7 +67,6 @@ %% 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}]}, |