TerribleCodeClub/romulus
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: TerribleCodeClub:56b645db4701194bb0c0d6714cbfb0c4a86f4e02
Branches Tags
TerribleCodeClub:master
TerribleCodeClub:chat_struct_crypto
...
compare: TerribleCodeClub:c7375ad44b1be54aeac6a34fe3a2291a3b2efaa7
Branches Tags
TerribleCodeClub:chat_struct_crypto
TerribleCodeClub:master

2 Commits
56b645db47 ... c7375ad44b

Author SHA1 Message Date
Simon Maddocks
c7375ad44b Merge branch 'chat_struct_crypto' of git.jacknet.io:TerribleCodeClub/romulus into chat_struct_crypto 2022-02-02 02:02:05 +00:00
Simon Maddocks
9f0a623f7c Fix authenticated data endian issue 2022-02-02 02:01:56 +00:00
1 changed files with 5 additions and 3 deletions
Show Stats Expand all files Collapse all files

8
Romulus-M/encrypt_wrapper.c
View File

@ -48,6 +48,7 @@ int encrypt(packet *packet, unsigned char *outBuf, UINT16 *len, unsigned char *k
unsigned char *m = packet->Data; unsigned char *m = packet->Data;
// additional text // additional text
packet->DataType = __bswap_16(packet->DataType);
int adlen = sizeof(packet->DataType); int adlen = sizeof(packet->DataType);
unsigned char *ad = (unsigned char *)&packet->DataType; unsigned char *ad = (unsigned char *)&packet->DataType;
@ -66,8 +67,6 @@ int encrypt(packet *packet, unsigned char *outBuf, UINT16 *len, unsigned char *k
} }
// type 0 1 // type 0 1
// Swap after adding it as additional data
packet->DataType = __bswap_16(packet->DataType);
int loc = 0; int loc = 0;
memcpy(&outBuf[loc], &packet->DataType, sizeof(UINT16)); memcpy(&outBuf[loc], &packet->DataType, sizeof(UINT16));
loc += sizeof(UINT16); loc += sizeof(UINT16);
@ -102,6 +101,7 @@ int decrypt(packetEx *packet, unsigned char *inBuf, UINT16 len, unsigned char *k
{ {
return 1; return 1;
} }
DEBUG_PRINT("line %d\n", __LINE__); DEBUG_PRINT("line %d\n", __LINE__);
memcpy(&packet->DataType, &inBuf[loc], sizeof(UINT16)); memcpy(&packet->DataType, &inBuf[loc], sizeof(UINT16));
loc += sizeof(UINT16); loc += sizeof(UINT16);
@ -110,7 +110,6 @@ int decrypt(packetEx *packet, unsigned char *inBuf, UINT16 len, unsigned char *k
memcpy(&packet->Size, &inBuf[loc], sizeof(UINT16)); memcpy(&packet->Size, &inBuf[loc], sizeof(UINT16));
loc += sizeof(UINT16); loc += sizeof(UINT16);
packet->DataType = __bswap_16(packet->DataType);
packet->Size = __bswap_16(packet->Size); packet->Size = __bswap_16(packet->Size);
packet->Id = __bswap_32(packet->Id); packet->Id = __bswap_32(packet->Id);
@ -143,6 +142,9 @@ int decrypt(packetEx *packet, unsigned char *inBuf, UINT16 len, unsigned char *k
DEBUG_PRINT("line %d mlen:%d clen:%d\n", __LINE__, mlen, clen); DEBUG_PRINT("line %d mlen:%d clen:%d\n", __LINE__, mlen, clen);
int ret = romulus_m_decrypt(m, &mlen, 0, c, clen, ad, adlen, npub, key); int ret = romulus_m_decrypt(m, &mlen, 0, c, clen, ad, adlen, npub, key);
DEBUG_PRINT("line %d packet:%d, mlen %d\n", __LINE__, packet->Size, mlen); DEBUG_PRINT("line %d packet:%d, mlen %d\n", __LINE__, packet->Size, mlen);
// swap after decrypt, we sign the big endian bytes
packet->DataType = __bswap_16(packet->DataType);
if (ret == 0) if (ret == 0)
{ {
DEBUG_PRINT("line %d\n", __LINE__); DEBUG_PRINT("line %d\n", __LINE__);