From 59ebf2978741fb4cf0086440e23a1fcb522fdc21 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Tue, 4 Jun 2013 14:43:22 +0200 Subject: [PATCH] curve: move taia related functions into own header Move them into a separate header, structures and inline functions, since they are more or less independant of curve.h. Signed-off-by: Daniel Borkmann --- curve.h | 140 +----------------------------------------------------- curve.h => taia.h | 92 ++++++++--------------------------- 2 files changed, 20 insertions(+), 212 deletions(-) copy curve.h => taia.h (57%) diff --git a/curve.h b/curve.h index ee4a3223..c5ad8e88 100644 --- a/curve.h +++ b/curve.h @@ -14,18 +14,9 @@ #include "built_in.h" #include "ioops.h" #include "rnd.h" +#include "taia.h" #include "crypto.h" -struct tai { - uint64_t x; -}; - -struct taia { - struct tai sec; - uint32_t nano; - uint32_t atto; -}; - static struct taia tolerance_taia = { .sec.x = 0, .nano = 700000000ULL, @@ -59,135 +50,6 @@ extern ssize_t curve25519_decode(struct curve25519_struct *curve, struct curve25 unsigned char *chipertext, size_t size, unsigned char **plaintext, struct taia *arrival_taia); -static inline void tai_pack(unsigned char *s, struct tai *t) -{ - uint64_t x; - - x = t->x; - s[7] = x & 255; x >>= 8; - s[6] = x & 255; x >>= 8; - s[5] = x & 255; x >>= 8; - s[4] = x & 255; x >>= 8; - s[3] = x & 255; x >>= 8; - s[2] = x & 255; x >>= 8; - s[1] = x & 255; x >>= 8; - s[0] = x; -} - -static inline void tai_unpack(unsigned char *s, struct tai *t) -{ - uint64_t x; - - x = (unsigned char) s[0]; - x <<= 8; x += (unsigned char) s[1]; - x <<= 8; x += (unsigned char) s[2]; - x <<= 8; x += (unsigned char) s[3]; - x <<= 8; x += (unsigned char) s[4]; - x <<= 8; x += (unsigned char) s[5]; - x <<= 8; x += (unsigned char) s[6]; - x <<= 8; x += (unsigned char) s[7]; - t->x = x; -} - -static inline void taia_pack(unsigned char *s, struct taia *t) -{ - unsigned long x; - - tai_pack(s, &t->sec); - s += 8; - x = t->atto; - s[7] = x & 255; x >>= 8; - s[6] = x & 255; x >>= 8; - s[5] = x & 255; x >>= 8; - s[4] = x; - x = t->nano; - s[3] = x & 255; x >>= 8; - s[2] = x & 255; x >>= 8; - s[1] = x & 255; x >>= 8; - s[0] = x; -} - -static inline void taia_unpack(unsigned char *s, struct taia *t) -{ - unsigned long x; - - tai_unpack(s, &t->sec); - s += 8; - x = (unsigned char) s[4]; - x <<= 8; x += (unsigned char) s[5]; - x <<= 8; x += (unsigned char) s[6]; - x <<= 8; x += (unsigned char) s[7]; - t->atto = x; - x = (unsigned char) s[0]; - x <<= 8; x += (unsigned char) s[1]; - x <<= 8; x += (unsigned char) s[2]; - x <<= 8; x += (unsigned char) s[3]; - t->nano = x; -} - -#define tai_unix(t, u) ((void) ((t)->x = 4611686018427387914ULL + (uint64_t) (u))) - -static inline void taia_now(struct taia *t) -{ - struct timeval now; - - gettimeofday(&now, NULL); - - tai_unix(&t->sec, now.tv_sec); - t->nano = 1000 * now.tv_usec + 500; - t->atto = secrand(); -} - -static inline void taia_sub(struct taia *res, const struct taia *u, const struct taia *v) -{ - unsigned long unano = u->nano; - unsigned long uatto = u->atto; - - res->sec.x = u->sec.x - v->sec.x; - res->nano = unano - v->nano; - res->atto = uatto - v->atto; - - if (res->atto > uatto) { - res->atto += 1000000000UL; - --res->nano; - } - - if (res->nano > unano) { - res->nano += 1000000000UL; - --res->sec.x; - } -} - -static inline void taia_add(struct taia *res, const struct taia *u, const struct taia *v) -{ - res->sec.x = u->sec.x + v->sec.x; - res->nano = u->nano + v->nano; - res->atto = u->atto + v->atto; - - if (res->atto > 999999999UL) { - res->atto -= 1000000000UL; - ++res->nano; - } - - if (res->nano > 999999999UL) { - res->nano -= 1000000000UL; - ++res->sec.x; - } -} - -static inline int taia_less(const struct taia *t, const struct taia *u) -{ - if (t->sec.x < u->sec.x) - return 1; - if (t->sec.x > u->sec.x) - return 0; - if (t->nano < u->nano) - return 1; - if (t->nano > u->nano) - return 0; - return t->atto < u->atto; -} - static inline int is_good_taia(struct taia *arrival_taia, struct taia *packet_taia) { int is_ts_good = 0; diff --git a/curve.h b/taia.h similarity index 57% copy from curve.h copy to taia.h index ee4a3223..227321d3 100644 --- a/curve.h +++ b/taia.h @@ -1,20 +1,7 @@ -/* - * netsniff-ng - the packet sniffing beast - * Copyright 2011 - 2013 Daniel Borkmann. - * Subject to the GPL, version 2. - */ - -#ifndef CURVE_H -#define CURVE_H +#ifndef TAIA_H +#define TAIA_H #include -#include - -#include "locking.h" -#include "built_in.h" -#include "ioops.h" -#include "rnd.h" -#include "crypto.h" struct tai { uint64_t x; @@ -26,44 +13,12 @@ struct taia { uint32_t atto; }; -static struct taia tolerance_taia = { - .sec.x = 0, - .nano = 700000000ULL, - .atto = 0, -}; - -struct curve25519_proto { - unsigned char enonce[crypto_box_noncebytes] __aligned_16; - unsigned char dnonce[crypto_box_noncebytes] __aligned_16; - unsigned char key[crypto_box_noncebytes] __aligned_16; -}; - -struct curve25519_struct { - unsigned char *enc_buf; - unsigned char *dec_buf; - size_t enc_buf_size; - size_t dec_buf_size; - struct spinlock enc_lock; - struct spinlock dec_lock; -}; - -extern void curve25519_selftest(void); -extern void curve25519_alloc_or_maybe_die(struct curve25519_struct *curve); -extern void curve25519_free(void *curve); -extern int curve25519_pubkey_hexparse_32(unsigned char *bin, size_t blen, const char *ascii, size_t alen); -extern int curve25519_proto_init(struct curve25519_proto *proto, unsigned char *pubkey_remote, size_t len, - char *home, int server); -extern ssize_t curve25519_encode(struct curve25519_struct *curve, struct curve25519_proto *proto, - unsigned char *plaintext, size_t size, unsigned char **chipertext); -extern ssize_t curve25519_decode(struct curve25519_struct *curve, struct curve25519_proto *proto, - unsigned char *chipertext, size_t size, unsigned char **plaintext, - struct taia *arrival_taia); - static inline void tai_pack(unsigned char *s, struct tai *t) { uint64_t x; x = t->x; + s[7] = x & 255; x >>= 8; s[6] = x & 255; x >>= 8; s[5] = x & 255; x >>= 8; @@ -86,6 +41,7 @@ static inline void tai_unpack(unsigned char *s, struct tai *t) x <<= 8; x += (unsigned char) s[5]; x <<= 8; x += (unsigned char) s[6]; x <<= 8; x += (unsigned char) s[7]; + t->x = x; } @@ -94,13 +50,18 @@ static inline void taia_pack(unsigned char *s, struct taia *t) unsigned long x; tai_pack(s, &t->sec); + s += 8; + x = t->atto; + s[7] = x & 255; x >>= 8; s[6] = x & 255; x >>= 8; s[5] = x & 255; x >>= 8; s[4] = x; + x = t->nano; + s[3] = x & 255; x >>= 8; s[2] = x & 255; x >>= 8; s[1] = x & 255; x >>= 8; @@ -112,16 +73,21 @@ static inline void taia_unpack(unsigned char *s, struct taia *t) unsigned long x; tai_unpack(s, &t->sec); + s += 8; + x = (unsigned char) s[4]; x <<= 8; x += (unsigned char) s[5]; x <<= 8; x += (unsigned char) s[6]; x <<= 8; x += (unsigned char) s[7]; + t->atto = x; + x = (unsigned char) s[0]; x <<= 8; x += (unsigned char) s[1]; x <<= 8; x += (unsigned char) s[2]; x <<= 8; x += (unsigned char) s[3]; + t->nano = x; } @@ -138,7 +104,8 @@ static inline void taia_now(struct taia *t) t->atto = secrand(); } -static inline void taia_sub(struct taia *res, const struct taia *u, const struct taia *v) +static inline void taia_sub(struct taia *res, const struct taia *u, + const struct taia *v) { unsigned long unano = u->nano; unsigned long uatto = u->atto; @@ -158,7 +125,8 @@ static inline void taia_sub(struct taia *res, const struct taia *u, const struct } } -static inline void taia_add(struct taia *res, const struct taia *u, const struct taia *v) +static inline void taia_add(struct taia *res, const struct taia *u, + const struct taia *v) { res->sec.x = u->sec.x + v->sec.x; res->nano = u->nano + v->nano; @@ -188,26 +156,4 @@ static inline int taia_less(const struct taia *t, const struct taia *u) return t->atto < u->atto; } -static inline int is_good_taia(struct taia *arrival_taia, struct taia *packet_taia) -{ - int is_ts_good = 0; - struct taia sub_res; - - if (taia_less(arrival_taia, packet_taia)) { - taia_sub(&sub_res, packet_taia, arrival_taia); - if (taia_less(&sub_res, &tolerance_taia)) - is_ts_good = 1; - else - is_ts_good = 0; - } else { - taia_sub(&sub_res, arrival_taia, packet_taia); - if (taia_less(&sub_res, &tolerance_taia)) - is_ts_good = 1; - else - is_ts_good = 0; - } - - return is_ts_good; -} - -#endif /* CURVE_H */ +#endif /* TAIA_H */ -- 2.11.4.GIT