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

Minor improvements to SimpleProtectedNegotiationTokenInit implementation

Browse source
This commit is contained in:
Tal Aloni 2018-01-04 19:39:59 +02:00
parent 040b92b079
commit 0494fd758f
1 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

40
SMBLibrary/Authentication/GSSAPI/SPNEGO/SimpleProtectedNegotiationTokenInit.cs
View file

@ -100,30 +100,38 @@ namespace SMBLibrary.Authentication.GSSAPI
return buffer; return buffer;
} }
private int GetTokenFieldsLength() protected virtual int GetTokenFieldsLength()
{ {
int result = 0; int result = 0;
if (MechanismTypeList != null) if (MechanismTypeList != null)
{ {
int typeListSequenceLength = GetSequenceLength(MechanismTypeList); int typeListSequenceLength = GetMechanismTypeListSequenceLength(MechanismTypeList);
int typeListSequenceLengthFieldSize = DerEncodingHelper.GetLengthFieldSize(typeListSequenceLength); int typeListSequenceLengthFieldSize = DerEncodingHelper.GetLengthFieldSize(typeListSequenceLength);
int typeListConstructionLength = 1 + typeListSequenceLengthFieldSize + typeListSequenceLength; int typeListConstructionLength = 1 + typeListSequenceLengthFieldSize + typeListSequenceLength;
int typeListConstructionLengthFieldSize = DerEncodingHelper.GetLengthFieldSize(typeListConstructionLength); int typeListConstructionLengthFieldSize = DerEncodingHelper.GetLengthFieldSize(typeListConstructionLength);
int typeListLength = 1 + typeListConstructionLengthFieldSize + 1 + typeListSequenceLengthFieldSize + typeListSequenceLength; int entryLength = 1 + typeListConstructionLengthFieldSize + 1 + typeListSequenceLengthFieldSize + typeListSequenceLength;
result += typeListLength; result += entryLength;
} }
if (MechanismToken != null) if (MechanismToken != null)
{ {
int mechanismTokenBytesFieldSize = DerEncodingHelper.GetLengthFieldSize(MechanismToken.Length); int mechanismTokenLengthFieldSize = DerEncodingHelper.GetLengthFieldSize(MechanismToken.Length);
int mechanismTokenConstructionLength = 1 + mechanismTokenBytesFieldSize + MechanismToken.Length; int mechanismTokenConstructionLength = 1 + mechanismTokenLengthFieldSize + MechanismToken.Length;
int mechanismTokenConstructionLengthFieldSize = DerEncodingHelper.GetLengthFieldSize(mechanismTokenConstructionLength); int mechanismTokenConstructionLengthFieldSize = DerEncodingHelper.GetLengthFieldSize(mechanismTokenConstructionLength);
int tokenLength = 1 + mechanismTokenConstructionLengthFieldSize + 1 + mechanismTokenBytesFieldSize + MechanismToken.Length; int entryLength = 1 + mechanismTokenConstructionLengthFieldSize + 1 + mechanismTokenLengthFieldSize + MechanismToken.Length;;
result += tokenLength; result += entryLength;
}
if (MechanismListMIC != null)
{
int mechanismListMICLengthFieldSize = DerEncodingHelper.GetLengthFieldSize(MechanismListMIC.Length);
int mechanismListMICConstructionLength = 1 + mechanismListMICLengthFieldSize + MechanismListMIC.Length;
int mechanismListMICConstructionLengthFieldSize = DerEncodingHelper.GetLengthFieldSize(mechanismListMICConstructionLength);
int entryLength = 1 + mechanismListMICConstructionLengthFieldSize + 1 + mechanismListMICLengthFieldSize + MechanismListMIC.Length;
result += entryLength;
} }
return result; return result;
} }
private static List<byte[]> ReadMechanismTypeList(byte[] buffer, ref int offset) protected static List<byte[]> ReadMechanismTypeList(byte[] buffer, ref int offset)
{ {
List<byte[]> result = new List<byte[]>(); List<byte[]> result = new List<byte[]>();
int constructionLength = DerEncodingHelper.ReadLength(buffer, ref offset); int constructionLength = DerEncodingHelper.ReadLength(buffer, ref offset);
@ -148,7 +156,7 @@ namespace SMBLibrary.Authentication.GSSAPI
return result; return result;
} }
private static byte[] ReadMechanismToken(byte[] buffer, ref int offset) protected static byte[] ReadMechanismToken(byte[] buffer, ref int offset)
{ {
int constructionLength = DerEncodingHelper.ReadLength(buffer, ref offset); int constructionLength = DerEncodingHelper.ReadLength(buffer, ref offset);
byte tag = ByteReader.ReadByte(buffer, ref offset); byte tag = ByteReader.ReadByte(buffer, ref offset);
@ -161,7 +169,7 @@ namespace SMBLibrary.Authentication.GSSAPI
return token; return token;
} }
private static byte[] ReadMechanismListMIC(byte[] buffer, ref int offset) protected static byte[] ReadMechanismListMIC(byte[] buffer, ref int offset)
{ {
int constructionLength = DerEncodingHelper.ReadLength(buffer, ref offset); int constructionLength = DerEncodingHelper.ReadLength(buffer, ref offset);
byte tag = ByteReader.ReadByte(buffer, ref offset); byte tag = ByteReader.ReadByte(buffer, ref offset);
@ -173,7 +181,7 @@ namespace SMBLibrary.Authentication.GSSAPI
return ByteReader.ReadBytes(buffer, ref offset, length); return ByteReader.ReadBytes(buffer, ref offset, length);
} }
private static int GetSequenceLength(List<byte[]> mechanismTypeList) protected static int GetMechanismTypeListSequenceLength(List<byte[]> mechanismTypeList)
{ {
int sequenceLength = 0; int sequenceLength = 0;
foreach (byte[] mechanismType in mechanismTypeList) foreach (byte[] mechanismType in mechanismTypeList)
@ -185,9 +193,9 @@ namespace SMBLibrary.Authentication.GSSAPI
return sequenceLength; return sequenceLength;
} }
private static void WriteMechanismTypeList(byte[] buffer, ref int offset, List<byte[]> mechanismTypeList) protected static void WriteMechanismTypeList(byte[] buffer, ref int offset, List<byte[]> mechanismTypeList)
{ {
int sequenceLength = GetSequenceLength(mechanismTypeList); int sequenceLength = GetMechanismTypeListSequenceLength(mechanismTypeList);
int sequenceLengthFieldSize = DerEncodingHelper.GetLengthFieldSize(sequenceLength); int sequenceLengthFieldSize = DerEncodingHelper.GetLengthFieldSize(sequenceLength);
int constructionLength = 1 + sequenceLengthFieldSize + sequenceLength; int constructionLength = 1 + sequenceLengthFieldSize + sequenceLength;
ByteWriter.WriteByte(buffer, ref offset, MechanismTypeListTag); ByteWriter.WriteByte(buffer, ref offset, MechanismTypeListTag);
@ -202,7 +210,7 @@ namespace SMBLibrary.Authentication.GSSAPI
} }
} }
private static void WriteMechanismToken(byte[] buffer, ref int offset, byte[] mechanismToken) protected static void WriteMechanismToken(byte[] buffer, ref int offset, byte[] mechanismToken)
{ {
int constructionLength = 1 + DerEncodingHelper.GetLengthFieldSize(mechanismToken.Length) + mechanismToken.Length; int constructionLength = 1 + DerEncodingHelper.GetLengthFieldSize(mechanismToken.Length) + mechanismToken.Length;
ByteWriter.WriteByte(buffer, ref offset, MechanismTokenTag); ByteWriter.WriteByte(buffer, ref offset, MechanismTokenTag);
@ -212,7 +220,7 @@ namespace SMBLibrary.Authentication.GSSAPI
ByteWriter.WriteBytes(buffer, ref offset, mechanismToken); ByteWriter.WriteBytes(buffer, ref offset, mechanismToken);
} }
private static void WriteMechanismListMIC(byte[] buffer, ref int offset, byte[] mechanismListMIC) protected static void WriteMechanismListMIC(byte[] buffer, ref int offset, byte[] mechanismListMIC)
{ {
int mechanismListMICLengthFieldSize = DerEncodingHelper.GetLengthFieldSize(mechanismListMIC.Length); int mechanismListMICLengthFieldSize = DerEncodingHelper.GetLengthFieldSize(mechanismListMIC.Length);
ByteWriter.WriteByte(buffer, ref offset, MechanismListMICTag); ByteWriter.WriteByte(buffer, ref offset, MechanismListMICTag);