Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 57B26188BB for ; Thu, 21 May 2015 21:13:27 +0000 (UTC) Received: (qmail 54136 invoked by uid 500); 21 May 2015 21:13:27 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 53979 invoked by uid 500); 21 May 2015 21:13:27 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 53647 invoked by uid 99); 21 May 2015 21:13:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 May 2015 21:13:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B8C24E51D0; Thu, 21 May 2015 21:13:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chewbranca@apache.org To: commits@couchdb.apache.org Date: Thu, 21 May 2015 21:13:34 -0000 Message-Id: <32cb3e2153234bc7818b1ec7bffdf71f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [9/9] couch commit: updated refs/heads/2657-fix-cassim-fabric-calls-revised to 1d28fd3 Revert "use existing salt during sha1->pbkdf2 upgrade to avoid conflicts" This reverts commit 569338222a9ee38c35d2270b2a2a405be26a0828. I think I'm wrong about conflicts, we update the document before we write (in fabric). Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/1d28fd36 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/1d28fd36 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/1d28fd36 Branch: refs/heads/2657-fix-cassim-fabric-calls-revised Commit: 1d28fd3673fda986c615bae4601bdd9d4b771d21 Parents: 5693382 Author: Robert Newson Authored: Tue May 19 13:11:28 2015 +0100 Committer: Robert Newson Committed: Tue May 19 13:11:28 2015 +0100 ---------------------------------------------------------------------- src/couch_users_db.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/1d28fd36/src/couch_users_db.erl ---------------------------------------------------------------------- diff --git a/src/couch_users_db.erl b/src/couch_users_db.erl index 74ff090..3b76862 100644 --- a/src/couch_users_db.erl +++ b/src/couch_users_db.erl @@ -64,7 +64,7 @@ save_doc(#doc{body={Body}} = Doc) -> Doc; ClearPassword -> Iterations = list_to_integer(config:get("couch_httpd_auth", "iterations", "1000")), - Salt = couch_util:get_value(?SALT, Body, couch_uuids:random()), + Salt = couch_uuids:random(), DerivedKey = couch_passwords:pbkdf2(ClearPassword, Salt, Iterations), Body0 = [{?PASSWORD_SCHEME, ?PBKDF2}, {?ITERATIONS, Iterations}|Body], Body1 = ?replace(Body0, ?DERIVED_KEY, DerivedKey),