Merge pull request #2803 from BrzVlad/feature-conc-pinned-scan

[mono.git] / mcs / class / Mono.Security / Mono.Security.Protocol.Ntlm / Type3Message.cs

diff --git a/mcs/class/Mono.Security/Mono.Security.Protocol.Ntlm/Type3Message.cs b/mcs/class/Mono.Security/Mono.Security.Protocol.Ntlm/Type3Message.cs
index d80a50be699ed7494cb41f1536a51671c0e51722..ddb44b2dfde08ff754f5125a6375c94b2fe2d6fd 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.Protocol.Ntlm/Type3Message.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Protocol.Ntlm/Type3Message.cs
@@ -39,12 +39,7 @@ using System.Text;
 
 namespace Mono.Security.Protocol.Ntlm {
 
-#if INSIDE_SYSTEM
-       internal
-#else
-       public
-#endif
-       class Type3Message : MessageBase {
+       public class Type3Message : MessageBase {
 
                private NtlmAuthLevel _level;
                private byte[] _challenge;
@@ -89,7 +84,7 @@ namespace Mono.Security.Protocol.Ntlm {
                public Type3Message (Type2Message type2) : base (3)
                {
                        _type2 = type2;
-                       _level = DefaultAuthLevel;
+                       _level = NtlmSettings.DefaultAuthLevel;
                        _challenge = (byte[]) type2.Nonce.Clone ();
 
                        _domain = type2.TargetName;
@@ -117,12 +112,10 @@ namespace Mono.Security.Protocol.Ntlm {
                }
 
                // Default auth level
-
-               static NtlmAuthLevel _default = NtlmAuthLevel.LM_and_NTLM_and_try_NTLMv2_Session;
-
+               [Obsolete ("Use NtlmSettings.DefaultAuthLevel")]
                public static NtlmAuthLevel DefaultAuthLevel {
-                       get { return _default; }
-                       set { _default = value; }
+                       get { return NtlmSettings.DefaultAuthLevel; }
+                       set { NtlmSettings.DefaultAuthLevel = value; }
                }
 
                public NtlmAuthLevel Level {
@@ -271,11 +264,13 @@ namespace Mono.Security.Protocol.Ntlm {
                                        throw new InvalidOperationException (
                                                "Refusing to use legacy-mode LM/NTLM authentication " +
                                                        "unless explicitly enabled using DefaultAuthLevel.");
-                               
+
+                               #pragma warning disable 618
                                using (var legacy = new ChallengeResponse (_password, _challenge)) {
                                        lm = legacy.LM;
                                        ntlm = legacy.NT;
                                }
+                               #pragma warning restore 618
                        } else {
                                ChallengeResponse2.Compute (_type2, _level, _username, _password, _domain, out lm, out ntlm);
                        }