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/crypto | |
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/crypto')
-rw-r--r-- | src/mongo/crypto/mechanism_scram.cpp | 4 | ||||
-rw-r--r-- | src/mongo/crypto/mechanism_scram.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/crypto/mechanism_scram.cpp b/src/mongo/crypto/mechanism_scram.cpp index d77a0c72b85..1b6eaf88ea9 100644 --- a/src/mongo/crypto/mechanism_scram.cpp +++ b/src/mongo/crypto/mechanism_scram.cpp @@ -139,8 +139,10 @@ namespace scram { &hashLen)); } - BSONObj generateCredentials(const std::string& hashedPassword, int iterationCount) { + BSONObj generateCredentials(const std::string& hashedPassword) { + // TODO: configure the default iteration count via setParameter + const int iterationCount = 10; const int saltLenQWords = 2; // Generate salt diff --git a/src/mongo/crypto/mechanism_scram.h b/src/mongo/crypto/mechanism_scram.h index 19d7e2b1c8b..fc6da4aea9c 100644 --- a/src/mongo/crypto/mechanism_scram.h +++ b/src/mongo/crypto/mechanism_scram.h @@ -69,7 +69,7 @@ namespace scram { * Generates the user salt and the SCRAM secrets storedKey and serverKey as * defined in RFC5802 (server side). */ - BSONObj generateCredentials(const std::string& hashedPassword, int iterationCount); + BSONObj generateCredentials(const std::string& hashedPassword); /* * Computes the ClientProof from SaltedPassword and authMessage (client side). |