From f67cc8f2a6fe39140b6be6e10da2b9b0037477d3 Mon Sep 17 00:00:00 2001 From: Hamish Coleman Date: Wed, 14 Jun 2023 20:14:11 +0100 Subject: [PATCH] iwyu: random_numbers.h --- include/random_numbers.h | 9 ++------- src/edge.c | 2 ++ src/edge_utils.c | 5 +++-- src/example_edge_embed_quick_edge_init.c | 5 ++++- src/header_encryption.c | 1 + src/n2n.c | 3 ++- src/random_numbers.c | 5 +++++ src/sn_utils.c | 1 + src/transform_aes.c | 1 + src/transform_cc20.c | 1 + src/transform_speck.c | 1 + src/transform_tf.c | 1 + tools/n2n-portfwd.c | 1 + tools/n2n-route.c | 1 + 14 files changed, 26 insertions(+), 11 deletions(-) diff --git a/include/random_numbers.h b/include/random_numbers.h index b998bcf..2c7eba4 100644 --- a/include/random_numbers.h +++ b/include/random_numbers.h @@ -21,21 +21,16 @@ #define RND_H -#include -#include -#include /* time, clock */ - -#include "n2n.h" /* traceEvent */ +#include // for uint64_t, uint32_t // syscall and inquiring random number from hardware generators might fail, so we will retry #define RND_RETRIES 1000 #if defined (__linux__) -#include /* syscall, SYS_getrandom */ +#include // for SYS_getrandom #ifdef SYS_getrandom #define GRND_NONBLOCK 1 -#include /* errno, EAGAIN */ #endif #endif diff --git a/src/edge.c b/src/edge.c index a7c2846..a898b63 100644 --- a/src/edge.c +++ b/src/edge.c @@ -19,6 +19,8 @@ #include "auth.h" // for generate_private_key, generate_p... #include "n2n.h" #include "pearson.h" // for pearson_hash_64 +#include "random_numbers.h" // for n2n_seed, n2n_srand + /* *************************************************** */ diff --git a/src/edge_utils.c b/src/edge_utils.c index 6091969..dba863a 100644 --- a/src/edge_utils.c +++ b/src/edge_utils.c @@ -17,11 +17,12 @@ */ #include "auth.h" // for generate_private_key +#include "edge_utils_win32.h" #include "header_encryption.h" // for packet_header_encrypt, packet_he... #include "n2n.h" // for n2n_edge_t, peer_info, n2n_edge_... +#include "network_traffic_filter.h" // for create_network_traffic_filter #include "pearson.h" // for pearson_hash_128, pearson_hash_64 -#include "network_traffic_filter.h" -#include "edge_utils_win32.h" +#include "random_numbers.h" // for n2n_rand, n2n_rand_sqr /* ************************************** */ diff --git a/src/example_edge_embed_quick_edge_init.c b/src/example_edge_embed_quick_edge_init.c index e96a765..72a8ae6 100644 --- a/src/example_edge_embed_quick_edge_init.c +++ b/src/example_edge_embed_quick_edge_init.c @@ -16,7 +16,10 @@ * */ -#include "n2n.h" + +#include "n2n.h" // for quick_edge_init, setTraceLevel +#include "random_numbers.h" // for n2n_seed, n2n_srand + /* This tool demonstrates how to easily embed diff --git a/src/header_encryption.c b/src/header_encryption.c index 981d7ea..9ee2ee9 100644 --- a/src/header_encryption.c +++ b/src/header_encryption.c @@ -20,6 +20,7 @@ #include "header_encryption.h" // for packet_header_change_dynamic_key, pac... #include "n2n.h" // for he_context_t, N2N_COMMUNITY_SIZE, TRA... #include "pearson.h" // for pearson_hash_128, pearson_hash_64 +#include "random_numbers.h" // for n2n_rand #define HASH_FIND_COMMUNITY(head, name, out) HASH_FIND_STR(head, name, out) diff --git a/src/n2n.c b/src/n2n.c index c6a7ace..3f75c94 100644 --- a/src/n2n.c +++ b/src/n2n.c @@ -18,7 +18,8 @@ #include "n2n.h" -#include "sn_selection.h" +#include "random_numbers.h" // for n2n_rand +#include "sn_selection.h" // for sn_selection_criterion_default #include "minilzo.h" diff --git a/src/random_numbers.c b/src/random_numbers.c index 0828f22..ed6ca8c 100644 --- a/src/random_numbers.c +++ b/src/random_numbers.c @@ -17,6 +17,11 @@ */ +#include // for errno, EAGAIN +#include // for NULL, size_t +#include // for clock, time +#include // for syscall +#include "n2n.h" // for TRACE_ERROR, traceEvent #include "random_numbers.h" diff --git a/src/sn_utils.c b/src/sn_utils.c index 26ffe06..56e8a89 100644 --- a/src/sn_utils.c +++ b/src/sn_utils.c @@ -21,6 +21,7 @@ #include "header_encryption.h" // for packet_header_encrypt, packet_header_... #include "n2n.h" // for sn_community, n2n_sn_t, peer_info #include "pearson.h" // for pearson_hash_128, pearson_hash_32 +#include "random_numbers.h" // for n2n_rand, n2n_rand_sqr, n2n_seed, n2n... #define HASH_FIND_COMMUNITY(head, name, out) HASH_FIND_STR(head, name, out) diff --git a/src/transform_aes.c b/src/transform_aes.c index d60a78a..ca6eb4f 100644 --- a/src/transform_aes.c +++ b/src/transform_aes.c @@ -19,6 +19,7 @@ #include "n2n.h" // for n2n_trans_op_t, traceEvent, TRACE_ERROR #include "pearson.h" // for pearson_hash_256 +#include "random_numbers.h" // for n2n_rand // size of random value prepended to plaintext defaults to AES BLOCK_SIZE; diff --git a/src/transform_cc20.c b/src/transform_cc20.c index fdf3c6d..6bbecac 100644 --- a/src/transform_cc20.c +++ b/src/transform_cc20.c @@ -20,6 +20,7 @@ #include "cc20.h" // for CC20_IV_SIZE, cc20_crypt, cc20_deinit #include "n2n.h" // for n2n_trans_op_t, traceEvent, TRACE_ERROR #include "pearson.h" // for pearson_hash_256 +#include "random_numbers.h" // for n2n_rand // ChaCha20 plaintext preamble diff --git a/src/transform_speck.c b/src/transform_speck.c index 872c356..1f9661d 100644 --- a/src/transform_speck.c +++ b/src/transform_speck.c @@ -19,6 +19,7 @@ #include "n2n.h" // for n2n_trans_op_t, traceEvent, TRACE_DEBUG #include "pearson.h" // for pearson_hash_256 +#include "random_numbers.h" // for n2n_rand // Speck plaintext preamble #define TRANSOP_SPECK_PREAMBLE_SIZE (N2N_SPECK_IVEC_SIZE) diff --git a/src/transform_tf.c b/src/transform_tf.c index be0adc7..e6ae404 100644 --- a/src/transform_tf.c +++ b/src/transform_tf.c @@ -19,6 +19,7 @@ #include "n2n.h" // for n2n_trans_op_t, traceEvent, TRACE_ERROR #include "pearson.h" // for pearson_hash_256 +#include "random_numbers.h" // for n2n_rand // size of random value prepended to plaintext defaults to TF_BLOCK_SIZE; diff --git a/tools/n2n-portfwd.c b/tools/n2n-portfwd.c index 6bfba95..5d7f698 100644 --- a/tools/n2n-portfwd.c +++ b/tools/n2n-portfwd.c @@ -19,6 +19,7 @@ #include "json.h" // for _jsonpair, json_object_t, json_free #include "n2n.h" // for traceEvent, setTraceLevel, getTraceLevel +#include "random_numbers.h" // for n2n_rand, n2n_seed, n2n_srand #define WITH_PORT 1 diff --git a/tools/n2n-route.c b/tools/n2n-route.c index 3cd0880..18cd7fc 100644 --- a/tools/n2n-route.c +++ b/tools/n2n-route.c @@ -19,6 +19,7 @@ #include "json.h" // for _jsonpair, json_object_t, _jsonvalue #include "n2n.h" // for inaddrtoa, traceEvent, TRACE_WARNING +#include "random_numbers.h" // for n2n_rand, n2n_seed, n2n_srand #if defined (__linux__) || defined(WIN32) /* currently, Linux and Windows only */