aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJP Aumasson <jeanphilippe.aumasson@gmail.com>2014-11-19 16:03:16 +0100
committerJP Aumasson <jeanphilippe.aumasson@gmail.com>2014-11-19 16:03:16 +0100
commit8205ba01ebc060245776c8316c59acc448ea4605 (patch)
treec35167ee8f82c0f88e4e177eb49d2d5abc74008a
parentfactored dbg traces (diff)
downloadsiphash-8205ba01ebc060245776c8316c59acc448ea4605.tar.gz
siphash-8205ba01ebc060245776c8316c59acc448ea4605.tar.xz
details
-rw-r--r--siphash24.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/siphash24.c b/siphash24.c
index ae63b08..d5ea0e0 100644
--- a/siphash24.c
+++ b/siphash24.c
@@ -1,8 +1,8 @@
/*
SipHash reference C implementation
- Copyright (c) 2012 Jean-Philippe Aumasson <jeanphilippe.aumasson@gmail.com>
- Copyright (c) 2012 Daniel J. Bernstein <djb@cr.yp.to>
+ Copyright (c) 2012-2014 Jean-Philippe Aumasson <jeanphilippe.aumasson@gmail.com>
+ Copyright (c) 2012-2014 Daniel J. Bernstein <djb@cr.yp.to>
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
@@ -101,19 +101,12 @@ int siphash( uint8_t *out, const uint8_t *in, uint64_t inlen, const uint8_t *k
switch( left )
{
case 7: b |= ( ( uint64_t )in[ 6] ) << 48;
-
case 6: b |= ( ( uint64_t )in[ 5] ) << 40;
-
case 5: b |= ( ( uint64_t )in[ 4] ) << 32;
-
case 4: b |= ( ( uint64_t )in[ 3] ) << 24;
-
case 3: b |= ( ( uint64_t )in[ 2] ) << 16;
-
case 2: b |= ( ( uint64_t )in[ 1] ) << 8;
-
case 1: b |= ( ( uint64_t )in[ 0] ); break;
-
case 0: break;
}