IndependentUserCollection: Renamed parameters and variables

This commit is contained in:
Tal Aloni 2017-01-19 02:13:22 +02:00
parent 29828befb4
commit 1b8629ecb1

View file

@ -28,7 +28,7 @@ namespace SMBLibrary.Server
/// <summary> /// <summary>
/// LM v1 / NTLM v1 /// LM v1 / NTLM v1
/// </summary> /// </summary>
private User AuthenticateV1(string accountNameToAuth, byte[] serverChallenge, byte[] lmResponse, byte[] ntlmResponse) private User AuthenticateV1(string accountNameToAuth, byte[] serverChallenge, byte[] lmResponse, byte[] ntResponse)
{ {
for (int index = 0; index < this.Count; index++) for (int index = 0; index < this.Count; index++)
{ {
@ -43,8 +43,8 @@ namespace SMBLibrary.Server
return this[index]; return this[index];
} }
byte[] expectedNTLMResponse = NTAuthentication.ComputeNTLMv1Response(serverChallenge, password); byte[] expectedNTResponse = NTAuthentication.ComputeNTLMv1Response(serverChallenge, password);
if (ByteUtils.AreByteArraysEqual(expectedNTLMResponse, ntlmResponse)) if (ByteUtils.AreByteArraysEqual(expectedNTResponse, ntResponse))
{ {
return this[index]; return this[index];
} }
@ -56,7 +56,7 @@ namespace SMBLibrary.Server
/// <summary> /// <summary>
/// LM v1 / NTLM v1 Extended Security /// LM v1 / NTLM v1 Extended Security
/// </summary> /// </summary>
private User AuthenticateV1Extended(string accountNameToAuth, byte[] serverChallenge, byte[] lmResponse, byte[] ntlmResponse) private User AuthenticateV1Extended(string accountNameToAuth, byte[] serverChallenge, byte[] lmResponse, byte[] ntResponse)
{ {
for (int index = 0; index < this.Count; index++) for (int index = 0; index < this.Count; index++)
{ {
@ -68,7 +68,7 @@ namespace SMBLibrary.Server
byte[] clientChallenge = ByteReader.ReadBytes(lmResponse, 0, 8); byte[] clientChallenge = ByteReader.ReadBytes(lmResponse, 0, 8);
byte[] expectedNTLMv1Response = NTAuthentication.ComputeNTLMv1ExtendedSecurityResponse(serverChallenge, clientChallenge, password); byte[] expectedNTLMv1Response = NTAuthentication.ComputeNTLMv1ExtendedSecurityResponse(serverChallenge, clientChallenge, password);
if (ByteUtils.AreByteArraysEqual(expectedNTLMv1Response, ntlmResponse)) if (ByteUtils.AreByteArraysEqual(expectedNTLMv1Response, ntResponse))
{ {
return this[index]; return this[index];
} }
@ -80,7 +80,7 @@ namespace SMBLibrary.Server
/// <summary> /// <summary>
/// LM v2 / NTLM v2 /// LM v2 / NTLM v2
/// </summary> /// </summary>
private User AuthenticateV2(string domainNameToAuth, string accountNameToAuth, byte[] serverChallenge, byte[] lmResponse, byte[] ntlmResponse) private User AuthenticateV2(string domainNameToAuth, string accountNameToAuth, byte[] serverChallenge, byte[] lmResponse, byte[] ntResponse)
{ {
for (int index = 0; index < this.Count; index++) for (int index = 0; index < this.Count; index++)
{ {
@ -96,10 +96,10 @@ namespace SMBLibrary.Server
return this[index]; return this[index];
} }
if (ntlmResponse.Length >= 48) if (ntResponse.Length >= 48)
{ {
byte[] clientNTProof = ByteReader.ReadBytes(ntlmResponse, 0, 16); byte[] clientNTProof = ByteReader.ReadBytes(ntResponse, 0, 16);
byte[] clientChallengeStructurePadded = ByteReader.ReadBytes(ntlmResponse, 16, ntlmResponse.Length - 16); byte[] clientChallengeStructurePadded = ByteReader.ReadBytes(ntResponse, 16, ntResponse.Length - 16);
byte[] expectedNTProof = NTAuthentication.ComputeNTLMv2Proof(serverChallenge, clientChallengeStructurePadded, password, accountName, domainNameToAuth); byte[] expectedNTProof = NTAuthentication.ComputeNTLMv2Proof(serverChallenge, clientChallengeStructurePadded, password, accountName, domainNameToAuth);
if (ByteUtils.AreByteArraysEqual(clientNTProof, expectedNTProof)) if (ByteUtils.AreByteArraysEqual(clientNTProof, expectedNTProof))