diff options
| author | Amalia Hawkins <amalia.hawkins@10gen.com> | 2014-10-10 17:13:23 -0400 |
|---|---|---|
| committer | Amalia Hawkins <amalia.hawkins@10gen.com> | 2014-10-10 17:13:23 -0400 |
| commit | 8dff7bcaa38a52180eba26793446ee7e2855a1e4 (patch) | |
| tree | dc916956cc2b2a02cf933677011763c820639f4c /src/mongo/db/auth/security_key.cpp | |
| parent | b77054789b59c9284df70928c1d0d76770fd5c25 (diff) | |
| download | mongo-8dff7bcaa38a52180eba26793446ee7e2855a1e4.tar.gz | |
Revert "SERVER-15198 Make scramIterationCount user configurable"
This reverts commit bf48f38 and 57e21a1.
Diffstat (limited to 'src/mongo/db/auth/security_key.cpp')
| -rw-r--r-- | src/mongo/db/auth/security_key.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mongo/db/auth/security_key.cpp b/src/mongo/db/auth/security_key.cpp index 19860e87a9e..dcc0f7866a3 100644 --- a/src/mongo/db/auth/security_key.cpp +++ b/src/mongo/db/auth/security_key.cpp @@ -44,7 +44,6 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/privilege.h" -#include "mongo/db/auth/sasl_options.h" #include "mongo/db/auth/user.h" #include "mongo/db/server_options.h" #include "mongo/util/log.h" @@ -189,8 +188,7 @@ namespace mongo { credentials.password = mongo::createPasswordDigest( internalSecurity.user->getName().getUser().toString(), str); - BSONObj creds = scram::generateCredentials(credentials.password, - saslGlobalParams.scramIterationCount); + BSONObj creds = scram::generateCredentials(credentials.password); credentials.scram.iterationCount = creds[scram::iterationCountFieldName].Int(); credentials.scram.salt = creds[scram::saltFieldName].String(); credentials.scram.storedKey = creds[scram::storedKeyFieldName].String(); |