zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-07-03 08:13:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

Renamed NTLMv1 Extended Security to NTLMv1 Extended Session Security

Browse source
This commit is contained in:
Tal Aloni 2017-09-02 12:41:37 +03:00
parent f973e56d25
commit d996cf430c
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
SMBLibrary/Authentication/NTLM/Helpers/AuthenticationMessageUtils.cs
View file

@ -59,18 +59,18 @@ namespace SMBLibrary.Authentication.NTLM
} }
/// <summary> /// <summary>
/// If NTLM v1 Extended Security is used, LMResponse starts with 8-byte challenge, followed by 16 bytes of padding (set to zero). /// If NTLM v1 Extended Session Security is used, LMResponse starts with 8-byte challenge, followed by 16 bytes of padding (set to zero).
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// LMResponse is 24 bytes for NTLM v1, NTLM v1 Extended Security and NTLM v2. /// LMResponse is 24 bytes for NTLM v1, NTLM v1 Extended Session Security and NTLM v2.
/// </remarks> /// </remarks>
public static bool IsNTLMv1ExtendedSecurity(byte[] lmResponse) public static bool IsNTLMv1ExtendedSessionSecurity(byte[] lmResponse)
{ {
if (lmResponse.Length == 24) if (lmResponse.Length == 24)
{ {
if (ByteUtils.AreByteArraysEqual(ByteReader.ReadBytes(lmResponse, 0, 8), new byte[8])) if (ByteUtils.AreByteArraysEqual(ByteReader.ReadBytes(lmResponse, 0, 8), new byte[8]))
{ {
// Challenge not present, cannot be NTLM v1 Extended Security // Challenge not present, cannot be NTLM v1 Extended Session Security
return false; return false;
} }
return ByteUtils.AreByteArraysEqual(ByteReader.ReadBytes(lmResponse, 8, 16), new byte[16]); return ByteUtils.AreByteArraysEqual(ByteReader.ReadBytes(lmResponse, 8, 16), new byte[16]);
@ -79,7 +79,7 @@ namespace SMBLibrary.Authentication.NTLM
} }
/// <remarks> /// <remarks>
/// NTLM v1 / NTLM v1 Extended Security NTResponse is 24 bytes. /// NTLM v1 / NTLM v1 Extended Session Security NTResponse is 24 bytes.
/// </remarks> /// </remarks>
public static bool IsNTLMv2NTResponse(byte[] ntResponse) public static bool IsNTLMv2NTResponse(byte[] ntResponse)
{ {

2
SMBLibrary/Authentication/NTLM/Helpers/NTLMCryptography.cs
View file

@ -28,7 +28,7 @@ namespace SMBLibrary.Authentication.NTLM
return DesLongEncrypt(hash, challenge); return DesLongEncrypt(hash, challenge);
} }
public static byte[] ComputeNTLMv1ExtendedSecurityResponse(byte[] serverChallenge, byte[] clientChallenge, string password) public static byte[] ComputeNTLMv1ExtendedSessionSecurityResponse(byte[] serverChallenge, byte[] clientChallenge, string password)
{ {
byte[] passwordHash = NTOWFv1(password); byte[] passwordHash = NTOWFv1(password);
byte[] challengeHash = MD5.Create().ComputeHash(ByteUtils.Concatenate(serverChallenge, clientChallenge)); byte[] challengeHash = MD5.Create().ComputeHash(ByteUtils.Concatenate(serverChallenge, clientChallenge));

8
SMBLibrary/Authentication/NTLM/IndependentNTLMAuthenticationProvider.cs
View file

@ -194,9 +194,9 @@ namespace SMBLibrary.Authentication.NTLM
byte[] keyExchangeKey = null; byte[] keyExchangeKey = null;
if ((message.NegotiateFlags & NegotiateFlags.ExtendedSessionSecurity) > 0) if ((message.NegotiateFlags & NegotiateFlags.ExtendedSessionSecurity) > 0)
{ {
if (AuthenticationMessageUtils.IsNTLMv1ExtendedSecurity(message.LmChallengeResponse)) if (AuthenticationMessageUtils.IsNTLMv1ExtendedSessionSecurity(message.LmChallengeResponse))
{ {
// NTLM v1 Extended Security: // NTLM v1 Extended Session Security:
success = AuthenticateV1Extended(password, serverChallenge, message.LmChallengeResponse, message.NtChallengeResponse); success = AuthenticateV1Extended(password, serverChallenge, message.LmChallengeResponse, message.NtChallengeResponse);
if (success) if (success)
{ {
@ -314,12 +314,12 @@ namespace SMBLibrary.Authentication.NTLM
} }
/// <summary> /// <summary>
/// LM v1 / NTLM v1 Extended Security /// LM v1 / NTLM v1 Extended Session Security
/// </summary> /// </summary>
private static bool AuthenticateV1Extended(string password, byte[] serverChallenge, byte[] lmResponse, byte[] ntResponse) private static bool AuthenticateV1Extended(string password, byte[] serverChallenge, byte[] lmResponse, byte[] ntResponse)
{ {
byte[] clientChallenge = ByteReader.ReadBytes(lmResponse, 0, 8); byte[] clientChallenge = ByteReader.ReadBytes(lmResponse, 0, 8);
byte[] expectedNTLMv1Response = NTLMCryptography.ComputeNTLMv1ExtendedSecurityResponse(serverChallenge, clientChallenge, password); byte[] expectedNTLMv1Response = NTLMCryptography.ComputeNTLMv1ExtendedSessionSecurityResponse(serverChallenge, clientChallenge, password);
return ByteUtils.AreByteArraysEqual(expectedNTLMv1Response, ntResponse); return ByteUtils.AreByteArraysEqual(expectedNTLMv1Response, ntResponse);
} }

4
SMBLibrary/Authentication/NTLM/Structures/AuthenticateMessage.cs
View file

@ -20,8 +20,8 @@ namespace SMBLibrary.Authentication.NTLM
public string Signature; // 8 bytes public string Signature; // 8 bytes
public MessageTypeName MessageType; public MessageTypeName MessageType;
public byte[] LmChallengeResponse; // 1 byte for anonymous authentication, 24 bytes for NTLM v1, NTLM v1 Extended Security and NTLM v2. public byte[] LmChallengeResponse; // 1 byte for anonymous authentication, 24 bytes for NTLM v1, NTLM v1 Extended Session Security and NTLM v2.
public byte[] NtChallengeResponse; // 0 bytes for anonymous authentication, 24 bytes for NTLM v1 and NTLM v1 Extended Security, >= 48 bytes for NTLM v2. public byte[] NtChallengeResponse; // 0 bytes for anonymous authentication, 24 bytes for NTLM v1 and NTLM v1 Extended Session Security, >= 48 bytes for NTLM v2.
public string DomainName; public string DomainName;
public string UserName; public string UserName;
public string WorkStation; public string WorkStation;

2
SMBLibrary/Server/SMB1/SessionSetupHelper.cs
View file

@ -149,7 +149,7 @@ namespace SMBLibrary.Server.SMB1
NegotiateFlags.Version | NegotiateFlags.Version |
NegotiateFlags.Use128BitEncryption | NegotiateFlags.Use128BitEncryption |
NegotiateFlags.Use56BitEncryption; NegotiateFlags.Use56BitEncryption;
if (AuthenticationMessageUtils.IsNTLMv1ExtendedSecurity(lmChallengeResponse) || if (AuthenticationMessageUtils.IsNTLMv1ExtendedSessionSecurity(lmChallengeResponse) ||
AuthenticationMessageUtils.IsNTLMv2NTResponse(ntChallengeResponse)) AuthenticationMessageUtils.IsNTLMv2NTResponse(ntChallengeResponse))
{ {
authenticateMessage.NegotiateFlags |= NegotiateFlags.ExtendedSessionSecurity; authenticateMessage.NegotiateFlags |= NegotiateFlags.ExtendedSessionSecurity;

2
SMBLibrary/Tests/NTLMSigningTests.cs
View file

@ -94,7 +94,7 @@ namespace SMBLibrary
return ByteUtils.AreByteArraysEqual(mic, expected); return ByteUtils.AreByteArraysEqual(mic, expected);
} }
public static bool TestNTLMv1ExtendedSecurityKeyExchangeMIC() public static bool TestNTLMv1ExtendedSessionSecurityKeyExchangeMIC()
{ {
string password = "Password"; string password = "Password";
byte[] type1 = new byte[] { 0x4e, 0x54, 0x4c, 0x4d, 0x53, 0x53, 0x50, 0x00, 0x01, 0x00, 0x00, 0x00, 0x97, 0x82, 0x08, 0xe2, byte[] type1 = new byte[] { 0x4e, 0x54, 0x4c, 0x4d, 0x53, 0x53, 0x50, 0x00, 0x01, 0x00, 0x00, 0x00, 0x97, 0x82, 0x08, 0xe2,