SERVER-37833 Retry internal auth with alternate key during keyfile rollover

1 files changed, 8 insertions, 1 deletions

diff --git a/src/mongo/crypto/mechanism_scram.h b/src/mongo/crypto/mechanism_scram.h
index 1c5de95d55a..37614357f73 100644
--- a/src/mongo/crypto/mechanism_scram.h
+++ b/src/mongo/crypto/mechanism_scram.h
@@ -249,8 +249,15 @@ public:
 
     static BSONObj generateCredentials(std::string password, int iterationCount) {
         auto salt = Presecrets<HashBlock>::generateSecureRandomSalt();
+        return generateCredentials(salt, password, iterationCount);
+    }
+
+    static BSONObj generateCredentials(const std::vector<uint8_t>& salt,
+                                       const std::string& password,
+                                       int iterationCount) {
         Secrets<HashBlock> secrets(Presecrets<HashBlock>(password, salt, iterationCount));
-        const auto encodedSalt = base64::encode(reinterpret_cast<char*>(salt.data()), salt.size());
+        const auto encodedSalt =
+            base64::encode(reinterpret_cast<const char*>(salt.data()), salt.size());
         return BSON(kIterationCountFieldName << iterationCount << kSaltFieldName << encodedSalt
                                              << kStoredKeyFieldName
                                              << secrets.storedKey().toString()