From 2138deb07ebb7d7e541c0cd35b966e107d1bf800 Mon Sep 17 00:00:00 2001 From: Lukasz Skalski Date: Tue, 24 Feb 2015 11:20:02 +0000 Subject: [PATCH] [kdbus] Make SipHash function as a private utility function to kdbus --- gio/gkdbus.c | 107 ++++++++++++++++++++++++++++++++++++++++--- glib/Makefile.am | 2 - glib/glib.h | 1 - glib/gsiphash.c | 137 ------------------------------------------------------- glib/gsiphash.h | 40 ---------------- 5 files changed, 101 insertions(+), 186 deletions(-) delete mode 100644 glib/gsiphash.c delete mode 100644 glib/gsiphash.h diff --git a/gio/gkdbus.c b/gio/gkdbus.c index c25adbc..10becde 100644 --- a/gio/gkdbus.c +++ b/gio/gkdbus.c @@ -51,10 +51,11 @@ #include "glibintl.h" #include "gunixfdmessage.h" -#define KDBUS_TIMEOUT_NS 2000000000LU -#define KDBUS_POOL_SIZE (16 * 1024LU * 1024LU) -#define KDBUS_ALIGN8(l) (((l) + 7) & ~7) -#define KDBUS_ALIGN8_PTR(p) ((void*) (uintptr_t)(p)) +#define KDBUS_MSG_MAX_SIZE 8192 +#define KDBUS_TIMEOUT_NS 2000000000LU +#define KDBUS_POOL_SIZE (16 * 1024LU * 1024LU) +#define KDBUS_ALIGN8(l) (((l) + 7) & ~7) +#define KDBUS_ALIGN8_PTR(p) ((void*) (uintptr_t)(p)) #define KDBUS_ITEM_HEADER_SIZE G_STRUCT_OFFSET(struct kdbus_item, data) #define KDBUS_ITEM_SIZE(s) KDBUS_ALIGN8((s) + KDBUS_ITEM_HEADER_SIZE) @@ -86,7 +87,37 @@ struct dbus_fixed_header { #define DBUS_EXTENDED_HEADER_TYPE ((const GVariantType *) "a{tv}") #define DBUS_MESSAGE_TYPE ((const GVariantType *) "((yyyyut)a{tv}v)") -#define KDBUS_MSG_MAX_SIZE 8192 +/* + * Macros for SipHash algorithm + */ + +#define ROTL(x,b) (guint64)( ((x) << (b)) | ( (x) >> (64 - (b))) ) + +#define U32TO8_LE(p, v) \ + (p)[0] = (guint8)((v) ); (p)[1] = (guint8)((v) >> 8); \ + (p)[2] = (guint8)((v) >> 16); (p)[3] = (guint8)((v) >> 24); + +#define U64TO8_LE(p, v) \ + U32TO8_LE((p), (guint32)((v) )); \ + U32TO8_LE((p) + 4, (guint32)((v) >> 32)); + +#define U8TO64_LE(p) \ + (((guint64)((p)[0]) ) | \ + ((guint64)((p)[1]) << 8) | \ + ((guint64)((p)[2]) << 16) | \ + ((guint64)((p)[3]) << 24) | \ + ((guint64)((p)[4]) << 32) | \ + ((guint64)((p)[5]) << 40) | \ + ((guint64)((p)[6]) << 48) | \ + ((guint64)((p)[7]) << 56)) + +#define SIPROUND \ + do { \ + v0 += v1; v1=ROTL(v1,13); v1 ^= v0; v0=ROTL(v0,32); \ + v2 += v3; v3=ROTL(v3,16); v3 ^= v2; \ + v0 += v3; v3=ROTL(v3,21); v3 ^= v0; \ + v2 += v1; v1=ROTL(v1,17); v1 ^= v2; v2=ROTL(v2,32); \ + } while(0) typedef enum { @@ -181,6 +212,70 @@ typedef struct { /** + * SipHash algorithm + * + */ +static void +_g_siphash24 (guint8 out[8], + const void *_in, + gsize inlen, + const guint8 k[16]) +{ + /* "somepseudorandomlygeneratedbytes" */ + guint64 v0 = 0x736f6d6570736575ULL; + guint64 v1 = 0x646f72616e646f6dULL; + guint64 v2 = 0x6c7967656e657261ULL; + guint64 v3 = 0x7465646279746573ULL; + guint64 b; + guint64 k0 = U8TO64_LE (k); + guint64 k1 = U8TO64_LE (k + 8); + guint64 m; + const guint8 *in = _in; + const guint8 *end = in + inlen - (inlen % sizeof(guint64)); + const int left = inlen & 7; + b = ((guint64) inlen) << 56; + v3 ^= k1; + v2 ^= k0; + v1 ^= k1; + v0 ^= k0; + + for (; in != end; in += 8) + { + m = U8TO64_LE (in); + v3 ^= m; + SIPROUND; + SIPROUND; + v0 ^= m; + } + + switch (left) + { + case 7: b |= ((guint64) in[6]) << 48; + case 6: b |= ((guint64) in[5]) << 40; + case 5: b |= ((guint64) in[4]) << 32; + case 4: b |= ((guint64) in[3]) << 24; + case 3: b |= ((guint64) in[2]) << 16; + case 2: b |= ((guint64) in[1]) << 8; + case 1: b |= ((guint64) in[0]); break; + case 0: break; + } + + v3 ^= b; + SIPROUND; + SIPROUND; + v0 ^= b; + + v2 ^= 0xff; + SIPROUND; + SIPROUND; + SIPROUND; + SIPROUND; + b = v0 ^ v1 ^ v2 ^ v3; + U64TO8_LE (out, b); +} + + +/** * is_key() * */ @@ -1213,7 +1308,7 @@ g_kdbus_bloom_add_data (GKDBusWorker *worker, { if (c <= 0) { - g_siphash24(hash, data, n, hash_keys[cnt_1++]); + _g_siphash24(hash, data, n, hash_keys[cnt_1++]); c += 8; } diff --git a/glib/Makefile.am b/glib/Makefile.am index 0b7c8d8..6b8e629 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -159,7 +159,6 @@ libglib_2_0_la_SOURCES = \ gscripttable.h \ gsequence.c \ gshell.c \ - gsiphash.c \ gslice.c \ gslist.c \ gstdio.c \ @@ -292,7 +291,6 @@ glibsubinclude_HEADERS = \ gscanner.h \ gsequence.h \ gshell.h \ - gsiphash.h \ gslice.h \ gslist.h \ gspawn.h \ diff --git a/glib/glib.h b/glib/glib.h index e83caa6..c7fc999 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -73,7 +73,6 @@ #include #include #include -#include #include #include #include diff --git a/glib/gsiphash.c b/glib/gsiphash.c deleted file mode 100644 index 6cda0dd..0000000 --- a/glib/gsiphash.c +++ /dev/null @@ -1,137 +0,0 @@ -/* - SipHash reference C implementation - - Written in 2012 by - Jean-Philippe Aumasson - Daniel J. Bernstein - - To the extent possible under law, the author(s) have dedicated all copyright - and related and neighboring rights to this software to the public domain - worldwide. This software is distributed without any warranty. - - You should have received a copy of the CC0 Public Domain Dedication along with - this software. If not, see . - -*/ - -#include "config.h" - -#include -#include -#include - -#include "gsiphash.h" - -typedef uint64_t u64; -typedef uint32_t u32; -typedef uint8_t u8; - -#define ROTL(x,b) (u64)( ((x) << (b)) | ( (x) >> (64 - (b))) ) - -#define U32TO8_LE(p, v) \ - (p)[0] = (u8)((v) ); (p)[1] = (u8)((v) >> 8); \ - (p)[2] = (u8)((v) >> 16); (p)[3] = (u8)((v) >> 24); - -#define U64TO8_LE(p, v) \ - U32TO8_LE((p), (u32)((v) )); \ - U32TO8_LE((p) + 4, (u32)((v) >> 32)); - -#define U8TO64_LE(p) \ - (((u64)((p)[0]) ) | \ - ((u64)((p)[1]) << 8) | \ - ((u64)((p)[2]) << 16) | \ - ((u64)((p)[3]) << 24) | \ - ((u64)((p)[4]) << 32) | \ - ((u64)((p)[5]) << 40) | \ - ((u64)((p)[6]) << 48) | \ - ((u64)((p)[7]) << 56)) - -#define SIPROUND \ - do { \ - v0 += v1; v1=ROTL(v1,13); v1 ^= v0; v0=ROTL(v0,32); \ - v2 += v3; v3=ROTL(v3,16); v3 ^= v2; \ - v0 += v3; v3=ROTL(v3,21); v3 ^= v0; \ - v2 += v1; v1=ROTL(v1,17); v1 ^= v2; v2=ROTL(v2,32); \ - } while(0) - -/* SipHash-2-4 */ -void g_siphash24(guint8 out[8], const void *_in, gsize inlen, const guint8 k[16]) -{ - /* "somepseudorandomlygeneratedbytes" */ - u64 v0 = 0x736f6d6570736575ULL; - u64 v1 = 0x646f72616e646f6dULL; - u64 v2 = 0x6c7967656e657261ULL; - u64 v3 = 0x7465646279746573ULL; - u64 b; - u64 k0 = U8TO64_LE( k ); - u64 k1 = U8TO64_LE( k + 8 ); - u64 m; - const u8 *in = _in; - const u8 *end = in + inlen - ( inlen % sizeof( u64 ) ); - const int left = inlen & 7; - b = ( ( u64 )inlen ) << 56; - v3 ^= k1; - v2 ^= k0; - v1 ^= k1; - v0 ^= k0; - - for ( ; in != end; in += 8 ) - { - m = U8TO64_LE( in ); -#ifdef DEBUG - printf( "(%3d) v0 %08x %08x\n", ( int )inlen, ( u32 )( v0 >> 32 ), ( u32 )v0 ); - printf( "(%3d) v1 %08x %08x\n", ( int )inlen, ( u32 )( v1 >> 32 ), ( u32 )v1 ); - printf( "(%3d) v2 %08x %08x\n", ( int )inlen, ( u32 )( v2 >> 32 ), ( u32 )v2 ); - printf( "(%3d) v3 %08x %08x\n", ( int )inlen, ( u32 )( v3 >> 32 ), ( u32 )v3 ); - printf( "(%3d) compress %08x %08x\n", ( int )inlen, ( u32 )( m >> 32 ), ( u32 )m ); -#endif - v3 ^= m; - SIPROUND; - SIPROUND; - v0 ^= m; - } - - switch( left ) - { - case 7: b |= ( ( u64 )in[ 6] ) << 48; - - case 6: b |= ( ( u64 )in[ 5] ) << 40; - - case 5: b |= ( ( u64 )in[ 4] ) << 32; - - case 4: b |= ( ( u64 )in[ 3] ) << 24; - - case 3: b |= ( ( u64 )in[ 2] ) << 16; - - case 2: b |= ( ( u64 )in[ 1] ) << 8; - - case 1: b |= ( ( u64 )in[ 0] ); break; - - case 0: break; - } - -#ifdef DEBUG - printf( "(%3d) v0 %08x %08x\n", ( int )inlen, ( u32 )( v0 >> 32 ), ( u32 )v0 ); - printf( "(%3d) v1 %08x %08x\n", ( int )inlen, ( u32 )( v1 >> 32 ), ( u32 )v1 ); - printf( "(%3d) v2 %08x %08x\n", ( int )inlen, ( u32 )( v2 >> 32 ), ( u32 )v2 ); - printf( "(%3d) v3 %08x %08x\n", ( int )inlen, ( u32 )( v3 >> 32 ), ( u32 )v3 ); - printf( "(%3d) padding %08x %08x\n", ( int )inlen, ( u32 )( b >> 32 ), ( u32 )b ); -#endif - v3 ^= b; - SIPROUND; - SIPROUND; - v0 ^= b; -#ifdef DEBUG - printf( "(%3d) v0 %08x %08x\n", ( int )inlen, ( u32 )( v0 >> 32 ), ( u32 )v0 ); - printf( "(%3d) v1 %08x %08x\n", ( int )inlen, ( u32 )( v1 >> 32 ), ( u32 )v1 ); - printf( "(%3d) v2 %08x %08x\n", ( int )inlen, ( u32 )( v2 >> 32 ), ( u32 )v2 ); - printf( "(%3d) v3 %08x %08x\n", ( int )inlen, ( u32 )( v3 >> 32 ), ( u32 )v3 ); -#endif - v2 ^= 0xff; - SIPROUND; - SIPROUND; - SIPROUND; - SIPROUND; - b = v0 ^ v1 ^ v2 ^ v3; - U64TO8_LE( out, b ); -} diff --git a/glib/gsiphash.h b/glib/gsiphash.h deleted file mode 100644 index 6040c75..0000000 --- a/glib/gsiphash.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2014 Samsung Electronics - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - - * Author: Lukasz Skalski - */ - -#ifndef __G_SIPHASH_H__ -#define __G_SIPHASH_H__ - -#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -GLIB_AVAILABLE_IN_ALL -void g_siphash24 (guint8 out[8], - const void *_in, - gsize inlen, - const guint8 k[16]); -G_END_DECLS - -#endif /* __G_SIPHASH_H__ */ -- 2.7.4