wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed how the sniffer calculates the sslFrame size, sslBytes, and the

Browse Source 
end of packet pointer. The end of packet pointer is based on sslFrame
and sslBytes. sslBytes is calculated from the total length in the IP
header, rather than the caplen. The caplen may include things like
Ethernet's FCS, which throws packet processing off.
This commit is contained in:
John Safranek
2019-08-29 17:36:34 -07:00
parent b2fb6d1a81
commit 725243b132
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sniffer.c
View File

@ -3052,7 +3052,9 @@ static int CheckHeaders(IpInfo* ipInfo, TcpInfo* tcpInfo, const byte* packet,
SetError(PACKET_HDR_SHORT_STR, error, NULL, 0); SetError(PACKET_HDR_SHORT_STR, error, NULL, 0);
return -1; return -1;
} }
*sslBytes = (int)(packet + length - *sslFrame); /* We only care about the data in the TCP/IP record. There may be extra
* data after the IP record for the FCS for Ethernet. */
*sslBytes = (int)(packet + ipInfo->total - *sslFrame);
return 0; return 0;
} }
@ -4069,7 +4071,7 @@ static int ssl_DecodePacketInternal(const byte* packet, int length,
TcpInfo tcpInfo; TcpInfo tcpInfo;
IpInfo ipInfo; IpInfo ipInfo;
const byte* sslFrame; const byte* sslFrame;
const byte* end = packet + length; const byte* end;
int sslBytes; /* ssl bytes unconsumed */ int sslBytes; /* ssl bytes unconsumed */
int ret; int ret;
SnifferSession* session = 0; SnifferSession* session = 0;
@ -4090,6 +4092,8 @@ static int ssl_DecodePacketInternal(const byte* packet, int length,
error) != 0) error) != 0)
return -1; return -1;
end = sslFrame + sslBytes;
ret = CheckSession(&ipInfo, &tcpInfo, sslBytes, &session, error); ret = CheckSession(&ipInfo, &tcpInfo, sslBytes, &session, error);
if (RemoveFatalSession(&ipInfo, &tcpInfo, session, error)) return -1; if (RemoveFatalSession(&ipInfo, &tcpInfo, session, error)) return -1;
else if (ret == -1) return -1; else if (ret == -1) return -1;