Moved NTLM code to Authentication\NTLM

SMBLibrary/Authentication/AuthenticateMessage/AVPairUtils.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Text;
 using Utilities;
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.NTLM
 {
     public class AVPairUtils
     {

SMBLibrary/Authentication/AuthenticateMessage/AuthenticationMessageUtils.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Text;
 using Utilities;
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.NTLM
 {
     public class AuthenticationMessageUtils
     {

SMBLibrary/Authentication/NTLMCryptography.cs

@@ -12,7 +12,7 @@ using System.Security.Cryptography;
 using System.Text;
 using Utilities;
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.NTLM
 {
     public class NTLMCryptography
     {

SMBLibrary/Authentication/AuthenticateMessage/AuthenticateMessage.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Text;
 using Utilities;
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.NTLM
 {
     /// <summary>
     /// [MS-NLMP] AUTHENTICATE_MESSAGE (Type 3 Message)

SMBLibrary/Authentication/AuthenticateMessage/ChallengeMessage.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Text;
 using Utilities;
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.NTLM
 {
     /// <summary>
     /// [MS-NLMP] CHALLENGE_MESSAGE (Type 2 Message)

SMBLibrary/Authentication/AuthenticateMessage/Enums/AVPairKey.cs

@@ -1,5 +1,5 @@
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.NTLM
 {
     public enum AVPairKey : ushort
     {

SMBLibrary/Authentication/AuthenticateMessage/Enums/MessageTypeName.cs

@@ -1,5 +1,5 @@
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.NTLM
 {
     public enum MessageTypeName : uint
     {

SMBLibrary/Authentication/AuthenticateMessage/Enums/NegotiateFlags.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.NTLM
 {
     [Flags]
     public enum NegotiateFlags : uint

SMBLibrary/Authentication/AuthenticateMessage/NTLMVersion.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Text;
 using Utilities;
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.NTLM
 {
     /// <summary>
     /// [MS-NLMP] 2.2.2.10 - VERSION

SMBLibrary/Authentication/AuthenticateMessage/NTLMv2ClientChallenge.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Text;
 using Utilities;
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.NTLM
 {
     /// <summary>
     /// NTLMv2_CLIENT_CHALLENGE

SMBLibrary/Authentication/AuthenticateMessage/NegotiateMessage.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Text;
 using Utilities;
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.NTLM
 {
     /// <summary>
     /// [MS-NLMP] NEGOTIATE_MESSAGE (Type 1 Message)

SMBLibrary/SMBLibrary.csproj

@@ -31,23 +31,23 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Authentication\AuthenticateMessage\AuthenticateMessage.cs" />
-    <Compile Include="Authentication\AuthenticateMessage\AuthenticationMessageUtils.cs" />
-    <Compile Include="Authentication\AuthenticateMessage\AVPairUtils.cs" />
-    <Compile Include="Authentication\AuthenticateMessage\ChallengeMessage.cs" />
-    <Compile Include="Authentication\AuthenticateMessage\Enums\AVPairKey.cs" />
-    <Compile Include="Authentication\AuthenticateMessage\Enums\MessageTypeName.cs" />
-    <Compile Include="Authentication\AuthenticateMessage\Enums\NegotiateFlags.cs" />
-    <Compile Include="Authentication\AuthenticateMessage\NegotiateMessage.cs" />
-    <Compile Include="Authentication\AuthenticateMessage\NTLMv2ClientChallenge.cs" />
-    <Compile Include="Authentication\AuthenticateMessage\NTLMVersion.cs" />
     <Compile Include="Authentication\GSSAPI\DerEncodingHelper.cs" />
     <Compile Include="Authentication\GSSAPI\GSSAPIHelper.cs" />
     <Compile Include="Authentication\GSSAPI\SimpleProtectedNegotiationToken.cs" />
     <Compile Include="Authentication\GSSAPI\SimpleProtectedNegotiationTokenInit.cs" />
     <Compile Include="Authentication\GSSAPI\SimpleProtectedNegotiationTokenResponse.cs" />
-    <Compile Include="Authentication\MD4.cs" />
-    <Compile Include="Authentication\NTLMCryptography.cs" />
+    <Compile Include="Authentication\NTLM\Helpers\AuthenticationMessageUtils.cs" />
+    <Compile Include="Authentication\NTLM\Helpers\AVPairUtils.cs" />
+    <Compile Include="Authentication\NTLM\Helpers\MD4.cs" />
+    <Compile Include="Authentication\NTLM\Helpers\NTLMCryptography.cs" />
+    <Compile Include="Authentication\NTLM\Structures\AuthenticateMessage.cs" />
+    <Compile Include="Authentication\NTLM\Structures\ChallengeMessage.cs" />
+    <Compile Include="Authentication\NTLM\Structures\Enums\AVPairKey.cs" />
+    <Compile Include="Authentication\NTLM\Structures\Enums\MessageTypeName.cs" />
+    <Compile Include="Authentication\NTLM\Structures\Enums\NegotiateFlags.cs" />
+    <Compile Include="Authentication\NTLM\Structures\NegotiateMessage.cs" />
+    <Compile Include="Authentication\NTLM\Structures\NTLMv2ClientChallenge.cs" />
+    <Compile Include="Authentication\NTLM\Structures\NTLMVersion.cs" />
     <Compile Include="Client\SMBClient.cs" />
     <Compile Include="Enums\NTStatus.cs" />
     <Compile Include="Enums\SMBTransportType.cs" />

SMBLibrary/Server/INTLMAuthenticationProvider.cs

@@ -7,7 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using SMBLibrary.Authentication;
+using SMBLibrary.Authentication.NTLM;
 
 namespace SMBLibrary.Server
 {

SMBLibrary/Server/IndependentUserCollection.cs

@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using System.Text;
 using Utilities;
 using SMBLibrary.Authentication;
+using SMBLibrary.Authentication.NTLM;
 
 namespace SMBLibrary.Server
 {

SMBLibrary/Server/SMB1/NegotiateHelper.cs

@@ -8,6 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using SMBLibrary.Authentication;
+using SMBLibrary.Authentication.NTLM;
 using SMBLibrary.SMB1;
 using Utilities;
 

SMBLibrary/Server/SMB1/SessionSetupHelper.cs

@@ -8,6 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using SMBLibrary.Authentication;
+using SMBLibrary.Authentication.NTLM;
 using SMBLibrary.SMB1;
 using Utilities;
 

SMBLibrary/Server/SMB2/SessionSetupHelper.cs

@@ -7,6 +7,7 @@
 using System;
 using System.Collections.Generic;
 using SMBLibrary.Authentication;
+using SMBLibrary.Authentication.NTLM;
 using SMBLibrary.SMB2;
 using Utilities;
 

SMBLibrary/Tests/AuthenticationTests.cs

@@ -8,7 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using Utilities;
-using SMBLibrary.Authentication;
+using SMBLibrary.Authentication.NTLM;
 
 namespace SMBLibrary
 {

SMBLibrary/Win32/Win32UserCollection.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Net;
 using System.Text;
 using Utilities;
-using SMBLibrary.Authentication;
+using SMBLibrary.Authentication.NTLM;
 using SMBLibrary.Win32.Security;
 using Microsoft.Win32;