fuzz: extend fuzzing coverage
This commit is contained in:
+33
-3
@@ -6,7 +6,7 @@ bin_PROGRAMS += fuzz_ds_patricia fuzz_ds_ahocorasick fuzz_ds_libcache fuzz_ds_tr
|
||||
#Third party
|
||||
bin_PROGRAMS += fuzz_libinjection fuzz_binaryfusefilter
|
||||
#Internal crypto
|
||||
bin_PROGRAMS += fuzz_gcrypt_light
|
||||
bin_PROGRAMS += fuzz_gcrypt_light fuzz_gcrypt_aes fuzz_gcrypt_gcm
|
||||
#Configuration files
|
||||
bin_PROGRAMS += fuzz_filecfg_protocols
|
||||
#Reader utils
|
||||
@@ -427,6 +427,36 @@ fuzz_gcrypt_light_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_gcrypt_light_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_gcrypt_aes_SOURCES = fuzz_gcrypt_aes.cpp
|
||||
fuzz_gcrypt_aes_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/
|
||||
fuzz_gcrypt_aes_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/
|
||||
fuzz_gcrypt_aes_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_gcrypt_aes_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_gcrypt_aes_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_gcrypt_aes_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_gcrypt_aes_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_gcrypt_aes_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_gcrypt_aes_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_gcrypt_gcm_SOURCES = fuzz_gcrypt_gcm.cpp
|
||||
fuzz_gcrypt_gcm_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/
|
||||
fuzz_gcrypt_gcm_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/
|
||||
fuzz_gcrypt_gcm_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_gcrypt_gcm_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_gcrypt_gcm_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_gcrypt_gcm_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_gcrypt_gcm_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_gcrypt_gcm_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_gcrypt_gcm_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_filecfg_protocols_SOURCES = fuzz_filecfg_protocols.c fuzz_common_code.c
|
||||
fuzz_filecfg_protocols_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_filecfg_protocols_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
@@ -441,8 +471,8 @@ fuzz_filecfg_protocols_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(fuzz_filecfg_protocols_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_readerutils_workflow_SOURCES = fuzz_readerutils_workflow.cpp fuzz_common_code.c ../example/reader_util.c
|
||||
fuzz_readerutils_workflow_CXXFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_readerutils_workflow_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_readerutils_workflow_CXXFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS) -DDISABLE_CUSTOM_ALLOCATOR_ON_READERUTILS
|
||||
fuzz_readerutils_workflow_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DDISABLE_CUSTOM_ALLOCATOR_ON_READERUTILS
|
||||
fuzz_readerutils_workflow_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_readerutils_workflow_LDFLAGS = $(PCAP_LIB) $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
|
||||
@@ -33,7 +33,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||
}
|
||||
}
|
||||
|
||||
ndpi_domain_classify_add_domains(d, NDPI_PROTOCOL_UNKNOWN, "random_list.list");
|
||||
ndpi_domain_classify_add_domains(d,
|
||||
fuzzed_data.ConsumeIntegralInRange(0, NDPI_LAST_IMPLEMENTED_PROTOCOL - 1),
|
||||
(char *)"random_list.list");
|
||||
|
||||
if (fuzzed_data.ConsumeBool())
|
||||
ndpi_domain_classify_finalize(d);
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include "fuzzer/FuzzedDataProvider.h"
|
||||
|
||||
#define MBEDTLS_CHECK_RETURN_TYPICAL
|
||||
#include "../src/lib/third_party/include/gcrypt/aes.h"
|
||||
|
||||
extern int force_no_aesni;
|
||||
|
||||
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||
FuzzedDataProvider fuzzed_data(data, size);
|
||||
mbedtls_aes_context *ctx;
|
||||
int key_lens[] = { 128, 192, 256, 512 /* invalid */ };
|
||||
unsigned char *input, *output, *key;
|
||||
int i, key_len, mode, rc;
|
||||
|
||||
/* No real memory allocations involved */
|
||||
|
||||
if(fuzzed_data.remaining_bytes() < 1 + 1 + 4 + 512 / 8 + 16)
|
||||
return -1;
|
||||
|
||||
posix_memalign((void **)&input, 8, 16);
|
||||
posix_memalign((void **)&output, 8, 16);
|
||||
posix_memalign((void **)&key, 8, 512 / 8);
|
||||
ctx = (mbedtls_aes_context *)malloc(sizeof(mbedtls_aes_context));
|
||||
|
||||
force_no_aesni = 0;
|
||||
if(fuzzed_data.ConsumeBool())
|
||||
force_no_aesni = 1;
|
||||
|
||||
mode = MBEDTLS_AES_ENCRYPT;
|
||||
if(fuzzed_data.ConsumeBool())
|
||||
mode = MBEDTLS_AES_DECRYPT;
|
||||
|
||||
mbedtls_aes_init(ctx);
|
||||
|
||||
key_len = fuzzed_data.PickValueInArray(key_lens);
|
||||
std::vector<unsigned char>k = fuzzed_data.ConsumeBytes<u_int8_t>(key_len / 8);
|
||||
std::vector<u_int8_t>in = fuzzed_data.ConsumeBytes<uint8_t>(16);
|
||||
|
||||
for(i = 0; i < 16; i++)
|
||||
input[i] = in[i];
|
||||
for(i = 0; i < key_len / 8; i++)
|
||||
key[i] = k[i];
|
||||
|
||||
if(mode == MBEDTLS_AES_ENCRYPT)
|
||||
rc = mbedtls_aes_setkey_enc(ctx, key, key_len);
|
||||
else
|
||||
rc = mbedtls_aes_setkey_dec(ctx, key, key_len);
|
||||
|
||||
if(rc == 0)
|
||||
mbedtls_aes_crypt_ecb(ctx, mode, input, output);
|
||||
|
||||
mbedtls_aes_free(ctx);
|
||||
|
||||
free(ctx);
|
||||
free(key);
|
||||
free(input);
|
||||
free(output);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -0,0 +1,101 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include <assert.h>
|
||||
#include "fuzzer/FuzzedDataProvider.h"
|
||||
|
||||
#define MBEDTLS_CHECK_RETURN_TYPICAL
|
||||
#define MBEDTLS_INTERNAL_VALIDATE_RET( cond, ret ) do { } while( 0 )
|
||||
#include "../src/lib/third_party/include/gcrypt/aes.h"
|
||||
#include "../src/lib/third_party/include/gcrypt/cipher.h"
|
||||
#include "../src/lib/third_party/include/gcrypt/gcm.h"
|
||||
|
||||
extern int force_no_aesni;
|
||||
|
||||
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||
FuzzedDataProvider fuzzed_data(data, size);
|
||||
mbedtls_aes_context *aes_e_ctx, *aes_d_ctx;
|
||||
mbedtls_gcm_context *gcm_e_ctx, *gcm_d_ctx;
|
||||
int key_lens[] = { 128, 192, 256, 512 /* invalid */ };
|
||||
unsigned char *output, *decrypted;
|
||||
int key_len, rc_e, rc_d;
|
||||
mbedtls_cipher_id_t cipher;
|
||||
unsigned char *tag;
|
||||
int iv_len, tag_len, input_length;
|
||||
|
||||
/* No real memory allocations involved */
|
||||
|
||||
if(fuzzed_data.remaining_bytes() < 1 + 4 + 512 / 8 +
|
||||
1 + 64 + /* iv */
|
||||
1 + /* tag_len */
|
||||
1 + 64 + /* input */
|
||||
1 /* useless data: to be able to add the check with assert */)
|
||||
return -1;
|
||||
|
||||
gcm_e_ctx = (mbedtls_gcm_context *)malloc(sizeof(mbedtls_gcm_context));
|
||||
gcm_d_ctx = (mbedtls_gcm_context *)malloc(sizeof(mbedtls_gcm_context));
|
||||
aes_e_ctx = (mbedtls_aes_context *)malloc(sizeof(mbedtls_aes_context));
|
||||
aes_d_ctx = (mbedtls_aes_context *)malloc(sizeof(mbedtls_aes_context));
|
||||
|
||||
/* Not sure if it is really necessary... */
|
||||
force_no_aesni = 0;
|
||||
if(fuzzed_data.ConsumeBool())
|
||||
force_no_aesni = 1;
|
||||
|
||||
key_len = fuzzed_data.PickValueInArray(key_lens);
|
||||
std::vector<unsigned char>key = fuzzed_data.ConsumeBytes<u_int8_t>(key_len / 8);
|
||||
|
||||
iv_len = fuzzed_data.ConsumeIntegralInRange(0, 64);
|
||||
std::vector<u_int8_t>iv = fuzzed_data.ConsumeBytes<uint8_t>(iv_len);
|
||||
|
||||
tag_len = fuzzed_data.ConsumeIntegralInRange(0, 17);
|
||||
tag = (unsigned char *)malloc(tag_len);
|
||||
|
||||
input_length = fuzzed_data.ConsumeIntegralInRange(16, 64);
|
||||
std::vector<unsigned char>input = fuzzed_data.ConsumeBytes<u_int8_t>(input_length);
|
||||
output = (unsigned char *)malloc(input_length);
|
||||
decrypted = (unsigned char *)malloc(input_length);
|
||||
|
||||
cipher = static_cast<mbedtls_cipher_id_t>(fuzzed_data.ConsumeIntegralInRange(0, (int)MBEDTLS_CIPHER_ID_CHACHA20));
|
||||
|
||||
assert(fuzzed_data.remaining_bytes() > 0);
|
||||
|
||||
mbedtls_gcm_init(gcm_e_ctx, aes_e_ctx);
|
||||
mbedtls_gcm_init(gcm_d_ctx, aes_d_ctx);
|
||||
|
||||
rc_e = mbedtls_gcm_setkey(gcm_e_ctx, cipher, key.data(), key.size() * 8);
|
||||
rc_d = mbedtls_gcm_setkey(gcm_d_ctx, cipher, key.data(), key.size() * 8);
|
||||
|
||||
if (rc_e == 0 && rc_d == 0) {
|
||||
rc_e = mbedtls_gcm_crypt_and_tag(gcm_e_ctx, MBEDTLS_GCM_ENCRYPT,
|
||||
input.size(),
|
||||
iv.data(), iv.size(),
|
||||
NULL, 0, /* TODO */
|
||||
input.data(),
|
||||
output,
|
||||
tag_len, tag);
|
||||
if(rc_e == 0) {
|
||||
rc_d = mbedtls_gcm_auth_decrypt(gcm_d_ctx,
|
||||
input.size(),
|
||||
iv.data(), iv.size(),
|
||||
NULL, 0, /* TODO */
|
||||
tag, tag_len,
|
||||
output,
|
||||
decrypted);
|
||||
if (rc_d == 0)
|
||||
assert(memcmp(input.data(), decrypted, input.size()) == 0);
|
||||
}
|
||||
}
|
||||
|
||||
mbedtls_gcm_free(gcm_e_ctx);
|
||||
mbedtls_gcm_free(gcm_d_ctx);
|
||||
|
||||
free(tag);
|
||||
free(gcm_e_ctx);
|
||||
free(gcm_d_ctx);
|
||||
free(aes_e_ctx);
|
||||
free(aes_d_ctx);
|
||||
free(output);
|
||||
free(decrypted);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -31,7 +31,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||
ndpi_risk flow_risk;
|
||||
const u_char *pkt;
|
||||
struct pcap_pkthdr *header;
|
||||
int r;
|
||||
int r, rc;
|
||||
char errbuf[PCAP_ERRBUF_SIZE];
|
||||
FILE *fd;
|
||||
u_int8_t debug_protos_index;
|
||||
@@ -91,14 +91,16 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||
w = ndpi_workflow_init(&prefs, pcap_handle, 1, serialization_format);
|
||||
if(w) {
|
||||
NDPI_BITMASK_SET_ALL(enabled_bitmask);
|
||||
ndpi_set_protocol_detection_bitmask2(w->ndpi_struct, &enabled_bitmask);
|
||||
ndpi_finalize_initialization(w->ndpi_struct);
|
||||
rc = ndpi_set_protocol_detection_bitmask2(w->ndpi_struct, &enabled_bitmask);
|
||||
if(rc == 0) {
|
||||
ndpi_finalize_initialization(w->ndpi_struct);
|
||||
|
||||
header = NULL;
|
||||
r = pcap_next_ex(pcap_handle, &header, &pkt);
|
||||
while (r > 0) {
|
||||
ndpi_workflow_process_packet(w, header, pkt, &flow_risk);
|
||||
header = NULL;
|
||||
r = pcap_next_ex(pcap_handle, &header, &pkt);
|
||||
while (r > 0) {
|
||||
ndpi_workflow_process_packet(w, header, pkt, &flow_risk);
|
||||
r = pcap_next_ex(pcap_handle, &header, &pkt);
|
||||
}
|
||||
}
|
||||
|
||||
ndpi_workflow_free(w);
|
||||
|
||||
Reference in New Issue
Block a user