From c0ddf0f0a2437262ed9837cd70497c39671c74f6 Mon Sep 17 00:00:00 2001
From: Radek Zikmund <32671551+rzikm@users.noreply.github.com>
Date: Tue, 19 Jul 2022 09:00:06 +0200
Subject: [PATCH] Use TlsAlertMessage enum to make exception messages more
 readable (#72370)

---
 .../src/System/Net/Security/TlsAlertMessage.cs                | 0
 src/libraries/System.Net.Quic/src/System.Net.Quic.csproj      | 2 ++
 .../src/System/Net/Quic/Internal/ThrowHelper.cs               | 3 ++-
 .../System.Net.Security/src/System.Net.Security.csproj        | 3 ++-
 .../tests/UnitTests/System.Net.Security.Unit.Tests.csproj     | 4 ++--
 5 files changed, 8 insertions(+), 4 deletions(-)
 rename src/libraries/{System.Net.Security => Common}/src/System/Net/Security/TlsAlertMessage.cs (100%)

diff --git a/src/libraries/System.Net.Security/src/System/Net/Security/TlsAlertMessage.cs b/src/libraries/Common/src/System/Net/Security/TlsAlertMessage.cs
similarity index 100%
rename from src/libraries/System.Net.Security/src/System/Net/Security/TlsAlertMessage.cs
rename to src/libraries/Common/src/System/Net/Security/TlsAlertMessage.cs
diff --git a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
index 2511b13f92237..4eb9f5135b4ba 100644
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -27,6 +27,8 @@
     <Compile Include="$(CommonPath)System\Net\SocketAddress.cs" Link="Common\System\Net\SocketAddress.cs" />
     <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs" Link="Common\System\Net\IPAddressParserStatics.cs" />
     <Compile Include="$(CommonPath)System\Net\Internals\IPEndPointExtensions.cs" Link="Common\System\Net\Internals\IPEndPointExtensions.cs" />
+    <Compile Include="$(CommonPath)System\Net\Security\TlsAlertMessage.cs"
+             Link="Common\System\Net\Security\TlsAlertMessage.cs" />
   </ItemGroup>
   <!-- Unsupported platforms -->
   <ItemGroup Condition="'$(TargetPlatformIdentifier)' == ''">
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs
index 01a6fd9806df9..ef6223912e9ac 100644
--- a/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs
+++ b/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.Quic;
 using System.Security.Authentication;
+using System.Net.Security;
 using static Microsoft.Quic.MsQuic;
 
 namespace System.Net.Quic;
@@ -89,7 +90,7 @@ static Exception GetExceptionInternal(int status, string? message)
             //
             if ((uint)status >= (uint)QUIC_STATUS_CLOSE_NOTIFY && (uint)status < (uint)QUIC_STATUS_CLOSE_NOTIFY + 256)
             {
-                int alert = status - QUIC_STATUS_CLOSE_NOTIFY;
+                TlsAlertMessage alert = (TlsAlertMessage)(status - QUIC_STATUS_CLOSE_NOTIFY);
                 return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, alert));
             }
 
diff --git a/src/libraries/System.Net.Security/src/System.Net.Security.csproj b/src/libraries/System.Net.Security/src/System.Net.Security.csproj
index 139ea7ce4ba06..eba0ccf4e454a 100644
--- a/src/libraries/System.Net.Security/src/System.Net.Security.csproj
+++ b/src/libraries/System.Net.Security/src/System.Net.Security.csproj
@@ -46,7 +46,6 @@
     <Compile Include="System\Net\Security\SslConnectionInfo.cs" />
     <Compile Include="System\Net\Security\StreamSizes.cs" />
     <Compile Include="System\Net\Security\TlsAlertType.cs" />
-    <Compile Include="System\Net\Security\TlsAlertMessage.cs" />
     <Compile Include="System\Net\Security\TlsFrameHelper.cs" />
     <!-- NegotiateStream -->
     <Compile Include="System\Net\NTAuthentication.cs" />
@@ -84,6 +83,8 @@
              Link="Common\System\NotImplemented.cs" />
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs"
              Link="Common\System\Threading\Tasks\TaskToApm.cs" />
+    <Compile Include="$(CommonPath)System\Net\Security\TlsAlertMessage.cs"
+             Link="Common\System\Net\Security\TlsAlertMessage.cs" />
     <Compile Include="$(CommonPath)System\Net\Security\SafeCredentialReference.cs"
              Link="Common\System\Net\Security\SafeCredentialReference.cs" />
     <Compile Include="$(CommonPath)System\Net\Security\SSPIHandleCache.cs"
diff --git a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
index 123346f796000..0389e9cfc53b2 100644
--- a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
@@ -50,6 +50,8 @@
              Link="Common\System\Net\Security\MD4.cs" />
     <Compile Include="$(CommonPath)System\Net\Security\RC4.cs"
              Link="Common\System\Net\Security\RC4.cs" />
+    <Compile Include="$(CommonPath)System\Net\Security\TlsAlertMessage.cs"
+             Link="Common\System\Net\Security\TlsAlertMessage.cs" />
     <Compile Include="..\..\src\System\Net\Security\NetEventSource.Security.cs"
              Link="ProductionCode\System\Net\Security\NetEventSource.Security.cs" />
     <Compile Include="..\..\src\System\Net\Security\SslStream.cs"
@@ -76,8 +78,6 @@
              Link="ProductionCode\Common\System\Net\SecurityProtocol.cs" />
     <Compile Include="..\..\src\System\Net\Security\TlsAlertType.cs"
              Link="ProductionCode\Common\System\Net\TlsAlertType.cs" />
-    <Compile Include="..\..\src\System\Net\Security\TlsAlertMessage.cs"
-             Link="ProductionCode\Common\System\Net\TlsAlertMessage.cs" />
     <Compile Include="..\..\src\System\Net\Security\TlsFrameHelper.cs"
              Link="ProductionCode\Common\System\Net\TlsFrameHelper.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.Alerts.cs"