diff options
author | Sara Golemon <sara.golemon@mongodb.com> | 2017-12-08 19:00:43 -0500 |
---|---|---|
committer | Sara Golemon <sara.golemon@mongodb.com> | 2017-12-19 00:31:11 -0500 |
commit | 5a781806537d7710c3b895e450df2307b8861b69 (patch) | |
tree | 5d61ce68b1b869b460e426aa7ca1b16620bc514c /src/mongo/db/auth/sasl_scramsha1_server_conversation.cpp | |
parent | a5463eebace42e0970cdb28507d6b00d1c982f18 (diff) | |
download | mongo-5a781806537d7710c3b895e450df2307b8861b69.tar.gz |
SERVER-32231 Remove MONGODB-CR
Diffstat (limited to 'src/mongo/db/auth/sasl_scramsha1_server_conversation.cpp')
-rw-r--r-- | src/mongo/db/auth/sasl_scramsha1_server_conversation.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/mongo/db/auth/sasl_scramsha1_server_conversation.cpp b/src/mongo/db/auth/sasl_scramsha1_server_conversation.cpp index 98469c1137d..39ac502bcac 100644 --- a/src/mongo/db/auth/sasl_scramsha1_server_conversation.cpp +++ b/src/mongo/db/auth/sasl_scramsha1_server_conversation.cpp @@ -42,7 +42,6 @@ #include "mongo/util/base64.h" #include "mongo/util/log.h" #include "mongo/util/mongoutils/str.h" -#include "mongo/util/password_digest.h" #include "mongo/util/sequence_util.h" #include "mongo/util/text.h" @@ -189,19 +188,6 @@ StatusWith<bool> SaslSCRAMSHA1ServerConversation::_firstStep(std::vector<string> "on servers started without a --keyFile parameter"); } - // Generate SCRAM credentials on the fly for mixed MONGODB-CR/SCRAM mode. - if (_creds.scram.salt.empty() && !_creds.password.empty()) { - // Use a default value of 5000 for the scramIterationCount when in mixed mode, - // overriding the default value (10000) used for SCRAM mode or the user-given value. - const int mixedModeScramIterationCount = 5000; - BSONObj scramCreds = - scram::generateCredentials(_creds.password, mixedModeScramIterationCount); - _creds.scram.iterationCount = scramCreds[scram::iterationCountFieldName].Int(); - _creds.scram.salt = scramCreds[scram::saltFieldName].String(); - _creds.scram.storedKey = scramCreds[scram::storedKeyFieldName].String(); - _creds.scram.serverKey = scramCreds[scram::serverKeyFieldName].String(); - } - // Generate server-first-message // Create text-based nonce as base64 encoding of a binary blob of length multiple of 3 const int nonceLenQWords = 3; |