MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-26 05:03:15 +00:00
Code Issues Releases Wiki Activity

Addressed IOActive issues

Browse Source
This commit is contained in:
Bryan Roe
2020-07-15 01:24:56 -07:00
parent 70593e995b
commit 67fc6c54b1
14 changed files with 65 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
microstack/ILibParsers.c
View File

@@ -6779,13 +6779,13 @@ void ILibencodeblock( unsigned char in[3], unsigned char out[4], int len )
out[3] = (unsigned char) (len > 2 ? cb64[ in[2] & 0x3f ] : '=');
}
/*! \fn int ILibBase64EncodeLength(const int inputLen)
/*! \fn size_t ILibBase64EncodeLength(size_t inputLen)
\brief Returns the length the ILibBase64Encode function would use a stream adding padding and line breaks as per spec.
\par
\param input The length of the en-encoded data
\return The length of the encoded stream
*/
int ILibBase64EncodeLength(const int inputLen)
size_t ILibBase64EncodeLength(size_t inputLen)
{
return ((inputLen * 4) / 3) + 5;
}
@@ -6841,15 +6841,15 @@ void ILibdecodeblock( unsigned char in[4], unsigned char out[3] )
out[ 2 ] = (unsigned char ) (((in[2] << 6) & 0xc0) | in[3]);
}
/*! \fn int ILibBase64DecodeLength(const int inputLen)
/*! \fn size_t ILibBase64DecodeLength(size_t inputLen)
\brief Returns the length the ILibBase64Decode function would use to store the decoded string value
\par
\param input The length of the en-encoded data
\return The length of the decoded stream
*/
int ILibBase64DecodeLength(const int inputLen)
size_t ILibBase64DecodeLength(size_t inputLen)
{
return ((inputLen * 3) / 4) + 4;
return(((inputLen * 3) / 4) + 4);
}
int ILibBase64DecodeEx(unsigned char* input, const int inputlen, unsigned char* output)

4
microstack/ILibParsers.h
View File

@@ -1392,8 +1392,8 @@ int ILibIsRunningOnChainThread(void* chain);
/* Base64 handling methods */
int ILibBase64EncodeLength(const int inputLen);
int ILibBase64DecodeLength(const int inputLen);
size_t ILibBase64EncodeLength(size_t inputLen);
size_t ILibBase64DecodeLength(size_t inputLen);
int ILibBase64Encode(unsigned char* input, const int inputlen, unsigned char** output);
int ILibBase64Decode(unsigned char* input, const int inputlen, unsigned char** output);
int ILibBase64DecodeEx(unsigned char* input, const int inputlen, unsigned char* output);

9
microstack/ILibSimpleDataStore.c
View File

@@ -814,10 +814,14 @@ __EXPORT_TYPE int ILibSimpleDataStore_GetEx(ILibSimpleDataStore dataStore, char*
return(centry->valueLength);
}
else
else if(buffer == NULL)
{
return(centry->valueLength);
}
else
{
return(0);
}
}
}
@@ -869,7 +873,8 @@ __EXPORT_TYPE int ILibSimpleDataStore_GetEx(ILibSimpleDataStore dataStore, char*
return(0);
}
}
return entry->valueLength;
return(buffer == NULL ? entry->valueLength : 0);
}
// Get the reference to the SHA384 hash value from the datastore for a given a key.