passepartoutvpn
/
tunnelkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Parse data opcode when decrypting 

Assume it could be DATA_V1/V2 regardless of peer-id.
This commit is contained in:
Davide De Rosa 2018-10-19 11:31:23 +02:00
parent 7c259bf40b
commit 70b50a7a2e
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TunnelKit/Sources/Core/CryptoAEAD.m
View File

@ -319,6 +319,10 @@ const NSInteger CryptoAEADTagLength = 16;
- (BOOL)decryptDataPacket:(NSData *)packet into:(uint8_t *)packetBytes length:(NSInteger *)packetLength packetId:(uint32_t *)packetId error:(NSError *__autoreleasing *)error
{
NSAssert(packet.length > 0, @"Decrypting an empty packet, how did it get this far?");
PacketCode code;
PacketOpcodeGet(packet.bytes, &code, NULL);
const uint8_t *extra = packet.bytes; // AD = header + peer id + packet id
if (!self.checkPeerId) {
extra += self.headerLength; // AD = packet id only

4
TunnelKit/Sources/Core/CryptoCBC.m
View File

@ -352,6 +352,10 @@ const NSInteger CryptoCBCMaxHMACLength = 100;
- (BOOL)decryptDataPacket:(NSData *)packet into:(uint8_t *)packetBytes length:(NSInteger *)packetLength packetId:(uint32_t *)packetId error:(NSError *__autoreleasing *)error
{
NSAssert(packet.length > 0, @"Decrypting an empty packet, how did it get this far?");
PacketCode code;
PacketOpcodeGet(packet.bytes, &code, NULL);
// skip header = (code, key)
const BOOL success = [self.crypto decryptBytes:(packet.bytes + self.headerLength)
length:(int)(packet.length - self.headerLength)

10
TunnelKit/Sources/Core/PacketMacros.h
View File

@ -62,6 +62,16 @@ typedef NS_ENUM(uint8_t, PacketCode) {
extern const uint8_t DataPacketPingData[16];
static inline void PacketOpcodeGet(const uint8_t *from, PacketCode *_Nullable code, uint8_t *_Nullable key)
{
if (code) {
*code = (PacketCode)(*from >> 3);
}
if (key) {
*key = *from & 0b111;
}
}
// Ruby: header
static inline int PacketHeaderSet(uint8_t *to, PacketCode code, uint8_t key, const uint8_t *_Nullable sessionId)
{