From 3148b5013fd48c25838173d4de9b8f7f0672933a Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Mon, 8 Jun 2020 15:34:35 +0200 Subject: [PATCH 1/7] CentOS compilation fixes --- random_numbers.c | 108 +++++++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/random_numbers.c b/random_numbers.c index 38d452e..3c2e410 100644 --- a/random_numbers.c +++ b/random_numbers.c @@ -1,7 +1,7 @@ /* The following code offers an alterate pseudo random number generator namely XORSHIFT128+ to use instead of C's rand(). Its performance is on par with C's rand(). - */ +*/ #include "random_numbers.h" @@ -10,46 +10,46 @@ /* The state must be seeded in a way that it is not all zero, choose some arbitrary defaults (in this case: taken from splitmix64) */ static struct rn_generator_state_t rn_current_state = { - .a = 0x9E3779B97F4A7C15, - .b = 0xBF58476D1CE4E5B9 }; + .a = 0x9E3779B97F4A7C15, + .b = 0xBF58476D1CE4E5B9 }; /* used for mixing the initializing seed */ static uint64_t splitmix64 (struct splitmix64_state_t *state) { - uint64_t result = state->s; + uint64_t result = state->s; - state->s = result + 0x9E3779B97F4A7C15; + state->s = result + 0x9E3779B97F4A7C15; - result = (result ^ (result >> 30)) * 0xBF58476D1CE4E5B9; - result = (result ^ (result >> 27)) * 0x94D049BB133111EB; + result = (result ^ (result >> 30)) * 0xBF58476D1CE4E5B9; + result = (result ^ (result >> 27)) * 0x94D049BB133111EB; - return result ^ (result >> 31); + return result ^ (result >> 31); } int n2n_srand (uint64_t seed) { + uint8_t i; + struct splitmix64_state_t smstate = {seed}; - struct splitmix64_state_t smstate = {seed}; + rn_current_state.a = 0; + rn_current_state.b = 0; - rn_current_state.a = 0; - rn_current_state.b = 0; + rn_current_state.a = splitmix64 (&smstate); + rn_current_state.b = splitmix64 (&smstate); - rn_current_state.a = splitmix64 (&smstate); - rn_current_state.b = splitmix64 (&smstate); + /* the following lines could be deleted as soon as it is formally prooved that + there is no seed leading to (a == b == 0). Until then, just to be safe: */ + if ( (rn_current_state.a == 0) && (rn_current_state.b == 0) ) { + rn_current_state.a = 0x9E3779B97F4A7C15; + rn_current_state.b = 0xBF58476D1CE4E5B9; + } - /* the following lines could be deleted as soon as it is formally prooved that - there is no seed leading to (a == b == 0). Until then, just to be safe: */ - if ( (rn_current_state.a == 0) && (rn_current_state.b == 0) ) { - rn_current_state.a = 0x9E3779B97F4A7C15; - rn_current_state.b = 0xBF58476D1CE4E5B9; - } + /* stabilize in unlikely case of weak state with only a few bits set */ + for(i = 0; i < 32; i++) + n2n_rand(); - /* stabilize in unlikely case of weak state with only a few bits set */ - for (uint8_t i = 0; i < 32; i++) - n2n_rand(); - - return 0; + return 0; } @@ -58,16 +58,16 @@ int n2n_srand (uint64_t seed) { and thus is considered public domain. */ uint64_t n2n_rand () { - uint64_t t = rn_current_state.a; - uint64_t const s = rn_current_state.b; + uint64_t t = rn_current_state.a; + uint64_t const s = rn_current_state.b; - rn_current_state.a = s; - t ^= t << 23; - t ^= t >> 17; - t ^= s ^ (s >> 26); - rn_current_state.b = t; + rn_current_state.a = s; + t ^= t << 23; + t ^= t >> 17; + t ^= s ^ (s >> 26); + rn_current_state.b = t; - return t + s; + return t + s; } @@ -80,37 +80,37 @@ uint64_t n2n_seed (void) { uint64_t ret = 0; #ifdef SYS_getrandom - syscall (SYS_getrandom, &seed, sizeof(seed), GRND_NONBLOCK); - ret += seed; + syscall (SYS_getrandom, &seed, sizeof(seed), GRND_NONBLOCK); + ret += seed; #endif -// __RDRND__ is set only if architecturual feature is set, e.g. compile with -march=native + // __RDRND__ is set only if architecturual feature is set, e.g. compile with -march=native #ifdef __RDRND__ - _rdrand64_step ((unsigned long long*)&seed); - ret += seed; + _rdrand64_step ((unsigned long long*)&seed); + ret += seed; #endif -// __RDSEED__ ist set only if architecturual feature is set, e.g. compile with -march=native + // __RDSEED__ ist set only if architecturual feature is set, e.g. compile with -march=native #ifdef __RDSEED__ - _rdseed64_step((unsigned long long*)&seed); - ret += seed; + _rdseed64_step((unsigned long long*)&seed); + ret += seed; #endif -/* The WIN32 code is still untested and thus commented -#ifdef WIN32 - HCRYPTPROV crypto_provider; - CryptAcquireContext (&crypto_provider, NULL, (LPCWSTR)L"Microsoft Base Cryptographic Provider v1.0", - PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); - CryptGenRandom (crypto_provider, 8, &seed); - CryptReleaseContext (crypto_provider, 0); - ret += seed; -#endif */ + /* The WIN32 code is still untested and thus commented + #ifdef WIN32 + HCRYPTPROV crypto_provider; + CryptAcquireContext (&crypto_provider, NULL, (LPCWSTR)L"Microsoft Base Cryptographic Provider v1.0", + PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + CryptGenRandom (crypto_provider, 8, &seed); + CryptReleaseContext (crypto_provider, 0); + ret += seed; + #endif */ - seed = time(NULL); /* UTC in seconds */ - ret += seed; + seed = time(NULL); /* UTC in seconds */ + ret += seed; - seed = clock() * 8996146197; /* clock() = ticks since program start */ - ret += seed; + seed = clock() * 8996146197; /* clock() = ticks since program start */ + ret += seed; - return ret; + return ret; } From 8acac40ccd5991fe9c43f2ec78bb946b2cf767e5 Mon Sep 17 00:00:00 2001 From: Logan007 Date: Thu, 11 Jun 2020 18:05:36 +0545 Subject: [PATCH 2/7] added portable endian code --- portable_endian.h | 125 ++++++++++++++++++++++++++++++++++++++++++++++ speck.c | 5 +- speck.h | 5 -- 3 files changed, 128 insertions(+), 7 deletions(-) create mode 100644 portable_endian.h diff --git a/portable_endian.h b/portable_endian.h new file mode 100644 index 0000000..4db1ae7 --- /dev/null +++ b/portable_endian.h @@ -0,0 +1,125 @@ +// taken from +// https://gist.githubusercontent.com/PkmX/63dd23f28ba885be53a5/raw/c89538c921f08f8dbb5bc5957c871060c720605a/portable_endian.h +// as of June 11, 2020 + +// "License": Public Domain +// I, Mathias Panzenb�ck, place this file hereby into the public domain. Use it at your own risk for whatever you like. +// In case there are jurisdictions that don't support putting things in the public domain you can also consider it to +// be "dual licensed" under the BSD, MIT and Apache licenses, if you want to. This code is trivial anyway. Consider it +// an example on how to get the endian conversion functions on different platforms. + +#ifndef PORTABLE_ENDIAN_H__ +#define PORTABLE_ENDIAN_H__ + +#if (defined(_WIN16) || defined(_WIN32) || defined(_WIN64)) && !defined(__WINDOWS__) + +# define __WINDOWS__ + +#endif + +#if defined(__linux__) || defined(__CYGWIN__) + +# include + +#elif defined(__APPLE__) + +# include + +# define htobe16(x) OSSwapHostToBigInt16(x) +# define htole16(x) OSSwapHostToLittleInt16(x) +# define be16toh(x) OSSwapBigToHostInt16(x) +# define le16toh(x) OSSwapLittleToHostInt16(x) + +# define htobe32(x) OSSwapHostToBigInt32(x) +# define htole32(x) OSSwapHostToLittleInt32(x) +# define be32toh(x) OSSwapBigToHostInt32(x) +# define le32toh(x) OSSwapLittleToHostInt32(x) + +# define htobe64(x) OSSwapHostToBigInt64(x) +# define htole64(x) OSSwapHostToLittleInt64(x) +# define be64toh(x) OSSwapBigToHostInt64(x) +# define le64toh(x) OSSwapLittleToHostInt64(x) + +# define __BYTE_ORDER BYTE_ORDER +# define __BIG_ENDIAN BIG_ENDIAN +# define __LITTLE_ENDIAN LITTLE_ENDIAN +# define __PDP_ENDIAN PDP_ENDIAN + +#elif defined(__OpenBSD__) + +# include + +#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) + +# include + +# define be16toh(x) betoh16(x) +# define le16toh(x) letoh16(x) + +# define be32toh(x) betoh32(x) +# define le32toh(x) letoh32(x) + +# define be64toh(x) betoh64(x) +# define le64toh(x) letoh64(x) + +#elif defined(__WINDOWS__) + +# include + +# if BYTE_ORDER == LITTLE_ENDIAN + +# if defined(_MSC_VER) +# include +# define htobe16(x) _byteswap_ushort(x) +# define htole16(x) (x) +# define be16toh(x) _byteswap_ushort(x) +# define le16toh(x) (x) + +# define htobe32(x) _byteswap_ulong(x) +# define htole32(x) (x) +# define be32toh(x) _byteswap_ulong(x) +# define le32toh(x) (x) + +# define htobe64(x) _byteswap_uint64(x) +# define htole64(x) (x) +# define be64toh(x) _byteswap_uint64(x) +# define le64toh(x) (x) + +# elif defined(__GNUC__) || defined(__clang__) + +# define htobe16(x) __builtin_bswap16(x) +# define htole16(x) (x) +# define be16toh(x) __builtin_bswap16(x) +# define le16toh(x) (x) + +# define htobe32(x) __builtin_bswap32(x) +# define htole32(x) (x) +# define be32toh(x) __builtin_bswap32(x) +# define le32toh(x) (x) + +# define htobe64(x) __builtin_bswap64(x) +# define htole64(x) (x) +# define be64toh(x) __builtin_bswap64(x) +# define le64toh(x) (x) +# else +# error platform not supported +# endif + +# else + +# error byte order not supported + +# endif + +# define __BYTE_ORDER BYTE_ORDER +# define __BIG_ENDIAN BIG_ENDIAN +# define __LITTLE_ENDIAN LITTLE_ENDIAN +# define __PDP_ENDIAN PDP_ENDIAN + +#else + +# error platform not supported + +#endif + +#endif diff --git a/speck.c b/speck.c index 23aefd7..d9afca5 100644 --- a/speck.c +++ b/speck.c @@ -2,13 +2,12 @@ // taken from (and modified: removed pure crypto-stream generation and seperated key expansion) // https://github.com/nsacyber/simon-speck-supercop/blob/master/crypto_stream/speck128256ctr/ -#include #include #include +#include "portable_endian.h" #include "speck.h" - #if defined (__AVX2__) // AVX support ---------------------------------------------------- @@ -682,6 +681,8 @@ int speck_test () { } /* +#include // for testing + int main (int argc, char* argv[]) { fprintf (stdout, "SPECK SELF TEST RESULT: %u\n", speck_test (0,NULL)); diff --git a/speck.h b/speck.h index ff92a5f..18a67b6 100644 --- a/speck.h +++ b/speck.h @@ -2,11 +2,6 @@ // taken from (and modified: removed pure crypto-stream generation and seperated key expansion) // https://github.com/nsacyber/simon-speck-supercop/blob/master/crypto_stream/speck128256ctr/ -#ifdef __APPLE__ -#include -#define htole64(x) OSSwapHostToLittleInt64(x) -#endif - #define u32 uint32_t #define u64 uint64_t From 9e49a2cfc80a5878212063260de4840ab1b68fff Mon Sep 17 00:00:00 2001 From: Logan007 Date: Thu, 11 Jun 2020 18:41:33 +0545 Subject: [PATCH 3/7] added portable endian code --- portable_endian.h | 263 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 182 insertions(+), 81 deletions(-) diff --git a/portable_endian.h b/portable_endian.h index 4db1ae7..1b27491 100644 --- a/portable_endian.h +++ b/portable_endian.h @@ -1,9 +1,9 @@ // taken from -// https://gist.githubusercontent.com/PkmX/63dd23f28ba885be53a5/raw/c89538c921f08f8dbb5bc5957c871060c720605a/portable_endian.h +// https://raw.githubusercontent.com/pyca/bcrypt/master/src/_csrc/portable_endian.h // as of June 11, 2020 // "License": Public Domain -// I, Mathias Panzenb�ck, place this file hereby into the public domain. Use it at your own risk for whatever you like. +// I, Mathias Panzenböck, place this file hereby into the public domain. Use it at your own risk for whatever you like. // In case there are jurisdictions that don't support putting things in the public domain you can also consider it to // be "dual licensed" under the BSD, MIT and Apache licenses, if you want to. This code is trivial anyway. Consider it // an example on how to get the endian conversion functions on different platforms. @@ -13,112 +13,213 @@ #if (defined(_WIN16) || defined(_WIN32) || defined(_WIN64)) && !defined(__WINDOWS__) -# define __WINDOWS__ +# define __WINDOWS__ #endif #if defined(__linux__) || defined(__CYGWIN__) - -# include +/* Define necessary macros for the header to expose all fields. */ +# if !defined(_BSD_SOURCE) +# define _BSD_SOURCE +# endif +# if !defined(__USE_BSD) +# define __USE_BSD +# endif +# if !defined(_DEFAULT_SOURCE) +# define _DEFAULT_SOURCE +# endif +# include +# include +/* See http://linux.die.net/man/3/endian */ +# if defined(htobe16) && defined(htole16) && defined(be16toh) && defined(le16toh) && defined(htobe32) && defined(htole32) && defined(be32toh) && defined(htole32) && defined(htobe64) && defined(htole64) && defined(be64) && defined(le64) +/* Do nothing. The macros we need already exist. */ +# elif !defined(__GLIBC__) || !defined(__GLIBC_MINOR__) || ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 9))) +# include +# if defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN) +# define htobe16(x) htons(x) +# define htole16(x) (x) +# define be16toh(x) ntohs(x) +# define le16toh(x) (x) + +# define htobe32(x) htonl(x) +# define htole32(x) (x) +# define be32toh(x) ntohl(x) +# define le32toh(x) (x) + +# define htobe64(x) (((uint64_t)htonl(((uint32_t)(((uint64_t)(x)) >> 32)))) | (((uint64_t)htonl(((uint32_t)(x)))) << 32)) +# define htole64(x) (x) +# define be64toh(x) (((uint64_t)ntohl(((uint32_t)(((uint64_t)(x)) >> 32)))) | (((uint64_t)ntohl(((uint32_t)(x)))) << 32)) +# define le64toh(x) (x) +# elif defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN) +# define htobe16(x) (x) +# define htole16(x) (((((uint16_t)(x)) >> 8))|((((uint16_t)(x)) << 8))) +# define be16toh(x) (x) +# define le16toh(x) (((((uint16_t)(x)) >> 8))|((((uint16_t)(x)) << 8))) + +# define htobe32(x) (x) +# define htole32(x) (((uint32_t)htole16(((uint16_t)(((uint32_t)(x)) >> 16)))) | (((uint32_t)htole16(((uint16_t)(x)))) << 16)) +# define be32toh(x) (x) +# define le32toh(x) (((uint32_t)le16toh(((uint16_t)(((uint32_t)(x)) >> 16)))) | (((uint32_t)le16toh(((uint16_t)(x)))) << 16)) + +# define htobe64(x) (x) +# define htole64(x) (((uint64_t)htole32(((uint32_t)(((uint64_t)(x)) >> 32)))) | (((uint64_t)htole32(((uint32_t)(x)))) << 32)) +# define be64toh(x) (x) +# define le64toh(x) (((uint64_t)le32toh(((uint32_t)(((uint64_t)(x)) >> 32)))) | (((uint64_t)le32toh(((uint32_t)(x)))) << 32)) +# else +# error Byte Order not supported or not defined. +# endif +# endif #elif defined(__APPLE__) -# include +# include -# define htobe16(x) OSSwapHostToBigInt16(x) -# define htole16(x) OSSwapHostToLittleInt16(x) -# define be16toh(x) OSSwapBigToHostInt16(x) -# define le16toh(x) OSSwapLittleToHostInt16(x) +# define htobe16(x) OSSwapHostToBigInt16(x) +# define htole16(x) OSSwapHostToLittleInt16(x) +# define be16toh(x) OSSwapBigToHostInt16(x) +# define le16toh(x) OSSwapLittleToHostInt16(x) -# define htobe32(x) OSSwapHostToBigInt32(x) -# define htole32(x) OSSwapHostToLittleInt32(x) -# define be32toh(x) OSSwapBigToHostInt32(x) -# define le32toh(x) OSSwapLittleToHostInt32(x) +# define htobe32(x) OSSwapHostToBigInt32(x) +# define htole32(x) OSSwapHostToLittleInt32(x) +# define be32toh(x) OSSwapBigToHostInt32(x) +# define le32toh(x) OSSwapLittleToHostInt32(x) -# define htobe64(x) OSSwapHostToBigInt64(x) -# define htole64(x) OSSwapHostToLittleInt64(x) -# define be64toh(x) OSSwapBigToHostInt64(x) -# define le64toh(x) OSSwapLittleToHostInt64(x) +# define htobe64(x) OSSwapHostToBigInt64(x) +# define htole64(x) OSSwapHostToLittleInt64(x) +# define be64toh(x) OSSwapBigToHostInt64(x) +# define le64toh(x) OSSwapLittleToHostInt64(x) -# define __BYTE_ORDER BYTE_ORDER -# define __BIG_ENDIAN BIG_ENDIAN -# define __LITTLE_ENDIAN LITTLE_ENDIAN -# define __PDP_ENDIAN PDP_ENDIAN +# define __BYTE_ORDER BYTE_ORDER +# define __BIG_ENDIAN BIG_ENDIAN +# define __LITTLE_ENDIAN LITTLE_ENDIAN +# define __PDP_ENDIAN PDP_ENDIAN #elif defined(__OpenBSD__) -# include - -#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) - -# include - -# define be16toh(x) betoh16(x) -# define le16toh(x) letoh16(x) - -# define be32toh(x) betoh32(x) -# define le32toh(x) letoh32(x) - -# define be64toh(x) betoh64(x) -# define le64toh(x) letoh64(x) +# include -#elif defined(__WINDOWS__) - -# include - -# if BYTE_ORDER == LITTLE_ENDIAN - -# if defined(_MSC_VER) -# include -# define htobe16(x) _byteswap_ushort(x) -# define htole16(x) (x) -# define be16toh(x) _byteswap_ushort(x) -# define le16toh(x) (x) +#elif defined(__HAIKU__) -# define htobe32(x) _byteswap_ulong(x) -# define htole32(x) (x) -# define be32toh(x) _byteswap_ulong(x) -# define le32toh(x) (x) +# include -# define htobe64(x) _byteswap_uint64(x) -# define htole64(x) (x) -# define be64toh(x) _byteswap_uint64(x) -# define le64toh(x) (x) - -# elif defined(__GNUC__) || defined(__clang__) +#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) -# define htobe16(x) __builtin_bswap16(x) -# define htole16(x) (x) -# define be16toh(x) __builtin_bswap16(x) -# define le16toh(x) (x) +# include -# define htobe32(x) __builtin_bswap32(x) -# define htole32(x) (x) -# define be32toh(x) __builtin_bswap32(x) -# define le32toh(x) (x) +# if !defined(be16toh) + # define be16toh(x) betoh16(x) + # define le16toh(x) letoh16(x) +# endif -# define htobe64(x) __builtin_bswap64(x) -# define htole64(x) (x) -# define be64toh(x) __builtin_bswap64(x) -# define le64toh(x) (x) -# else -# error platform not supported -# endif +# if !defined(be32toh) + # define be32toh(x) betoh32(x) + # define le32toh(x) letoh32(x) +# endif -# else +# if !defined(be64toh) + # define be64toh(x) betoh64(x) + # define le64toh(x) letoh64(x) +# endif -# error byte order not supported +#elif defined(__WINDOWS__) -# endif +# if BYTE_ORDER == LITTLE_ENDIAN + +# define htobe16(x) _byteswap_ushort(x) +# define htole16(x) (x) +# define be16toh(x) _byteswap_ushort(x) +# define le16toh(x) (x) + +# define htobe32(x) _byteswap_ulong(x) +# define htole32(x) (x) +# define be32toh(x) _byteswap_ulong(x) +# define le32toh(x) (x) + +# define htobe64(x) _byteswap_uint64(x) +# define be64toh(x) _byteswap_uint64(x) +# define htole64(x) (x) +# define le64toh(x) (x) + +# elif BYTE_ORDER == BIG_ENDIAN + + /* that would be xbox 360 */ +# define htobe16(x) (x) +# define htole16(x) __builtin_bswap16(x) +# define be16toh(x) (x) +# define le16toh(x) __builtin_bswap16(x) + +# define htobe32(x) (x) +# define htole32(x) __builtin_bswap32(x) +# define be32toh(x) (x) +# define le32toh(x) __builtin_bswap32(x) + +# define htobe64(x) (x) +# define htole64(x) __builtin_bswap64(x) +# define be64toh(x) (x) +# define le64toh(x) __builtin_bswap64(x) + +# else + +# error byte order not supported + +# endif + +# define __BYTE_ORDER BYTE_ORDER +# define __BIG_ENDIAN BIG_ENDIAN +# define __LITTLE_ENDIAN LITTLE_ENDIAN +# define __PDP_ENDIAN PDP_ENDIAN + +#elif defined(__sun) + +# include + +# define htobe16(x) BE_16(x) +# define htole16(x) LE_16(x) +# define be16toh(x) BE_16(x) +# define le16toh(x) LE_16(x) + +# define htobe32(x) BE_32(x) +# define htole32(x) LE_32(x) +# define be32toh(x) BE_32(x) +# define le32toh(x) LE_32(x) + +# define htobe64(x) BE_64(x) +# define htole64(x) LE_64(x) +# define be64toh(x) BE_64(x) +# define le64toh(x) LE_64(x) + +#elif defined _AIX /* AIX is always big endian */ +# define be64toh(x) (x) +# define be32toh(x) (x) +# define be16toh(x) (x) +# define le32toh(x) \ + ((((x) & 0xff) << 24) | \ + (((x) & 0xff00) << 8) | \ + (((x) & 0xff0000) >> 8) | \ + (((x) & 0xff000000) >> 24)) +# define le64toh(x) \ + ((((x) & 0x00000000000000ffL) << 56) | \ + (((x) & 0x000000000000ff00L) << 40) | \ + (((x) & 0x0000000000ff0000L) << 24) | \ + (((x) & 0x00000000ff000000L) << 8) | \ + (((x) & 0x000000ff00000000L) >> 8) | \ + (((x) & 0x0000ff0000000000L) >> 24) | \ + (((x) & 0x00ff000000000000L) >> 40) | \ + (((x) & 0xff00000000000000L) >> 56)) +# ifndef htobe64 +# define htobe64(x) be64toh(x) +# endif +# ifndef htobe32 +# define htobe32(x) be32toh(x) +# endif +# ifndef htobe16 +# define htobe16(x) be16toh(x) +# endif -# define __BYTE_ORDER BYTE_ORDER -# define __BIG_ENDIAN BIG_ENDIAN -# define __LITTLE_ENDIAN LITTLE_ENDIAN -# define __PDP_ENDIAN PDP_ENDIAN #else -# error platform not supported +# error platform not supported #endif From 0393165570b4ee23cbd285d9c459949ee2b2cebe Mon Sep 17 00:00:00 2001 From: Logan007 Date: Sat, 13 Jun 2020 19:25:39 +0545 Subject: [PATCH 4/7] polished speck --- CMakeLists.txt | 1 + Makefile.in | 1 + edge.c | 8 ++- pearson.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++ pearson.h | 1 + transform_speck.c | 12 ++-- 6 files changed, 151 insertions(+), 9 deletions(-) create mode 100644 pearson.c create mode 100644 pearson.h diff --git a/CMakeLists.txt b/CMakeLists.txt index b5fd37b..a1eb4c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,7 @@ add_library(n2n n2n.c transform_tf.c transform_aes.c random_numbers.c + pearson.c tuntap_freebsd.c tuntap_netbsd.c tuntap_linux.c diff --git a/Makefile.in b/Makefile.in index b231aac..5b5a19d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,6 +51,7 @@ N2N_LIB=libn2n.a N2N_OBJS=n2n.o wire.o minilzo.o twofish.o speck.o \ edge_utils.o sn_utils.o \ transform_null.o transform_tf.o transform_aes.o transform_cc20.o transform_speck.o \ + pearson.o \ tuntap_freebsd.o tuntap_netbsd.o tuntap_linux.o random_numbers.o \ tuntap_osx.o LIBS_EDGE+=$(LIBS_EDGE_OPT) diff --git a/edge.c b/edge.c index 5b7b84a..8babd45 100644 --- a/edge.c +++ b/edge.c @@ -197,8 +197,7 @@ static void help() { #ifdef HAVE_OPENSSL_1_1 printf("-A4 | Use ChaCha20 for payload encryption. Requires a key.\n"); #endif -// COMING SOON, not yet implemented in setPayloadEncryption(...) -// printf("-A5 | Use Speck for payload encryption. Requires a key.\n"); + printf("-A5 | Use Speck for payload encryption. Requires a key.\n"); printf("-z1 or -z | Enable lzo1x compression for outgoing data packets\n"); #ifdef N2N_HAVE_ZSTD printf("-z2 | Enable zstd compression for outgoing data packets\n"); @@ -283,6 +282,11 @@ static void setPayloadEncryption( n2n_edge_conf_t *conf, int cipher) { break; } #endif + case 5: + { + conf->transop_id = N2N_TRANSFORM_ID_SPECK; + break; + } default: { conf->transop_id = N2N_TRANSFORM_ID_INVAL; diff --git a/pearson.c b/pearson.c new file mode 100644 index 0000000..2ec74bd --- /dev/null +++ b/pearson.c @@ -0,0 +1,137 @@ +#include +#include + +#include "pearson.h" + + +// table as in original paper "Fast Hashing of Variable-Length Text Strings" by Peter K. Pearson +// as published in The Communications of the ACM Vol.33, No. 6 (June 1990), pp. 677-680. +static const uint8_t t[256] ={ + 0x01, 0x57, 0x31, 0x0c, 0xb0, 0xb2, 0x66, 0xa6, 0x79, 0xc1, 0x06, 0x54, 0xf9, 0xe6, 0x2c, 0xa3, + 0x0e, 0xc5, 0xd5, 0xb5, 0xa1, 0x55, 0xda, 0x50, 0x40, 0xef, 0x18, 0xe2, 0xec, 0x8e, 0x26, 0xc8, + 0x6e, 0xb1, 0x68, 0x67, 0x8d, 0xfd, 0xff, 0x32, 0x4d, 0x65, 0x51, 0x12, 0x2d, 0x60, 0x1f, 0xde, + 0x19, 0x6b, 0xbe, 0x46, 0x56, 0xed, 0xf0, 0x22, 0x48, 0xf2, 0x14, 0xd6, 0xf4, 0xe3, 0x95, 0xeb, + 0x61, 0xea, 0x39, 0x16, 0x3c, 0xfa, 0x52, 0xaf, 0xd0, 0x05, 0x7f, 0xc7, 0x6f, 0x3e, 0x87, 0xf8, + 0xae, 0xa9, 0xd3, 0x3a, 0x42, 0x9a, 0x6a, 0xc3, 0xf5, 0xab, 0x11, 0xbb, 0xb6, 0xb3, 0x00, 0xf3, + 0x84, 0x38, 0x94, 0x4b, 0x80, 0x85, 0x9e, 0x64, 0x82, 0x7e, 0x5b, 0x0d, 0x99, 0xf6, 0xd8, 0xdb, + 0x77, 0x44, 0xdf, 0x4e, 0x53, 0x58, 0xc9, 0x63, 0x7a, 0x0b, 0x5c, 0x20, 0x88, 0x72, 0x34, 0x0a, + 0x8a, 0x1e, 0x30, 0xb7, 0x9c, 0x23, 0x3d, 0x1a, 0x8f, 0x4a, 0xfb, 0x5e, 0x81, 0xa2, 0x3f, 0x98, + 0xaa, 0x07, 0x73, 0xa7, 0xf1, 0xce, 0x03, 0x96, 0x37, 0x3b, 0x97, 0xdc, 0x5a, 0x35, 0x17, 0x83, + 0x7d, 0xad, 0x0f, 0xee, 0x4f, 0x5f, 0x59, 0x10, 0x69, 0x89, 0xe1, 0xe0, 0xd9, 0xa0, 0x25, 0x7b, + 0x76, 0x49, 0x02, 0x9d, 0x2e, 0x74, 0x09, 0x91, 0x86, 0xe4, 0xcf, 0xd4, 0xca, 0xd7, 0x45, 0xe5, + 0x1b, 0xbc, 0x43, 0x7c, 0xa8, 0xfc, 0x2a, 0x04, 0x1d, 0x6c, 0x15, 0xf7, 0x13, 0xcd, 0x27, 0xcb, + 0xe9, 0x28, 0xba, 0x93, 0xc6, 0xc0, 0x9b, 0x21, 0xa4, 0xbf, 0x62, 0xcc, 0xa5, 0xb4, 0x75, 0x4c, + 0x8c, 0x24, 0xd2, 0xac, 0x29, 0x36, 0x9f, 0x08, 0xb9, 0xe8, 0x71, 0xc4, 0xe7, 0x2f, 0x92, 0x78, + 0x33, 0x41, 0x1c, 0x90, 0xfe, 0xdd, 0x5d, 0xbd, 0xc2, 0x8b, 0x70, 0x2b, 0x47, 0x6d, 0xb8, 0xd1 }; + +/* +// alternative table as used in RFC 3074 and NOT as in original paper +static const uint8_t t[256] ={ + 0xfb, 0xaf, 0x77, 0xd7, 0x51, 0x0e, 0x4f, 0xbf, 0x67, 0x31, 0xb5, 0x8f, 0xba, 0x9d, 0x00, 0xe8, + 0x1f, 0x20, 0x37, 0x3c, 0x98, 0x3a, 0x11, 0xed, 0xae, 0x46, 0xa0, 0x90, 0xdc, 0x5a, 0x39, 0xdf, + 0x3b, 0x03, 0x12, 0x8c, 0x6f, 0xa6, 0xcb, 0xc4, 0x86, 0xf3, 0x7c, 0x5f, 0xde, 0xb3, 0xc5, 0x41, + 0xb4, 0x30, 0x24, 0x0f, 0x6b, 0x2e, 0xe9, 0x82, 0xa5, 0x1e, 0x7b, 0xa1, 0xd1, 0x17, 0x61, 0x10, + 0x28, 0x5b, 0xdb, 0x3d, 0x64, 0x0a, 0xd2, 0x6d, 0xfa, 0x7f, 0x16, 0x8a, 0x1d, 0x6c, 0xf4, 0x43, + 0xcf, 0x09, 0xb2, 0xcc, 0x4a, 0x62, 0x7e, 0xf9, 0xa7, 0x74, 0x22, 0x4d, 0xc1, 0xc8, 0x79, 0x05, + 0x14, 0x71, 0x47, 0x23, 0x80, 0x0d, 0xb6, 0x5e, 0x19, 0xe2, 0xe3, 0xc7, 0x4b, 0x1b, 0x29, 0xf5, + 0xe6, 0xe0, 0x2b, 0xe1, 0xb1, 0x1a, 0x9b, 0x96, 0xd4, 0x8e, 0xda, 0x73, 0xf1, 0x49, 0x58, 0x69, + 0x27, 0x72, 0x3e, 0xff, 0xc0, 0xc9, 0x91, 0xd6, 0xa8, 0x9e, 0xdd, 0x94, 0x9a, 0x7a, 0x0c, 0x54, + 0x52, 0xa3, 0x2c, 0x8b, 0xe4, 0xec, 0xcd, 0xf2, 0xd9, 0x0b, 0xbb, 0x92, 0x9f, 0x40, 0x56, 0xef, + 0xc3, 0x2a, 0x6a, 0xc6, 0x76, 0x70, 0xb8, 0xac, 0x57, 0x02, 0xad, 0x75, 0xb0, 0xe5, 0xf7, 0xfd, + 0x89, 0xb9, 0x63, 0xa4, 0x66, 0x93, 0x2d, 0x42, 0xe7, 0x34, 0x8d, 0xd3, 0xc2, 0xce, 0xf6, 0xee, + 0x38, 0x6e, 0x4e, 0xf8, 0x3f, 0xf0, 0xbd, 0x5d, 0x5c, 0x33, 0x35, 0xb7, 0x13, 0xab, 0x48, 0x32, + 0x21, 0x68, 0x65, 0x45, 0x08, 0xfc, 0x53, 0x78, 0x4c, 0x87, 0x55, 0x36, 0xca, 0x7d, 0xbc, 0xd5, + 0x60, 0xeb, 0x88, 0xd0, 0xa2, 0x81, 0xbe, 0x84, 0x9c, 0x26, 0x2f, 0x01, 0x07, 0xfe, 0x18, 0x04, + 0xd8, 0x83, 0x59, 0x15, 0x1c, 0x85, 0x25, 0x99, 0x95, 0x50, 0xaa, 0x44, 0x06, 0xa9, 0xea, 0x97 }; */ + + +#define ROR64(x,r) (((x)>>(r))|((x)<<(64-(r)))) + + +void pearson_hash_256 (uint8_t *out, const uint8_t *in, size_t len) { + + /* initial values - astonishingly, assembling using SHIFTs and ORs (in register) + * works faster on well pipelined CPUs than loading the 64-bit value from memory. + * however, there is one advantage to loading from memory: as we also store back to + * memory at the end, we do not need to care about endianess! */ + uint8_t upper[8] = { 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08 }; + uint8_t lower[8] = { 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 }; + + uint64_t upper_hash_mask = *(uint64_t*)&upper; + uint64_t lower_hash_mask = *(uint64_t*)&lower; + uint64_t high_upper_hash_mask = upper_hash_mask + 0x1010101010101010; + uint64_t high_lower_hash_mask = lower_hash_mask + 0x1010101010101010; + + uint64_t upper_hash = 0; + uint64_t lower_hash = 0; + uint64_t high_upper_hash = 0; + uint64_t high_lower_hash = 0; + + for (size_t i = 0; i < len; i++) { + // broadcast the character, xor into hash, make them different permutations + uint64_t c = (uint8_t)in[i]; + c |= c << 8; + c |= c << 16; + c |= c << 32; + upper_hash ^= c ^ upper_hash_mask; + lower_hash ^= c ^ lower_hash_mask; + high_upper_hash ^= c ^ high_upper_hash_mask; + high_lower_hash ^= c ^ high_lower_hash_mask; + + // table lookup + uint8_t x; + uint64_t h = 0; + x = upper_hash; x = t[x]; upper_hash >>= 8; h |= x; h=ROR64(h,8); + x = upper_hash; x = t[x]; upper_hash >>= 8; h |= x; h=ROR64(h,8); + x = upper_hash; x = t[x]; upper_hash >>= 8; h |= x; h=ROR64(h,8); + x = upper_hash; x = t[x]; upper_hash >>= 8; h |= x; h=ROR64(h,8); + x = upper_hash; x = t[x]; upper_hash >>= 8; h |= x; h=ROR64(h,8); + x = upper_hash; x = t[x]; upper_hash >>= 8; h |= x; h=ROR64(h,8); + x = upper_hash; x = t[x]; upper_hash >>= 8; h |= x; h=ROR64(h,8); + x = upper_hash; x = t[x]; upper_hash >>= 8; h |= x; h=ROR64(h,8); + upper_hash = h; + + h = 0; + x = lower_hash; x = t[x]; lower_hash >>= 8; h |= x; h=ROR64(h,8); + x = lower_hash; x = t[x]; lower_hash >>= 8; h |= x; h=ROR64(h,8); + x = lower_hash; x = t[x]; lower_hash >>= 8; h |= x; h=ROR64(h,8); + x = lower_hash; x = t[x]; lower_hash >>= 8; h |= x; h=ROR64(h,8); + x = lower_hash; x = t[x]; lower_hash >>= 8; h |= x; h=ROR64(h,8); + x = lower_hash; x = t[x]; lower_hash >>= 8; h |= x; h=ROR64(h,8); + x = lower_hash; x = t[x]; lower_hash >>= 8; h |= x; h=ROR64(h,8); + x = lower_hash; x = t[x]; lower_hash >>= 8; h |= x; h=ROR64(h,8); + lower_hash = h; + + h = 0; + x = high_upper_hash; x = t[x]; high_upper_hash >>= 8; h |= x; h=ROR64(h,8); + x = high_upper_hash; x = t[x]; high_upper_hash >>= 8; h |= x; h=ROR64(h,8); + x = high_upper_hash; x = t[x]; high_upper_hash >>= 8; h |= x; h=ROR64(h,8); + x = high_upper_hash; x = t[x]; high_upper_hash >>= 8; h |= x; h=ROR64(h,8); + x = high_upper_hash; x = t[x]; high_upper_hash >>= 8; h |= x; h=ROR64(h,8); + x = high_upper_hash; x = t[x]; high_upper_hash >>= 8; h |= x; h=ROR64(h,8); + x = high_upper_hash; x = t[x]; high_upper_hash >>= 8; h |= x; h=ROR64(h,8); + x = high_upper_hash; x = t[x]; high_upper_hash >>= 8; h |= x; h=ROR64(h,8); + high_upper_hash = h; + + h = 0; + x = high_lower_hash; x = t[x]; high_lower_hash >>= 8; h |= x; h=ROR64(h,8); + x = high_lower_hash; x = t[x]; high_lower_hash >>= 8; h |= x; h=ROR64(h,8); + x = high_lower_hash; x = t[x]; high_lower_hash >>= 8; h |= x; h=ROR64(h,8); + x = high_lower_hash; x = t[x]; high_lower_hash >>= 8; h |= x; h=ROR64(h,8); + x = high_lower_hash; x = t[x]; high_lower_hash >>= 8; h |= x; h=ROR64(h,8); + x = high_lower_hash; x = t[x]; high_lower_hash >>= 8; h |= x; h=ROR64(h,8); + x = high_lower_hash; x = t[x]; high_lower_hash >>= 8; h |= x; h=ROR64(h,8); + x = high_lower_hash; x = t[x]; high_lower_hash >>= 8; h |= x; h=ROR64(h,8); + high_lower_hash = h; + } + // store output + uint64_t *o; + o = (uint64_t*)&out[0]; + *o = high_upper_hash; + o = (uint64_t*)&out[8]; + *o = high_lower_hash; + o = (uint64_t*)&out[16]; + *o = upper_hash; + o = (uint64_t*)&out[24]; + *o = lower_hash; +} diff --git a/pearson.h b/pearson.h new file mode 100644 index 0000000..43d1f98 --- /dev/null +++ b/pearson.h @@ -0,0 +1 @@ +void pearson_hash_256 (uint8_t *out, const uint8_t *in, size_t len); diff --git a/transform_speck.c b/transform_speck.c index 093475e..9ae5cd7 100644 --- a/transform_speck.c +++ b/transform_speck.c @@ -20,6 +20,7 @@ #include "n2n_transforms.h" #include "speck.h" #include "random_numbers.h" +#include "pearson.h" #define N2N_SPECK_TRANSFORM_VERSION 1 /* version of the transform encoding */ #define N2N_SPECK_IVEC_SIZE 16 @@ -175,13 +176,10 @@ static int setup_speck_key(transop_speck_t *priv, const uint8_t *key, ssize_t ke /* Clear out any old possibly longer key matter. */ memset(&(priv->ctx), 0, sizeof(speck_context_t) ); - /* TODO: The input key always gets hashed to make a more unpredictable and more complete use of the key space */ - // REVISIT: Hash the key to keymat (formerly used: SHA) - // SHA256(key, key_size, key_mat_buf) - // memcpy (priv->key, key_mat_buf, SHA256_DIGEST_LENGTH); - // ADD: Pearson Hashing - // FOR NOW: USE KEY ITSELF - memcpy (key_mat_buf, key, ((key_size>32)?32:key_size) ); + /* the input key always gets hashed to make a more unpredictable and more complete use of the key space */ + pearson_hash_256 (key_mat_buf, key, key_size); + + /* expand the key material to the context (= round keys) */ speck_expand_key (key_mat_buf, &(priv->ctx)); traceEvent(TRACE_DEBUG, "Speck key setup completed\n"); From eeedb509f89b8454601030774837cb8ba5df73ee Mon Sep 17 00:00:00 2001 From: Logan oos Even <46396513+Logan007@users.noreply.github.com> Date: Mon, 15 Jun 2020 15:04:54 +0545 Subject: [PATCH 5/7] indicated source --- pearson.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pearson.c b/pearson.c index 2ec74bd..ca2aa3e 100644 --- a/pearson.c +++ b/pearson.c @@ -1,3 +1,5 @@ +// taken from https://github.com/Logan007/pearson + #include #include From a1670c52123911be41780d408a5c9ef7d296d59a Mon Sep 17 00:00:00 2001 From: Logan oos Even <46396513+Logan007@users.noreply.github.com> Date: Wed, 17 Jun 2020 02:47:26 +0545 Subject: [PATCH 6/7] updated pearson.c --- pearson.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pearson.c b/pearson.c index ca2aa3e..e91bd94 100644 --- a/pearson.c +++ b/pearson.c @@ -1,5 +1,7 @@ // taken from https://github.com/Logan007/pearson +// This is free and unencumbered software released into the public domain. + #include #include From 68428a8d2af1e418878c89f90c163d56611755a0 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Wed, 17 Jun 2020 06:54:02 +0200 Subject: [PATCH 7/7] Updated (C) --- edge.c | 2 +- edge_utils.c | 2 +- example_edge_embed_quick_edge_init.c | 2 +- n2n.c | 2 +- n2n.h | 2 +- n2n_transforms.h | 2 +- n2n_wire.h | 2 +- pearson.c | 18 ++++++++++++++++++ pearson.h | 18 ++++++++++++++++++ sn.c | 2 +- transform_null.c | 2 +- transform_tf.c | 2 +- tuntap_freebsd.c | 2 +- tuntap_linux.c | 2 +- tuntap_netbsd.c | 2 +- tuntap_osx.c | 2 +- wire.c | 2 +- 17 files changed, 51 insertions(+), 15 deletions(-) diff --git a/edge.c b/edge.c index 8babd45..b15762d 100644 --- a/edge.c +++ b/edge.c @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/edge_utils.c b/edge_utils.c index 825b8ef..cf2e80e 100644 --- a/edge_utils.c +++ b/edge_utils.c @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/example_edge_embed_quick_edge_init.c b/example_edge_embed_quick_edge_init.c index ba0eb02..4618059 100644 --- a/example_edge_embed_quick_edge_init.c +++ b/example_edge_embed_quick_edge_init.c @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/n2n.c b/n2n.c index b3479ce..fe8d39a 100644 --- a/n2n.c +++ b/n2n.c @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/n2n.h b/n2n.h index 7041fa3..7737213 100644 --- a/n2n.h +++ b/n2n.h @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/n2n_transforms.h b/n2n_transforms.h index 1734ec1..589e36b 100644 --- a/n2n_transforms.h +++ b/n2n_transforms.h @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/n2n_wire.h b/n2n_wire.h index 0a64f4a..7cd0e41 100644 --- a/n2n_wire.h +++ b/n2n_wire.h @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/pearson.c b/pearson.c index e91bd94..0ff0e0d 100644 --- a/pearson.c +++ b/pearson.c @@ -1,3 +1,21 @@ +/** + * (C) 2007-20 - ntop.org and contributors + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not see see + * + */ + // taken from https://github.com/Logan007/pearson // This is free and unencumbered software released into the public domain. diff --git a/pearson.h b/pearson.h index 43d1f98..5e4ca66 100644 --- a/pearson.h +++ b/pearson.h @@ -1 +1,19 @@ +/** + * (C) 2007-20 - ntop.org and contributors + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not see see + * + */ + void pearson_hash_256 (uint8_t *out, const uint8_t *in, size_t len); diff --git a/sn.c b/sn.c index 9d7c26b..8c01a7b 100644 --- a/sn.c +++ b/sn.c @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/transform_null.c b/transform_null.c index 062ddf2..830bcfa 100644 --- a/transform_null.c +++ b/transform_null.c @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/transform_tf.c b/transform_tf.c index 412f65f..481e972 100644 --- a/transform_tf.c +++ b/transform_tf.c @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/tuntap_freebsd.c b/tuntap_freebsd.c index 7404c95..d871e89 100644 --- a/tuntap_freebsd.c +++ b/tuntap_freebsd.c @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/tuntap_linux.c b/tuntap_linux.c index 6e1e770..7a5cbb4 100644 --- a/tuntap_linux.c +++ b/tuntap_linux.c @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/tuntap_netbsd.c b/tuntap_netbsd.c index 2d948d9..617e2b2 100644 --- a/tuntap_netbsd.c +++ b/tuntap_netbsd.c @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/tuntap_osx.c b/tuntap_osx.c index 52a1d28..ef166ff 100644 --- a/tuntap_osx.c +++ b/tuntap_osx.c @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/wire.c b/wire.c index e2f2974..7febcc4 100644 --- a/wire.c +++ b/wire.c @@ -1,5 +1,5 @@ /** - * (C) 2007-18 - ntop.org and contributors + * (C) 2007-20 - ntop.org and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by