diff --git a/src/libraries/Common/src/Interop/Windows/SspiCli/SecuritySafeHandles.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SecuritySafeHandles.cs
index 382d1f6a2979e..a8d91d1d8752f 100644
--- a/src/libraries/Common/src/Interop/Windows/SspiCli/SecuritySafeHandles.cs
+++ b/src/libraries/Common/src/Interop/Windows/SspiCli/SecuritySafeHandles.cs
@@ -225,9 +225,7 @@ public static unsafe int AcquireDefaultCredential(
ref outCredential._handle,
out timeStamp);
-#if TRACE_VERBOSE
- if (NetEventSource.IsEnabled) NetEventSource.Info(null, $"{nameof(Interop.SspiCli.AcquireCredentialsHandleW)} returns 0x{errorCode:x}, handle = {outCredential}");
-#endif
+ if (NetEventSource.IsEnabled) NetEventSource.Verbose(null, $"{nameof(Interop.SspiCli.AcquireCredentialsHandleW)} returns 0x{errorCode:x}, handle = {outCredential}");
if (errorCode != 0)
{
@@ -307,9 +305,7 @@ public static unsafe int AcquireCredentialsHandle(
authdata.paCred = copiedPtr;
}
-#if TRACE_VERBOSE
- if (NetEventSource.IsEnabled) NetEventSource.Info(null, $"{nameof(Interop.SspiCli.AcquireCredentialsHandleW)} returns 0x{errorCode:x}, handle = {outCredential}");
-#endif
+ if (NetEventSource.IsEnabled) NetEventSource.Verbose(null, $"{nameof(Interop.SspiCli.AcquireCredentialsHandleW)} returns 0x{errorCode:x}, handle = {outCredential}");
if (errorCode != 0)
{
@@ -401,13 +397,7 @@ internal static unsafe int InitializeSecurityContext(
ref SecurityBuffer outSecBuffer,
ref Interop.SspiCli.ContextFlags outFlags)
{
-#if TRACE_VERBOSE
- if (NetEventSource.IsEnabled)
- {
- NetEventSource.Enter(null, $"credential:{inCredentials}, crefContext:{refContext}, targetName:{targetName}, inFlags:{inFlags}, endianness:{endianness}");
- NetEventSource.Info(null, $"inSecBuffers.Length = {inSecBuffers.Length}");
- }
-#endif
+ if (NetEventSource.IsEnabled) NetEventSource.Enter(null, $"credential:{inCredentials}, crefContext:{refContext}, targetName:{targetName}, inFlags:{inFlags}, endianness:{endianness}");
if (inCredentials == null)
{
@@ -639,13 +629,7 @@ internal static unsafe int AcceptSecurityContext(
ref SecurityBuffer outSecBuffer,
ref Interop.SspiCli.ContextFlags outFlags)
{
-#if TRACE_VERBOSE
- if (NetEventSource.IsEnabled)
- {
- NetEventSource.Enter(null, $"credential={inCredentials}, refContext={refContext}, inFlags={inFlags}");
- NetEventSource.Info(null, $"inSecBuffers.Length = {inSecBuffers.Length}");
- }
-#endif
+ if (NetEventSource.IsEnabled) NetEventSource.Enter(null, $"credential={inCredentials}, refContext={refContext}, inFlags={inFlags}");
if (inCredentials == null)
{
@@ -900,9 +884,6 @@ internal static unsafe int CompleteAuthToken(
inSecBuffer.unmanagedToken != null ? inSecBuffer.unmanagedToken.DangerousGetHandle() :
inSecBuffer.token == null || inSecBuffer.token.Length == 0 ? IntPtr.Zero :
(IntPtr)(pinnedToken + inSecBuffer.offset);
-#if TRACE_VERBOSE
- if (NetEventSource.IsEnabled) NetEventSource.Info(null, $"SecBuffer: cbBuffer:{inSecBuffer.size} BufferType: {inSecBuffer.type}");
-#endif
Interop.SspiCli.CredHandle contextHandle = refContext != null ? refContext._handle : default;
if (refContext == null || refContext.IsInvalid)
@@ -964,9 +945,6 @@ internal static unsafe int ApplyControlToken(
inSecBuffer.unmanagedToken != null ? inSecBuffer.unmanagedToken.DangerousGetHandle() :
inSecBuffer.token == null || inSecBuffer.token.Length == 0 ? IntPtr.Zero :
(IntPtr)(pinnedInSecBufferToken + inSecBuffer.offset);
-#if TRACE_VERBOSE
- if (NetEventSource.IsEnabled) NetEventSource.Info(null, $"SecBuffer: cbBuffer:{inSecBuffer.size} BufferType:{inSecBuffer.type}");
-#endif
Interop.SspiCli.CredHandle contextHandle = refContext != null ? refContext._handle : default;
diff --git a/src/libraries/Common/src/System/Net/Logging/NetEventSource.Common.cs b/src/libraries/Common/src/System/Net/Logging/NetEventSource.Common.cs
index fa064627de088..e7bc2b38612a6 100644
--- a/src/libraries/Common/src/System/Net/Logging/NetEventSource.Common.cs
+++ b/src/libraries/Common/src/System/Net/Logging/NetEventSource.Common.cs
@@ -299,6 +299,36 @@ private void CriticalFailure(string thisOrContextObject, string? memberName, str
WriteEvent(CriticalFailureEventId, thisOrContextObject, memberName ?? MissingMember, message);
#endregion
+ #region Verbose
+ /// Logs an info message at verbose mode.
+ /// `this`, or another object that serves to provide context for the operation.
+ /// The message to be logged.
+ /// The calling member.
+ [NonEvent]
+ public static void Verbose(object? thisOrContextObject, FormattableString formattableString, [CallerMemberName] string? memberName = null)
+ {
+ DebugValidateArg(thisOrContextObject);
+ DebugValidateArg(formattableString);
+ if (IsEnabled) Log.ErrorMessage(IdOf(thisOrContextObject), memberName, Format(formattableString));
+ }
+
+ /// Logs an info at verbose mode.
+ /// `this`, or another object that serves to provide context for the operation.
+ /// The message to be logged.
+ /// The calling member.
+ [NonEvent]
+ public static void Verbose(object? thisOrContextObject, object message, [CallerMemberName] string? memberName = null)
+ {
+ DebugValidateArg(thisOrContextObject);
+ DebugValidateArg(message);
+ if (IsEnabled) Log.VerboseMessage(IdOf(thisOrContextObject), memberName, Format(message).ToString());
+ }
+
+ [Event(ErrorEventId, Level = EventLevel.Verbose, Keywords = Keywords.Default)]
+ private void VerboseMessage(string thisOrContextObject, string? memberName, string? message) =>
+ WriteEvent(ErrorEventId, thisOrContextObject, memberName ?? MissingMember, message);
+ #endregion
+
#region DumpBuffer
/// Logs the contents of a buffer.
/// `this`, or another object that serves to provide context for the operation.
diff --git a/src/libraries/System.Net.Security/src/System/Net/Security/SslStream.Implementation.cs b/src/libraries/System.Net.Security/src/System/Net/Security/SslStream.Implementation.cs
index ef527382b8466..42e8a7c7c85ac 100644
--- a/src/libraries/System.Net.Security/src/System/Net/Security/SslStream.Implementation.cs
+++ b/src/libraries/System.Net.Security/src/System/Net/Security/SslStream.Implementation.cs
@@ -1093,13 +1093,6 @@ private Framing DetectFraming(ReadOnlySpan bytes)
return Framing.Invalid;
}
-#if TRACE_VERBOSE
- if (bytes[1] != 3 && NetEventSource.IsEnabled)
- {
- if (NetEventSource.IsEnabled) NetEventSource.Info(this, $"WARNING: SslState::DetectFraming() SSL protocol is > 3, trying SSL3 framing in retail = {bytes[1]:x}");
- }
-#endif
-
version = (bytes[1] << 8) | bytes[2];
if (version < 0x300 || version >= 0x500)
{
@@ -1112,14 +1105,6 @@ private Framing DetectFraming(ReadOnlySpan bytes)
return Framing.SinceSSL3;
}
-#if TRACE_VERBOSE
- if ((bytes[0] & 0x80) == 0 && NetEventSource.IsEnabled)
- {
- // We have a three-byte header format
- if (NetEventSource.IsEnabled) NetEventSource.Info(this, $"WARNING: SslState::DetectFraming() SSL v <=2 HELLO has no high bit set for 3 bytes header, we are broken, received byte = {bytes[0]:x}");
- }
-#endif
-
if (bytes.Length < 3)
{
return Framing.Invalid;