SERVER-71910 shrink Session's SSL interface

2 files changed, 11 insertions, 7 deletions

diff --git a/src/mongo/client/async_client.cpp b/src/mongo/client/async_client.cpp
index 0f74acc733e..dcf519ff304 100644
--- a/src/mongo/client/async_client.cpp
+++ b/src/mongo/client/async_client.cpp
@@ -178,9 +178,9 @@ Future<void> AsyncDBClient::authenticate(const BSONObj& params) {
     // We will only have a valid clientName if SSL is enabled.
     std::string clientName;
 #ifdef MONGO_CONFIG_SSL
-    auto sslConfiguration = _session->getSSLConfiguration();
-    if (sslConfiguration) {
-        clientName = sslConfiguration->clientSubjectName.toString();
+    auto& sslManager = _session->getSSLManager();
+    if (sslManager) {
+        clientName = sslManager->getSSLConfiguration().clientSubjectName.toString();
     }
 #endif
 
@@ -197,9 +197,9 @@ Future<void> AsyncDBClient::authenticateInternal(
     // We will only have a valid clientName if SSL is enabled.
     std::string clientName;
 #ifdef MONGO_CONFIG_SSL
-    auto sslConfiguration = _session->getSSLConfiguration();
-    if (sslConfiguration) {
-        clientName = sslConfiguration->clientSubjectName.toString();
+    auto& sslManager = _session->getSSLManager();
+    if (sslManager) {
+        clientName = sslManager->getSSLConfiguration().clientSubjectName.toString();
     }
 #endif
 
diff --git a/src/mongo/client/dbclient_connection.cpp b/src/mongo/client/dbclient_connection.cpp
index cb6887b4392..e0f8ee3c3d9 100644
--- a/src/mongo/client/dbclient_connection.cpp
+++ b/src/mongo/client/dbclient_connection.cpp
@@ -756,7 +756,11 @@ void DBClientConnection::handleNotPrimaryResponse(const BSONObj& replyBody,
 
 #ifdef MONGO_CONFIG_SSL
 const SSLConfiguration* DBClientConnection::getSSLConfiguration() {
-    return _session->getSSLConfiguration();
+    auto& sslManager = _session->getSSLManager();
+    if (!sslManager) {
+        return nullptr;
+    }
+    return &sslManager->getSSLConfiguration();
 }
 
 bool DBClientConnection::isUsingTransientSSLParams() const {