RubyGems - rbnacl-libsodium - Versions diffs - 1.0.11 → 1.0.13 - Mend

rbnacl-libsodium 1.0.11 → 1.0.13

Files changed (465) hide show

data/vendor/libsodium/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c DELETED

@@ -1,126 +0,0 @@
-/*
-version 20080913
-D. J. Bernstein
-Public domain.
-*/
-#include <stdint.h>
-#include <stdlib.h>
-#include "crypto_core_salsa208.h"
-#include "private/common.h"
-#define ROUNDS 8
-#define U32C(v) (v##U)
-static uint32_t rotate(uint32_t u,int c)
-{
-  return (u << c) | (u >> (32 - c));
-}
-int crypto_core_salsa208(
-        unsigned char *out,
-  const unsigned char *in,
-  const unsigned char *k,
-  const unsigned char *c
-)
-{
-  uint32_t x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15;
-  uint32_t j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14, j15;
-  int i;
-  if (c == NULL) {
-    j0 = x0 = U32C(0x61707865);
-    j5 = x5 = U32C(0x3320646e);
-    j10 = x10 = U32C(0x79622d32);
-    j15 = x15 = U32C(0x6b206574);
-  } else {
-    j0 = x0 = LOAD32_LE(c + 0);
-    j5 = x5 = LOAD32_LE(c + 4);
-    j10 = x10 = LOAD32_LE(c + 8);
-    j15 = x15 = LOAD32_LE(c + 12);
-  }
-  j1 = x1 = LOAD32_LE(k + 0);
-  j2 = x2 = LOAD32_LE(k + 4);
-  j3 = x3 = LOAD32_LE(k + 8);
-  j4 = x4 = LOAD32_LE(k + 12);
-  j6 = x6 = LOAD32_LE(in + 0);
-  j7 = x7 = LOAD32_LE(in + 4);
-  j8 = x8 = LOAD32_LE(in + 8);
-  j9 = x9 = LOAD32_LE(in + 12);
-  j11 = x11 = LOAD32_LE(k + 16);
-  j12 = x12 = LOAD32_LE(k + 20);
-  j13 = x13 = LOAD32_LE(k + 24);
-  j14 = x14 = LOAD32_LE(k + 28);
-  for (i = ROUNDS;i > 0;i -= 2) {
-     x4 ^= rotate( x0+x12, 7);
-     x8 ^= rotate( x4+ x0, 9);
-    x12 ^= rotate( x8+ x4,13);
-     x0 ^= rotate(x12+ x8,18);
-     x9 ^= rotate( x5+ x1, 7);
-    x13 ^= rotate( x9+ x5, 9);
-     x1 ^= rotate(x13+ x9,13);
-     x5 ^= rotate( x1+x13,18);
-    x14 ^= rotate(x10+ x6, 7);
-     x2 ^= rotate(x14+x10, 9);
-     x6 ^= rotate( x2+x14,13);
-    x10 ^= rotate( x6+ x2,18);
-     x3 ^= rotate(x15+x11, 7);
-     x7 ^= rotate( x3+x15, 9);
-    x11 ^= rotate( x7+ x3,13);
-    x15 ^= rotate(x11+ x7,18);
-     x1 ^= rotate( x0+ x3, 7);
-     x2 ^= rotate( x1+ x0, 9);
-     x3 ^= rotate( x2+ x1,13);
-     x0 ^= rotate( x3+ x2,18);
-     x6 ^= rotate( x5+ x4, 7);
-     x7 ^= rotate( x6+ x5, 9);
-     x4 ^= rotate( x7+ x6,13);
-     x5 ^= rotate( x4+ x7,18);
-    x11 ^= rotate(x10+ x9, 7);
-     x8 ^= rotate(x11+x10, 9);
-     x9 ^= rotate( x8+x11,13);
-    x10 ^= rotate( x9+ x8,18);
-    x12 ^= rotate(x15+x14, 7);
-    x13 ^= rotate(x12+x15, 9);
-    x14 ^= rotate(x13+x12,13);
-    x15 ^= rotate(x14+x13,18);
-  }
-  x0 += j0;
-  x1 += j1;
-  x2 += j2;
-  x3 += j3;
-  x4 += j4;
-  x5 += j5;
-  x6 += j6;
-  x7 += j7;
-  x8 += j8;
-  x9 += j9;
-  x10 += j10;
-  x11 += j11;
-  x12 += j12;
-  x13 += j13;
-  x14 += j14;
-  x15 += j15;
-  STORE32_LE(out + 0,x0);
-  STORE32_LE(out + 4,x1);
-  STORE32_LE(out + 8,x2);
-  STORE32_LE(out + 12,x3);
-  STORE32_LE(out + 16,x4);
-  STORE32_LE(out + 20,x5);
-  STORE32_LE(out + 24,x6);
-  STORE32_LE(out + 28,x7);
-  STORE32_LE(out + 32,x8);
-  STORE32_LE(out + 36,x9);
-  STORE32_LE(out + 40,x10);
-  STORE32_LE(out + 44,x11);
-  STORE32_LE(out + 48,x12);
-  STORE32_LE(out + 52,x13);
-  STORE32_LE(out + 56,x14);
-  STORE32_LE(out + 60,x15);
-  return 0;
-}

data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2-impl.h DELETED

@@ -1,48 +0,0 @@
-/*
-   BLAKE2 reference source code package - reference C implementations
-   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
-   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 <http://creativecommons.org/publicdomain/zero/1.0/>.
-*/
-#ifndef blake2_impl_H
-#define blake2_impl_H
-#include <stdint.h>
-#include <string.h>
-#include "utils.h"
-static inline uint32_t rotl32( const uint32_t w, const unsigned c )
-{
-  return ( w << c ) | ( w >> ( 32 - c ) );
-}
-static inline uint64_t rotl64( const uint64_t w, const unsigned c )
-{
-  return ( w << c ) | ( w >> ( 64 - c ) );
-}
-static inline uint32_t rotr32( const uint32_t w, const unsigned c )
-{
-  return ( w >> c ) | ( w << ( 32 - c ) );
-}
-static inline uint64_t rotr64( const uint64_t w, const unsigned c )
-{
-  return ( w >> c ) | ( w << ( 64 - c ) );
-}
-/* prevents compiler optimizing out memset() */
-static inline void secure_zero_memory( void *v, size_t n )
-{
-  sodium_memzero(v, n);
-}
-#endif

data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2.h DELETED

@@ -1,97 +0,0 @@
-/*
-   BLAKE2 reference source code package - reference C implementations
-   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
-   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.
-   All code is triple-licensed under the
-   [CC0](http://creativecommons.org/publicdomain/zero/1.0), the
-   [OpenSSL Licence](https://www.openssl.org/source/license.html), or
-   the [Apache Public License 2.0](http://www.apache.org/licenses/LICENSE-2.0),
-   at your choosing.
- */
-#ifndef blake2_H
-#define blake2_H
-#include <stddef.h>
-#include <stdint.h>
-#include "crypto_generichash_blake2b.h"
-#include "export.h"
-#define blake2b_init_param               crypto_generichash_blake2b__init_param
-#define blake2b_init                     crypto_generichash_blake2b__init
-#define blake2b_init_salt_personal       crypto_generichash_blake2b__init_salt_personal
-#define blake2b_init_key                 crypto_generichash_blake2b__init_key
-#define blake2b_init_key_salt_personal   crypto_generichash_blake2b__init_key_salt_personal
-#define blake2b_update                   crypto_generichash_blake2b__update
-#define blake2b_final                    crypto_generichash_blake2b__final
-#define blake2b                          crypto_generichash_blake2b__blake2b
-#define blake2b_salt_personal            crypto_generichash_blake2b__blake2b_salt_personal
-#define blake2b_pick_best_implementation crypto_generichash_blake2b__pick_best_implementation
-enum blake2b_constant
-{
-  BLAKE2B_BLOCKBYTES = 128,
-  BLAKE2B_OUTBYTES   = 64,
-  BLAKE2B_KEYBYTES   = 64,
-  BLAKE2B_SALTBYTES  = 16,
-  BLAKE2B_PERSONALBYTES = 16
-};
-#if defined(__IBMC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-# pragma pack(1)
-#else
-# pragma pack(push, 1)
-#endif
-typedef struct blake2b_param_
-{
-  uint8_t  digest_length;  /*  1 */
-  uint8_t  key_length;     /*  2 */
-  uint8_t  fanout;         /*  3 */
-  uint8_t  depth;          /*  4 */
-  uint8_t  leaf_length[4]; /*  8 */
-  uint8_t  node_offset[8]; /* 16 */
-  uint8_t  node_depth;     /* 17 */
-  uint8_t  inner_length;   /* 18 */
-  uint8_t  reserved[14];   /* 32 */
-  uint8_t  salt[BLAKE2B_SALTBYTES]; /* 48 */
-  uint8_t  personal[BLAKE2B_PERSONALBYTES];  /* 64 */
-} blake2b_param;
-typedef crypto_generichash_blake2b_state blake2b_state;
-#if defined(__IBMC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-# pragma pack()
-#else
-# pragma pack(pop)
-#endif
-/* Streaming API */
-int blake2b_init( blake2b_state *S, const uint8_t outlen );
-int blake2b_init_salt_personal( blake2b_state *S, const uint8_t outlen,
-                                const void *personal, const void *salt );
-int blake2b_init_key( blake2b_state *S, const uint8_t outlen, const void *key, const uint8_t keylen );
-int blake2b_init_key_salt_personal( blake2b_state *S, const uint8_t outlen, const void *key, const uint8_t keylen,
-                                    const void *salt, const void *personal );
-int blake2b_init_param( blake2b_state *S, const blake2b_param *P );
-int blake2b_update( blake2b_state *S, const uint8_t *in, uint64_t inlen );
-int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen );
-/* Simple API */
-int blake2b( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen );
-int blake2b_salt_personal( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen, const void *salt, const void *personal );
-typedef int ( *blake2b_compress_fn )( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] );
-int blake2b_pick_best_implementation(void);
-int blake2b_compress_ref( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] );
-int blake2b_compress_ssse3( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] );
-int blake2b_compress_sse41( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] );
-int blake2b_compress_avx2( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] );
-#endif

data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-avx2.c DELETED

@@ -1,45 +0,0 @@
-#define BLAKE2_USE_SSSE3
-#define BLAKE2_USE_SSE41
-#define BLAKE2_USE_AVX2
-#include <stdint.h>
-#include <string.h>
-#if (defined(HAVE_AVX2INTRIN_H) && defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)) || \
-    (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64)) && _MSC_VER >= 1700)
-#pragma GCC target("sse2")
-#pragma GCC target("ssse3")
-#pragma GCC target("sse4.1")
-#pragma GCC target("avx2")
-#include <emmintrin.h>
-#include <tmmintrin.h>
-#include <smmintrin.h>
-#include <immintrin.h>
-#include "blake2.h"
-#include "blake2-impl.h"
-#include "blake2b-compress-avx2.h"
-CRYPTO_ALIGN(64) static const uint64_t blake2b_IV[8] =
-{
-    0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL,
-    0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL,
-    0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL,
-    0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL
-};
-int blake2b_compress_avx2( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] )
-{
-    __m256i a = LOADU(&S->h[0]);
-    __m256i b = LOADU(&S->h[4]);
-    BLAKE2B_COMPRESS_V1(a, b, block, S->t[0], S->t[1], S->f[0], S->f[1]);
-    STOREU(&S->h[0], a);
-    STOREU(&S->h[4], b);
-    return 0;
-}
-#endif

data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-avx2.h DELETED

@@ -1,123 +0,0 @@
-#ifndef blake2b_compress_avx2_H
-#define blake2b_compress_avx2_H
-#define LOAD128(p)     _mm_load_si128((__m128i *)(p))
-#define STORE128(p, r) _mm_store_si128((__m128i *)(p), r)
-#define LOADU128(p)     _mm_loadu_si128((__m128i *)(p))
-#define STOREU128(p, r) _mm_storeu_si128((__m128i *)(p), r)
-#define LOAD(p)     _mm256_load_si256((__m256i *)(p))
-#define STORE(p, r) _mm256_store_si256((__m256i *)(p), r)
-#define LOADU(p)     _mm256_loadu_si256((__m256i *)(p))
-#define STOREU(p, r) _mm256_storeu_si256((__m256i *)(p), r)
-static inline uint64_t LOADU64(const void *p) {
-    uint64_t v;
-    memcpy(&v, p, sizeof v);
-    return v;
-}
-#define ROTATE16 _mm256_setr_epi8(2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12, 13, 14, 15, 8, 9, \
-                                  2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12, 13, 14, 15, 8, 9)
-#define ROTATE24 _mm256_setr_epi8(3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13, 14, 15, 8, 9, 10, \
-                                  3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13, 14, 15, 8, 9, 10)
-#define ADD(a, b) _mm256_add_epi64(a, b)
-#define SUB(a, b) _mm256_sub_epi64(a, b)
-#define XOR(a, b) _mm256_xor_si256(a, b)
-#define AND(a, b) _mm256_and_si256(a, b)
-#define  OR(a, b) _mm256_or_si256(a, b)
-#define ROT32(x) _mm256_shuffle_epi32((x), _MM_SHUFFLE(2, 3, 0, 1))
-#define ROT24(x) _mm256_shuffle_epi8((x), ROTATE24)
-#define ROT16(x) _mm256_shuffle_epi8((x), ROTATE16)
-#define ROT63(x) _mm256_or_si256(_mm256_srli_epi64((x), 63), ADD((x), (x)))
-#define BLAKE2B_G1_V1(a, b, c, d, m) do {       \
-    a = ADD(a, m);                              \
-    a = ADD(a, b); d = XOR(d, a); d = ROT32(d); \
-    c = ADD(c, d); b = XOR(b, c); b = ROT24(b); \
-} while(0)
-#define BLAKE2B_G2_V1(a, b, c, d, m) do {       \
-    a = ADD(a, m);                              \
-    a = ADD(a, b); d = XOR(d, a); d = ROT16(d); \
-    c = ADD(c, d); b = XOR(b, c); b = ROT63(b); \
-} while(0)
-#define BLAKE2B_DIAG_V1(a, b, c, d) do {                   \
-    d = _mm256_permute4x64_epi64(d, _MM_SHUFFLE(2,1,0,3)); \
-    c = _mm256_permute4x64_epi64(c, _MM_SHUFFLE(1,0,3,2)); \
-    b = _mm256_permute4x64_epi64(b, _MM_SHUFFLE(0,3,2,1)); \
-} while(0)
-#define BLAKE2B_UNDIAG_V1(a, b, c, d) do {                 \
-    d = _mm256_permute4x64_epi64(d, _MM_SHUFFLE(0,3,2,1)); \
-    c = _mm256_permute4x64_epi64(c, _MM_SHUFFLE(1,0,3,2)); \
-    b = _mm256_permute4x64_epi64(b, _MM_SHUFFLE(2,1,0,3)); \
-} while(0)
-#include "blake2b-load-avx2.h"
-#define BLAKE2B_ROUND_V1(a, b, c, d, r, m) do { \
-    __m256i b0;                                 \
-    BLAKE2B_LOAD_MSG_ ##r ##_1(b0);             \
-    BLAKE2B_G1_V1(a, b, c, d, b0);              \
-    BLAKE2B_LOAD_MSG_ ##r ##_2(b0);             \
-    BLAKE2B_G2_V1(a, b, c, d, b0);              \
-    BLAKE2B_DIAG_V1(a, b, c, d);                \
-    BLAKE2B_LOAD_MSG_ ##r ##_3(b0);             \
-    BLAKE2B_G1_V1(a, b, c, d, b0);              \
-    BLAKE2B_LOAD_MSG_ ##r ##_4(b0);             \
-    BLAKE2B_G2_V1(a, b, c, d, b0);              \
-    BLAKE2B_UNDIAG_V1(a, b, c, d);              \
-} while(0)
-#define BLAKE2B_ROUNDS_V1(a, b, c, d, m) do { \
-    BLAKE2B_ROUND_V1(a, b, c, d,  0, (m));    \
-    BLAKE2B_ROUND_V1(a, b, c, d,  1, (m));    \
-    BLAKE2B_ROUND_V1(a, b, c, d,  2, (m));    \
-    BLAKE2B_ROUND_V1(a, b, c, d,  3, (m));    \
-    BLAKE2B_ROUND_V1(a, b, c, d,  4, (m));    \
-    BLAKE2B_ROUND_V1(a, b, c, d,  5, (m));    \
-    BLAKE2B_ROUND_V1(a, b, c, d,  6, (m));    \
-    BLAKE2B_ROUND_V1(a, b, c, d,  7, (m));    \
-    BLAKE2B_ROUND_V1(a, b, c, d,  8, (m));    \
-    BLAKE2B_ROUND_V1(a, b, c, d,  9, (m));    \
-    BLAKE2B_ROUND_V1(a, b, c, d, 10, (m));    \
-    BLAKE2B_ROUND_V1(a, b, c, d, 11, (m));    \
-} while(0)
-#define DECLARE_MESSAGE_WORDS(m)                                         \
-    const __m256i m0 = _mm256_broadcastsi128_si256(LOADU128((m) +   0)); \
-    const __m256i m1 = _mm256_broadcastsi128_si256(LOADU128((m) +  16)); \
-    const __m256i m2 = _mm256_broadcastsi128_si256(LOADU128((m) +  32)); \
-    const __m256i m3 = _mm256_broadcastsi128_si256(LOADU128((m) +  48)); \
-    const __m256i m4 = _mm256_broadcastsi128_si256(LOADU128((m) +  64)); \
-    const __m256i m5 = _mm256_broadcastsi128_si256(LOADU128((m) +  80)); \
-    const __m256i m6 = _mm256_broadcastsi128_si256(LOADU128((m) +  96)); \
-    const __m256i m7 = _mm256_broadcastsi128_si256(LOADU128((m) + 112)); \
-    __m256i t0, t1;
-#define BLAKE2B_COMPRESS_V1(a, b, m, t0, t1, f0, f1) do { \
-    DECLARE_MESSAGE_WORDS(m)                              \
-    const __m256i iv0 = a;                                \
-    const __m256i iv1 = b;                                \
-    __m256i c = LOAD(&blake2b_IV[0]);                     \
-    __m256i d = XOR(                                      \
-      LOAD(&blake2b_IV[4]),                               \
-      _mm256_set_epi64x(f1, f0, t1, t0)                   \
-    );                                                    \
-    BLAKE2B_ROUNDS_V1(a, b, c, d, m);                     \
-    a = XOR(a, c);                                        \
-    b = XOR(b, d);                                        \
-    a = XOR(a, iv0);                                      \
-    b = XOR(b, iv1);                                      \
-} while(0)
-#endif

data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ref.c DELETED

@@ -1,94 +0,0 @@
-#include <stdint.h>
-#include <string.h>
-#include "blake2.h"
-#include "blake2-impl.h"
-#include "private/common.h"
-CRYPTO_ALIGN(64) static const uint64_t blake2b_IV[8] =
-{
-  0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL,
-  0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL,
-  0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL,
-  0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL
-};
-static const uint8_t blake2b_sigma[12][16] =
-{
-  {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
-  { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 } ,
-  { 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 } ,
-  {  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 } ,
-  {  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 } ,
-  {  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 } ,
-  { 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 } ,
-  { 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 } ,
-  {  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 } ,
-  { 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 } ,
-  {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
-  { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 }
-};
-int blake2b_compress_ref( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] )
-{
-  uint64_t m[16];
-  uint64_t v[16];
-  int      i;
-  for( i = 0; i < 16; ++i )
-    m[i] = LOAD64_LE( block + i * sizeof( m[i] ) );
-  for( i = 0; i < 8; ++i )
-    v[i] = S->h[i];
-  v[ 8] = blake2b_IV[0];
-  v[ 9] = blake2b_IV[1];
-  v[10] = blake2b_IV[2];
-  v[11] = blake2b_IV[3];
-  v[12] = S->t[0] ^ blake2b_IV[4];
-  v[13] = S->t[1] ^ blake2b_IV[5];
-  v[14] = S->f[0] ^ blake2b_IV[6];
-  v[15] = S->f[1] ^ blake2b_IV[7];
-#define G(r,i,a,b,c,d) \
-  do { \
-    a = a + b + m[blake2b_sigma[r][2*i+0]]; \
-    d = rotr64(d ^ a, 32); \
-    c = c + d; \
-    b = rotr64(b ^ c, 24); \
-    a = a + b + m[blake2b_sigma[r][2*i+1]]; \
-    d = rotr64(d ^ a, 16); \
-    c = c + d; \
-    b = rotr64(b ^ c, 63); \
-  } while(0)
-#define ROUND(r)  \
-  do { \
-    G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \
-    G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \
-    G(r,2,v[ 2],v[ 6],v[10],v[14]); \
-    G(r,3,v[ 3],v[ 7],v[11],v[15]); \
-    G(r,4,v[ 0],v[ 5],v[10],v[15]); \
-    G(r,5,v[ 1],v[ 6],v[11],v[12]); \
-    G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \
-    G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \
-  } while(0)
-  ROUND( 0 );
-  ROUND( 1 );
-  ROUND( 2 );
-  ROUND( 3 );
-  ROUND( 4 );
-  ROUND( 5 );
-  ROUND( 6 );
-  ROUND( 7 );
-  ROUND( 8 );
-  ROUND( 9 );
-  ROUND( 10 );
-  ROUND( 11 );
-  for( i = 0; i < 8; ++i )
-    S->h[i] = S->h[i] ^ v[i] ^ v[i + 8];
-#undef G
-#undef ROUND
-  return 0;
-}