Backups/SA-MP
1
0
Fork 0
mirror of https://github.com/dashr9230/SA-MP.git synced 2025-07-18 17:38:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[raknet] Refactor

Browse Source
This commit is contained in:
RD42
2025-04-26 12:29:16 -07:00
parent 5e4c220377
commit a94c99af0f
3 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
raknet/RPCMap.cpp
View File

@ -39,7 +39,7 @@ void RPCMap::Clear(void)
}
RPCNode *RPCMap::GetNodeFromIndex(RPCIndex index)
{
return rpcSet[(unsigned)index];;
return rpcSet[(unsigned)index];
}
RPCNode *RPCMap::GetNodeFromFunctionName(unsigned char uniqueIdentifier)
{
@ -62,4 +62,3 @@ void RPCMap::AddIdentifierWithFunction(unsigned char uniqueIdentifier, void *fun
rpcSet[uniqueIdentifier] = node;
}

29
raknet/TEABlockEncryptor.cpp
View File

@ -1,3 +1,4 @@
#include "TEABlockEncryptor.h"
#include "CheckSum.h"
#include "Rand.h"
@ -46,7 +47,7 @@ TEABlockEncryptor::~TEABlockEncryptor()
// Note: This is not virtual
// Make it cascaded virtual before adding any code here!
}
bool TEABlockEncryptor::IsKeySet( void ) const
{
return keySet;
@ -90,12 +91,6 @@ void TEABlockEncryptor::Encrypt( unsigned char *input, int inputLength, unsigned
totalLength = inputLength + sizeof( checkSum ) + sizeof( encodedPad );
paddingBytes = 0;
/*if (totalLength < 16)
{
paddingBytes = 16 - totalLength;
}
else
*/
if ((totalLength % 8) != 0)
{
paddingBytes = 8 - (totalLength % 8);
@ -139,14 +134,11 @@ void TEABlockEncryptor::Encrypt( unsigned char *input, int inputLength, unsigned
unsigned int &V0 = *(reinterpret_cast<unsigned int*>(output+i));
unsigned int &V1 = *(reinterpret_cast<unsigned int*>(output+i+sizeof(unsigned int)));
EncryptBlock(V0, V1);
//*(reinterpret_cast<unsigned int*>(output+i)+0) = V0;
//*(reinterpret_cast<unsigned int*>(output+i)+1) = V1;
}
#ifdef _DEBUG
DumpMemory("PostEncrypt", output, *outputLength);
#endif
}
bool TEABlockEncryptor::Decrypt( unsigned char *input, int inputLength, unsigned char *output, int *outputLength )
@ -175,8 +167,6 @@ bool TEABlockEncryptor::Decrypt( unsigned char *input, int inputLength, unsigned
unsigned int &V0 = *(reinterpret_cast<unsigned int*>(input+i));
unsigned int &V1 = *(reinterpret_cast<unsigned int*>(input+i+sizeof(unsigned int)));
DecryptBlock(V0, V1);
//*(reinterpret_cast<unsigned int*>(input+i)+0) = V0;
//*(reinterpret_cast<unsigned int*>(input+i)+1) = V1;
}
#ifdef _DEBUG
@ -197,7 +187,7 @@ bool TEABlockEncryptor::Decrypt( unsigned char *input, int inputLength, unsigned
// Calculate the checksum on the data.
checkSumCalculator.Add( input + sizeof( checkSum ), *outputLength + sizeof( encodedPad ) + paddingBytes );
checkSumInt = checkSumCalculator.Get();
checkSumInt = ( (checkSumInt << 4) ^ (checkSumInt) ) & 0xFF;
@ -211,14 +201,13 @@ bool TEABlockEncryptor::Decrypt( unsigned char *input, int inputLength, unsigned
memcpy( output, input + sizeof( checkSum ) + sizeof( encodedPad ) + paddingBytes, *outputLength );
return true;
}
void TEABlockEncryptor::EncryptBlock(unsigned int &V0, unsigned int &V1)
{
unsigned int sum = 0;
for(unsigned int i=0; i<TEA_ROUNDS; i++)
for(unsigned int i=0; i<TEA_ROUNDS; i++)
{
V0 += ((V1 << 4 ^ V1 >> 5) + V1) ^ (sum + key[sum & 3]);
sum += initDelta;
@ -230,10 +219,10 @@ void TEABlockEncryptor::DecryptBlock(unsigned int &V0, unsigned int &V1)
{
unsigned int sum = initSum;
for(unsigned int i=0; i<TEA_ROUNDS; i++)
for(unsigned int i=0; i<TEA_ROUNDS; i++)
{
V1 -= ((V0 << 4 ^ V0 >> 5) + V0) ^ (sum + key[sum>>11 & 3]);
sum -= initDelta;
V0 -= ((V1 << 4 ^ V1 >> 5) + V1) ^ (sum + key[sum & 3]);
}
V1 -= ((V0 << 4 ^ V0 >> 5) + V0) ^ (sum + key[sum>>11 & 3]);
sum -= initDelta;
V0 -= ((V1 << 4 ^ V1 >> 5) + V1) ^ (sum + key[sum & 3]);
}
}

9
raknet/TEABlockEncryptor.h
View File

@ -9,19 +9,17 @@
class TEABlockEncryptor :
public DataBlockEncryptor
{
public:
TEABlockEncryptor();
~TEABlockEncryptor();
bool IsKeySet( void ) const;
void SetKey( const unsigned char key[ 16 ] );
void UnsetKey( void );
void Encrypt( unsigned char *input, int inputLength, unsigned char *output, int *outputLength );
bool Decrypt( unsigned char *input, int inputLength, unsigned char *output, int *outputLength );
protected:
protected:
unsigned char key[ 16 ];
unsigned int initSum;
unsigned int initDelta;
@ -30,7 +28,6 @@ protected:
void EncryptBlock(unsigned int &V0, unsigned int &V1);
void DecryptBlock(unsigned int &V0, unsigned int &V1);
};
#endif