wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 03:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sniffer Update

Browse Source 
1. Adds a new function ssl_DecodePacketWithSessionInfo() that returns a
copy of the TLS session info (version and suite ID) for the packet that
is decoded.
2. Adds a new function DecodePacketInternal() that does the same work as
the old DecodePacket() with the additional Session Info behavior.
3. Both DecodePacket public functions call the internal version.
This commit is contained in:
John Safranek
2018-11-16 14:21:36 -08:00
parent d2989d9f43
commit 6ee60bbb49
2 changed files with 68 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/sniffer.c
View File

@@ -3467,7 +3467,8 @@ static int RemoveFatalSession(IpInfo* ipInfo, TcpInfo* tcpInfo,
/* Passes in an IP/TCP packet for decoding (ethernet/localhost frame) removed */
/* returns Number of bytes on success, 0 for no data yet, and -1 on error */
int ssl_DecodePacket(const byte* packet, int length, byte** data, char* error)
static int ssl_DecodePacketInternal(const byte* packet, int length,
byte** data, SSLInfo* sslInfo, char* error)
{
TcpInfo tcpInfo;
IpInfo ipInfo;
@@ -3477,6 +3478,9 @@ int ssl_DecodePacket(const byte* packet, int length, byte** data, char* error)
int ret;
SnifferSession* session = 0;
if (NULL != sslInfo)
XMEMSET(sslInfo, 0, sizeof(SSLInfo));
if (CheckHeaders(&ipInfo, &tcpInfo, packet, length, &sslFrame, &sslBytes,
error) != 0)
return -1;
@@ -3500,10 +3504,42 @@ int ssl_DecodePacket(const byte* packet, int length, byte** data, char* error)
ret = ProcessMessage(sslFrame, session, sslBytes, data, end, error);
if (RemoveFatalSession(&ipInfo, &tcpInfo, session, error)) return -1;
CheckFinCapture(&ipInfo, &tcpInfo, session);
/* Pass back Session Info after we have processed the Server Hello. */
if ((NULL != sslInfo) && (0 != session->sslServer->options.cipherSuite)) {
sslInfo->isValid = 1;
sslInfo->protocolVersionMajor = session->sslServer->version.major;
sslInfo->protocolVersionMinor = session->sslServer->version.minor;
sslInfo->serverCipherSuite0 = session->sslServer->options.cipherSuite0;
sslInfo->serverCipherSuite = session->sslServer->options.cipherSuite;
const char* pCipher = wolfSSL_get_cipher(session->sslServer);
if (pCipher)
XMEMCPY(sslInfo->serverCipherSuiteName, pCipher,
sizeof(sslInfo->serverCipherSuiteName) - 1);
}
return ret;
}
/* Passes in an IP/TCP packet for decoding (ethernet/localhost frame) removed */
/* returns Number of bytes on success, 0 for no data yet, and -1 on error */
/* Also returns Session Info if available */
int ssl_DecodePacketWithSessionInfo(const unsigned char* packet, int length,
unsigned char** data, SSLInfo* sslInfo, char* error)
{
return ssl_DecodePacketInternal(packet, length, data, sslInfo, error);
}
/* Passes in an IP/TCP packet for decoding (ethernet/localhost frame) removed */
/* returns Number of bytes on success, 0 for no data yet, and -1 on error */
int ssl_DecodePacket(const byte* packet, int length, byte** data, char* error)
{
return ssl_DecodePacketInternal(packet, length, data, NULL, error);
}
/* Deallocator for the decoded data buffer. */
/* returns 0 on success, -1 on error */
int ssl_FreeDecodeBuffer(byte** data, char* error)

31
wolfssl/sniffer.h
View File

@@ -93,6 +93,37 @@ enum {
};
/*
* New Sniffer API that provides read-only access to the TLS and cipher
* information associated with the SSL session.
*/
#if defined(__GNUC__)
#define WOLFSSL_PACK __attribute__ ((packed))
#else
#define WOLFSSL_PACK
#endif
typedef struct SSLInfo
{
unsigned char isValid;
/* indicates if the info in this struct is valid: 0 = no, 1 = yes */
unsigned char protocolVersionMajor; /* SSL Version: major */
unsigned char protocolVersionMinor; /* SSL Version: minor */
unsigned char serverCipherSuite0; /* first byte, normally 0 */
unsigned char serverCipherSuite; /* second byte, actual suite */
unsigned char serverCipherSuiteName[256];
/* cipher name, e.g., "TLS_RSA_..." */
} WOLFSSL_PACK SSLInfo;
WOLFSSL_API
SSL_SNIFFER_API int ssl_DecodePacketWithSessionInfo(
const unsigned char* packet, int length,
unsigned char** data, SSLInfo* sslInfo, char* error);
#ifdef __cplusplus
} /* extern "C" */
#endif