Skip to content

Commit 8eaf29f

Browse files
committed
tls: BUGFIX replaced unknown uint with size_t, add missing header file
1 parent 51a1d3f commit 8eaf29f

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

process/quic_parser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ inline void QUICParser::quic_skip_ack1(uint8_t *start, uint64_t &offset)
660660

661661
quic_get_variable_length(start, offset);
662662

663-
for (uint x = 0; x < quic_ack_range_count; x++) {
663+
for (uint64_t x = 0; x < quic_ack_range_count; x++) {
664664
quic_get_variable_length(start, offset);
665665
quic_get_variable_length(start, offset);
666666
}
@@ -677,7 +677,7 @@ inline void QUICParser::quic_skip_ack2(uint8_t *start, uint64_t &offset)
677677

678678
quic_get_variable_length(start, offset);
679679

680-
for (uint x = 0; x < quic_ack_range_count; x++) {
680+
for (uint64_t x = 0; x < quic_ack_range_count; x++) {
681681
quic_get_variable_length(start, offset);
682682
quic_get_variable_length(start, offset);
683683
}

process/tls_parser.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*/
1212

1313
#include "tls_parser.hpp"
14+
#include <endian.h>
1415

1516
namespace ipxp {
1617
TLSParser::TLSParser()
@@ -61,7 +62,7 @@ bool TLSParser::tls_is_grease_value(uint16_t val)
6162
return false;
6263
}
6364

64-
void TLSParser::tls_get_quic_user_agent(TLSData &data, char *buffer, uint buffer_size)
65+
void TLSParser::tls_get_quic_user_agent(TLSData &data, char *buffer, size_t buffer_size)
6566
{
6667
// compute end of quic_transport_parameters
6768
const uint16_t quic_transport_params_len = ntohs(*(uint16_t *) data.start);
@@ -92,12 +93,12 @@ void TLSParser::tls_get_quic_user_agent(TLSData &data, char *buffer, uint buffer
9293
return;
9394
}
9495

95-
void TLSParser::tls_get_server_name(TLSData &data, char *buffer, uint buffer_size)
96+
void TLSParser::tls_get_server_name(TLSData &data, char *buffer, size_t buffer_size)
9697
{
9798
uint16_t list_len = ntohs(*(uint16_t *) data.start);
9899
uint16_t offset = sizeof(list_len);
99100
const uint8_t *list_end = data.start + list_len + offset;
100-
uint buff_offset = 0;
101+
size_t buff_offset = 0;
101102

102103
if (list_end > data.end) {
103104
// data.valid = false;
@@ -125,7 +126,7 @@ void TLSParser::tls_get_server_name(TLSData &data, char *buffer, uint buffer_siz
125126
return;
126127
}
127128

128-
void TLSParser::tls_get_alpn(TLSData &data, char *buffer, uint buffer_size)
129+
void TLSParser::tls_get_alpn(TLSData &data, char *buffer, size_t buffer_size)
129130
{
130131
uint16_t list_len = ntohs(*(uint16_t *) data.start);
131132
uint16_t offset = sizeof(list_len);

process/tls_parser.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ class TLSParser
8484
bool tls_skip_compression_met(TLSData&);
8585
bool tls_check_ext_len(TLSData&);
8686
bool tls_check_rec(TLSData&);
87-
void tls_get_server_name(TLSData &, char *, uint);
88-
void tls_get_alpn(TLSData &, char *, uint);
87+
void tls_get_server_name(TLSData &, char *, size_t);
88+
void tls_get_alpn(TLSData &, char *, size_t);
8989

90-
void tls_get_quic_user_agent(TLSData &, char *, uint);
90+
void tls_get_quic_user_agent(TLSData &, char *, size_t);
9191
bool tls_check_handshake(TLSData&);
9292
bool tls_get_ja3_cipher_suites(std::string&, TLSData&);
9393

0 commit comments

Comments
 (0)