zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-04-30 02:37:49 +02:00
Code Issues Projects Releases Packages Wiki Activity

Renamed NTLMv2ClientChallengeStructure class to NTLMv2ClientChallenge

Browse source
This commit is contained in:
Tal Aloni 2017-01-19 21:51:18 +02:00
parent 1b8629ecb1
commit 017a96240f
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SMBLibrary/Authentication/AuthenticateMessage/NTLMv2ClientChallenge.cs
View file

@ -14,7 +14,7 @@ namespace SMBLibrary.Authentication
/// <summary> /// <summary>
/// NTLMv2_CLIENT_CHALLENGE /// NTLMv2_CLIENT_CHALLENGE
/// </summary> /// </summary>
public class NTLMv2ClientChallengeStructure public class NTLMv2ClientChallenge
{ {
public static readonly DateTime EpochTime = DateTime.FromFileTimeUtc(0); public static readonly DateTime EpochTime = DateTime.FromFileTimeUtc(0);
@ -26,11 +26,11 @@ namespace SMBLibrary.Authentication
public byte[] ClientChallenge; // 8-byte challenge message generated by the client public byte[] ClientChallenge; // 8-byte challenge message generated by the client
public KeyValuePairList<AVPairKey, byte[]> AVPairs; public KeyValuePairList<AVPairKey, byte[]> AVPairs;
public NTLMv2ClientChallengeStructure() public NTLMv2ClientChallenge()
{ {
} }
public NTLMv2ClientChallengeStructure(DateTime time, byte[] clientChallenge, string domainName, string computerName) public NTLMv2ClientChallenge(DateTime time, byte[] clientChallenge, string domainName, string computerName)
{ {
ResponseVersion = 1; ResponseVersion = 1;
ResponseVersionHigh = 1; ResponseVersionHigh = 1;
@ -41,11 +41,11 @@ namespace SMBLibrary.Authentication
AVPairs.Add(AVPairKey.NbComputerName, UnicodeEncoding.Unicode.GetBytes(computerName)); AVPairs.Add(AVPairKey.NbComputerName, UnicodeEncoding.Unicode.GetBytes(computerName));
} }
public NTLMv2ClientChallengeStructure(byte[] buffer) : this(buffer, 0) public NTLMv2ClientChallenge(byte[] buffer) : this(buffer, 0)
{ {
} }
public NTLMv2ClientChallengeStructure(byte[] buffer, int offset) public NTLMv2ClientChallenge(byte[] buffer, int offset)
{ {
ResponseVersion = ByteReader.ReadByte(buffer, offset + 0); ResponseVersion = ByteReader.ReadByte(buffer, offset + 0);
ResponseVersionHigh = ByteReader.ReadByte(buffer, offset + 1); ResponseVersionHigh = ByteReader.ReadByte(buffer, offset + 1);

4
SMBLibrary/Tests/AuthenticationTests.cs
View file

@ -74,7 +74,7 @@ namespace SMBLibrary
byte[] serverChallenge = new byte[] { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef }; byte[] serverChallenge = new byte[] { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef };
byte[] clientChallenge = new byte[] { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa }; byte[] clientChallenge = new byte[] { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa };
DateTime time = DateTime.FromFileTimeUtc(0); // same as new byte[8] DateTime time = DateTime.FromFileTimeUtc(0); // same as new byte[8]
NTLMv2ClientChallengeStructure clientChallengeStructure = new NTLMv2ClientChallengeStructure(time, clientChallenge, "Domain", "Server"); NTLMv2ClientChallenge clientChallengeStructure = new NTLMv2ClientChallenge(time, clientChallenge, "Domain", "Server");
byte[] clientChallengeStructurePadded = clientChallengeStructure.GetBytesPadded(); byte[] clientChallengeStructurePadded = clientChallengeStructure.GetBytesPadded();
byte[] clientNTProof = NTAuthentication.ComputeNTLMv2Proof(serverChallenge, clientChallengeStructurePadded, "Password", "User", "Domain"); byte[] clientNTProof = NTAuthentication.ComputeNTLMv2Proof(serverChallenge, clientChallengeStructurePadded, "Password", "User", "Domain");
@ -132,7 +132,7 @@ namespace SMBLibrary
byte[] clientChallenge = new byte[] { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa }; byte[] clientChallenge = new byte[] { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa };
byte[] serverAVPair = AVPairUtils.GetAVPairSequence("Domain", "Server"); byte[] serverAVPair = AVPairUtils.GetAVPairSequence("Domain", "Server");
DateTime time = DateTime.FromFileTimeUtc(0); // same as new byte[8] DateTime time = DateTime.FromFileTimeUtc(0); // same as new byte[8]
NTLMv2ClientChallengeStructure clientChallengeStructure = new NTLMv2ClientChallengeStructure(time, clientChallenge, "Domain", "Server"); NTLMv2ClientChallenge clientChallengeStructure = new NTLMv2ClientChallenge(time, clientChallenge, "Domain", "Server");
byte[] clientChallengeStructurePadded = clientChallengeStructure.GetBytesPadded(); byte[] clientChallengeStructurePadded = clientChallengeStructure.GetBytesPadded();
byte[] clientNTProof = NTAuthentication.ComputeNTLMv2Proof(serverChallenge, clientChallengeStructurePadded, "Password", "User", "Domain"); byte[] clientNTProof = NTAuthentication.ComputeNTLMv2Proof(serverChallenge, clientChallengeStructurePadded, "Password", "User", "Domain");