diff --git a/src/libraries/Common/tests/System/Net/Security/FakeNtlmServer.cs b/src/libraries/Common/tests/System/Net/Security/FakeNtlmServer.cs index dc41e11ce7a59..1117b3412f35a 100644 --- a/src/libraries/Common/tests/System/Net/Security/FakeNtlmServer.cs +++ b/src/libraries/Common/tests/System/Net/Security/FakeNtlmServer.cs @@ -37,7 +37,6 @@ public FakeNtlmServer(NetworkCredential expectedCredential) public bool TargetIsServer { get; set; } = false; public bool PreferUnicode { get; set; } = true; public bool ForceNegotiateVersion { get; set; } = true; - public bool SupportsEncryption { get; set; } = true; // Negotiation results public bool IsAuthenticated { get; private set; } @@ -233,10 +232,6 @@ private byte[] GenerateChallenge(Flags flags) { flags |= Flags.NegotiateVersion; } - if (!SupportsEncryption) - { - flags &= ~Flags.NegotiateSeal; - } // Remove any unsupported flags here flags &= Flags.AllSupported; diff --git a/src/libraries/System.Net.Security/tests/UnitTests/NegotiateAuthenticationTests.cs b/src/libraries/System.Net.Security/tests/UnitTests/NegotiateAuthenticationTests.cs index 9ec5fa3aef176..4a4dbefa6f368 100644 --- a/src/libraries/System.Net.Security/tests/UnitTests/NegotiateAuthenticationTests.cs +++ b/src/libraries/System.Net.Security/tests/UnitTests/NegotiateAuthenticationTests.cs @@ -211,13 +211,10 @@ public void NtlmIncorrectExchangeTest() Assert.False(fakeNtlmServer.IsAuthenticated); } - [ConditionalTheory(nameof(IsNtlmAvailable))] - [InlineData(true)] - [InlineData(false)] - public void NtlmEncryptionTest(bool serverSupportsEncryption) + [ConditionalFact(nameof(IsNtlmAvailable))] + public void NtlmEncryptionTest() { using FakeNtlmServer fakeNtlmServer = new FakeNtlmServer(s_testCredentialRight); - fakeNtlmServer.SupportsEncryption = serverSupportsEncryption; NegotiateAuthentication ntAuth = new NegotiateAuthentication( new NegotiateAuthenticationClientOptions @@ -239,22 +236,15 @@ public void NtlmEncryptionTest(bool serverSupportsEncryption) Assert.Equal(FakeNtlmServer.Flags.NegotiateSeal, (fakeNtlmServer.InitialClientFlags & FakeNtlmServer.Flags.NegotiateSeal)); byte[]? authenticateBlob = ntAuth.GetOutgoingBlob(challengeBlob, out statusCode); + Assert.Equal(NegotiateAuthenticationStatusCode.Completed, statusCode); + Assert.NotNull(authenticateBlob); - if (serverSupportsEncryption) - { - Assert.Equal(NegotiateAuthenticationStatusCode.Completed, statusCode); - Assert.NotNull(authenticateBlob); - // Validate that the NegotiateSeal flag survived the full exchange - Assert.Equal(FakeNtlmServer.Flags.NegotiateSeal, (fakeNtlmServer.NegotiatedFlags & FakeNtlmServer.Flags.NegotiateSeal)); - - byte[]? empty = fakeNtlmServer.GetOutgoingBlob(authenticateBlob); - Assert.Null(empty); - Assert.True(fakeNtlmServer.IsAuthenticated); - } - else - { - Assert.Equal(NegotiateAuthenticationStatusCode.QopNotSupported, statusCode); - } + byte[]? empty = fakeNtlmServer.GetOutgoingBlob(authenticateBlob); + Assert.Null(empty); + Assert.True(fakeNtlmServer.IsAuthenticated); + + // Validate that the NegotiateSeal flag survived the full exchange + Assert.Equal(FakeNtlmServer.Flags.NegotiateSeal, (fakeNtlmServer.NegotiatedFlags & FakeNtlmServer.Flags.NegotiateSeal)); } [ConditionalFact(nameof(IsNtlmAvailable))]