You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2012/12/31 01:01:22 UTC
git commit: fix pbkdf2 spec
Updated Branches:
refs/heads/master 666b95bec -> 0d6fba2e6
fix pbkdf2 spec
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0d6fba2e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0d6fba2e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0d6fba2e
Branch: refs/heads/master
Commit: 0d6fba2e6bcc3c7ec9fc436efc6b8a129523e3ae
Parents: 666b95b
Author: Robert Newson <rn...@apache.org>
Authored: Sun Dec 30 23:59:43 2012 +0000
Committer: Robert Newson <rn...@apache.org>
Committed: Mon Dec 31 00:00:30 2012 +0000
----------------------------------------------------------------------
src/couchdb/couch_passwords.erl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/0d6fba2e/src/couchdb/couch_passwords.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_passwords.erl b/src/couchdb/couch_passwords.erl
index 57e5193..d9e6836 100644
--- a/src/couchdb/couch_passwords.erl
+++ b/src/couchdb/couch_passwords.erl
@@ -49,7 +49,7 @@ get_unhashed_admins() ->
couch_config:get("admins")).
%% Current scheme, much stronger.
--spec pbkdf2(binary(), binary(), integer()) -> string().
+-spec pbkdf2(binary(), binary(), integer()) -> binary().
pbkdf2(Password, Salt, Iterations) ->
{ok, Result} = pbkdf2(Password, Salt, Iterations, ?SHA1_OUTPUT_LENGTH),
Result.