From 75fd32b48a214acb44d1b0266d629171b57828a6 Mon Sep 17 00:00:00 2001 From: lucaderi Date: Wed, 17 Jun 2020 15:40:07 +0200 Subject: [PATCH] CentOS 6 compilation fixes --- header_encryption.c | 183 ++++++++++++++++++++++---------------------- header_encryption.h | 3 - 2 files changed, 91 insertions(+), 95 deletions(-) diff --git a/header_encryption.c b/header_encryption.c index 0da17ef..6ce8ab4 100644 --- a/header_encryption.c +++ b/header_encryption.c @@ -31,116 +31,115 @@ uint32_t packet_header_decrypt (uint8_t packet[], uint8_t packet_len, char * community_name, he_context_t * ctx) { - // assemble IV - // the last four are ASCII "n2n!" and do not get overwritten - uint8_t iv[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x6E, 0x32, 0x6E, 0x21 }; - // the first 96 bits of the packet get padded with ASCII "n2n!" - // to full 128 bit IV - memcpy (iv, packet, 12); - // alternatively, consider: pearson_hash_128 (iv, packet, 12); - - // try community name as possible key and check for magic bytes - uint32_t magic = 0x6E326E00; // ="n2n_" - uint32_t test_magic; - // check for magic bytes and resonable value in header len field - speck_he ((uint8_t*)&test_magic, &packet[12], 4, iv, (speck_context_t*)ctx); - test_magic = be32toh (test_magic); - if ( ((test_magic << 8) == magic) - && ((test_magic >> 24) <= packet_len) // (test_masgic >> 24) is header_len - ) { - speck_he (&packet[12], &packet[12], (test_magic >> 24) - 12, iv, (speck_context_t*)ctx); - // restore original packet order - memcpy (&packet[0], &packet[16], 4); - memcpy (&packet[4], community_name, N2N_COMMUNITY_SIZE); - return (1); // successful - } else - return (0); // unsuccessful + // assemble IV + // the last four are ASCII "n2n!" and do not get overwritten + uint8_t iv[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x6E, 0x32, 0x6E, 0x21 }; + // the first 96 bits of the packet get padded with ASCII "n2n!" + // to full 128 bit IV + memcpy (iv, packet, 12); + // alternatively, consider: pearson_hash_128 (iv, packet, 12); + + // try community name as possible key and check for magic bytes + uint32_t magic = 0x6E326E00; // ="n2n_" + uint32_t test_magic; + // check for magic bytes and resonable value in header len field + speck_he ((uint8_t*)&test_magic, &packet[12], 4, iv, (speck_context_t*)ctx); + test_magic = be32toh (test_magic); + if ( ((test_magic << 8) == magic) + && ((test_magic >> 24) <= packet_len) // (test_masgic >> 24) is header_len + ) { + speck_he (&packet[12], &packet[12], (test_magic >> 24) - 12, iv, (speck_context_t*)ctx); + // restore original packet order + memcpy (&packet[0], &packet[16], 4); + memcpy (&packet[4], community_name, N2N_COMMUNITY_SIZE); + return (1); // successful + } else + return (0); // unsuccessful } int8_t packet_header_decrypt_if_required (uint8_t packet[], uint16_t packet_len, struct sn_community *communities) { - struct sn_community *c, *tmp; - - - if (packet_len < 20) - return (-1); - - // first, check if header is unenrypted to put it into the fast-lane then - - // the following check is around 99.99962 percent reliable - // it heavily relies on the structure of packet's common part - // changes to wire.c:encode/decode_common need to go together with this code - if ( (packet[19] == (uint8_t)0x00) // null terminated community name - && (packet[00] == N2N_PKT_VERSION) // correct packet version -// && (packet[01] <= N2N_DEFAULT_TTL) // reasonable TTL -- might interfere with hole-punching-related or cli passed higher values ?! - && ((be16toh (*(uint16_t*)&(packet[02])) & N2N_FLAGS_TYPE_MASK ) <= MSG_TYPE_MAX_TYPE ) // message type - && ( be16toh (*(uint16_t*)&(packet[02])) < N2N_FLAGS_OPTIONS) // flags - ) { - - // most probably unencrypted - - // make sure, no downgrading happens here and no unencrypted packets can be - // injected in a community which definitely deals with encrypted headers - HASH_FIND_COMMUNITY(communities, (char *)&packet[04], c); - if (!c) - if (c->header_encryption == HEADER_ENCRYPTION_ENABLED) - return (-2); - // set 'no encryption' in case it is not set yet - c->header_encryption = HEADER_ENCRYPTION_NONE; - c->header_encryption_ctx = NULL; - return (HEADER_ENCRYPTION_NONE); - } else { - - // most probably encrypted - // cycle through the known communities (as keys) to eventually decrypt - int32_t ret; - HASH_ITER (hh, communities, c, tmp) { - // skip the definitely unencrypted communities - if (c->header_encryption == HEADER_ENCRYPTION_NONE) - continue; - if ( (ret = packet_header_decrypt (packet, packet_len, c->community, c->header_encryption_ctx)) ) { - // set 'encrypted' in case it is not set yet - c->header_encryption = HEADER_ENCRYPTION_ENABLED; - // no need to test further communities - return (HEADER_ENCRYPTION_ENABLED); - } - } - // no matching key/community - return (-3); - } + struct sn_community *c, *tmp; + + + if (packet_len < 20) + return (-1); + + // first, check if header is unenrypted to put it into the fast-lane then + + // the following check is around 99.99962 percent reliable + // it heavily relies on the structure of packet's common part + // changes to wire.c:encode/decode_common need to go together with this code + if ( (packet[19] == (uint8_t)0x00) // null terminated community name + && (packet[00] == N2N_PKT_VERSION) // correct packet version + // && (packet[01] <= N2N_DEFAULT_TTL) // reasonable TTL -- might interfere with hole-punching-related or cli passed higher values ?! + && ((be16toh (*(uint16_t*)&(packet[02])) & N2N_FLAGS_TYPE_MASK ) <= MSG_TYPE_MAX_TYPE ) // message type + && ( be16toh (*(uint16_t*)&(packet[02])) < N2N_FLAGS_OPTIONS) // flags + ) { + + // most probably unencrypted + + // make sure, no downgrading happens here and no unencrypted packets can be + // injected in a community which definitely deals with encrypted headers + HASH_FIND_COMMUNITY(communities, (char *)&packet[04], c); + if (!c) + if (c->header_encryption == HEADER_ENCRYPTION_ENABLED) + return (-2); + // set 'no encryption' in case it is not set yet + c->header_encryption = HEADER_ENCRYPTION_NONE; + c->header_encryption_ctx = NULL; + return (HEADER_ENCRYPTION_NONE); + } else { + + // most probably encrypted + // cycle through the known communities (as keys) to eventually decrypt + int32_t ret; + HASH_ITER (hh, communities, c, tmp) { + // skip the definitely unencrypted communities + if (c->header_encryption == HEADER_ENCRYPTION_NONE) + continue; + if ( (ret = packet_header_decrypt (packet, packet_len, c->community, c->header_encryption_ctx)) ) { + // set 'encrypted' in case it is not set yet + c->header_encryption = HEADER_ENCRYPTION_ENABLED; + // no need to test further communities + return (HEADER_ENCRYPTION_ENABLED); + } + } + // no matching key/community + return (-3); + } } int32_t packet_header_encrypt (uint8_t packet[], uint8_t header_len, he_context_t * ctx) { + uint8_t iv[16]; + uint64_t *iv64 = (uint64_t*)&iv; + const uint32_t magic = 0x006E326E; - if (header_len < 20) - return (-1); + if (header_len < 20) + return (-1); - memcpy (&packet[16], &packet[00], 4); + memcpy (&packet[16], &packet[00], 4); + + iv64[0] = n2n_rand(); + iv64[1] = n2n_rand(); + iv64[3] = htobe32(magic); + iv[12] = header_len; - uint8_t iv[16]; - ((uint64_t*)iv)[0] = n2n_rand (); - ((uint64_t*)iv)[1] = n2n_rand (); + speck_he (&packet[12], &packet[12], header_len - 12, iv, (speck_context_t*)ctx); - const uint32_t magic = 0x006E326E; - ((uint32_t*)iv)[3] = htobe32 (magic); - - iv[12] = header_len; - - speck_he (&packet[12], &packet[12], header_len - 12, iv, (speck_context_t*)ctx); - - return (0); + return (0); } void packet_header_setup_key (char * community_name, he_context_t * ctx) { - uint8_t key[16]; - pearson_hash_128 (key, (uint8_t*)community_name, N2N_COMMUNITY_SIZE); + uint8_t key[16]; + pearson_hash_128 (key, (uint8_t*)community_name, N2N_COMMUNITY_SIZE); - ctx = calloc(1, sizeof(speck_context_t)); - speck_expand_key_he (key, (speck_context_t*)ctx); + ctx = calloc(1, sizeof(speck_context_t)); + speck_expand_key_he (key, (speck_context_t*)ctx); } diff --git a/header_encryption.h b/header_encryption.h index 504b106..55b017b 100644 --- a/header_encryption.h +++ b/header_encryption.h @@ -23,9 +23,6 @@ #include "speck.h" -typedef struct speck_context_t he_context_t; - - /* Header encryption indicators */ #define HEADER_ENCRYPTION_UNKNOWN 0 #define HEADER_ENCRYPTION_NONE 1