New upstream version 6.0.20upstream

1 files changed, 8 insertions, 6 deletions

diff --git a/src/mongo/util/net/ssl_manager_apple.cpp b/src/mongo/util/net/ssl_manager_apple.cpp
index c13a4bb8eb8..dcde5542ca9 100644
--- a/src/mongo/util/net/ssl_manager_apple.cpp
+++ b/src/mongo/util/net/ssl_manager_apple.cpp
@@ -1156,7 +1156,6 @@ public:
         }
 
         uassertOSStatusOK(::SSLSetConnection(_ssl.get(), static_cast<void*>(this)));
-        uassertOSStatusOK(::SSLSetPeerID(_ssl.get(), _ssl.get(), sizeof(_ssl)));
         uassertOSStatusOK(::SSLSetIOFuncs(_ssl.get(), read_func, write_func));
         uassertOSStatusOK(::SSLSetProtocolVersionMin(_ssl.get(), ctx->protoMin));
         uassertOSStatusOK(::SSLSetProtocolVersionMax(_ssl.get(), ctx->protoMax));
@@ -1654,11 +1653,14 @@ Future<SSLPeerInfo> SSLManagerApple::parseAndValidatePeerCertificate(
         return swPeerSubjectName.getStatus();
     }
     const auto peerSubjectName = std::move(swPeerSubjectName.getValue());
-    LOGV2_DEBUG(23207,
-                2,
-                "Accepted TLS connection from peer: {peerSubjectName}",
-                "Accepted TLS connection from peer",
-                "peerSubjectName"_attr = peerSubjectName);
+    // The cipher will be presented as a number.
+    ::SSLCipherSuite cipher;
+    uassertOSStatusOK(::SSLGetNegotiatedCipher(ssl, &cipher));
+
+    LOGV2_INFO(6723803,
+               "Accepted TLS connection from peer",
+               "peerSubjectName"_attr = peerSubjectName,
+               "cipher"_attr = cipher);
 
     // Server side.
     if (remoteHost.empty()) {