clang format

This commit is contained in:
Kelvin Sherlock 2017-04-07 21:12:54 -04:00
parent 647b53d880
commit 51f6b063d6

View File

@ -197,30 +197,28 @@ int blake2s_160_init(hash_state *md) { return blake2s_init(md, 20); }
int blake2s_128_init(hash_state *md) { return blake2s_init(md, 16); }
#define G(r,i,a,b,c,d) \
#define G(r, i, a, b, c, d) \
do { \
a = a + b + m[blake2s_sigma[r][2*i+0]]; \
a = a + b + m[blake2s_sigma[r][2 * i + 0]]; \
d = ROR(d ^ a, 16); \
c = c + d; \
b = ROR(b ^ c, 12); \
a = a + b + m[blake2s_sigma[r][2*i+1]]; \
a = a + b + m[blake2s_sigma[r][2 * i + 1]]; \
d = ROR(d ^ a, 8); \
c = c + d; \
b = ROR(b ^ c, 7); \
} while(0)
} 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)
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)
#ifdef LTC_CLEAN_STACK
static int _blake2s_compress(hash_state *md, unsigned char *buf)
@ -247,7 +245,6 @@ static int blake2s_compress(hash_state *md, unsigned char *buf)
v[14] = md->blake2s.f[0] ^ blake2s_IV[6];
v[15] = md->blake2s.f[1] ^ blake2s_IV[7];
ROUND(0);
ROUND(1);
ROUND(2);
@ -262,13 +259,11 @@ static int blake2s_compress(hash_state *md, unsigned char *buf)
for (size_t i = 0; i < 8; ++i)
md->blake2s.h[i] = md->blake2s.h[i] ^ v[i] ^ v[i + 8];
return 0;
}
#undef G
#undef ROUND
#ifdef LTC_CLEAN_STACK
static int blake2s_compress(hash_state *md, unsigned char *buf)
{
@ -348,9 +343,9 @@ int blake2s_done(hash_state *md, unsigned char *out)
*/
int blake2s_256_test(void)
{
#ifndef LTC_TEST
#ifndef LTC_TEST
return CRYPT_NOP;
#else
#else
static const struct {
char *msg;
unsigned char hash[32];
@ -377,7 +372,7 @@ int blake2s_256_test(void)
}
}
return CRYPT_OK;
#endif
#endif
}
/**
@ -386,9 +381,9 @@ int blake2s_256_test(void)
*/
int blake2s_224_test(void)
{
#ifndef LTC_TEST
#ifndef LTC_TEST
return CRYPT_NOP;
#else
#else
static const struct {
char *msg;
unsigned char hash[28];
@ -415,7 +410,7 @@ int blake2s_224_test(void)
}
}
return CRYPT_OK;
#endif
#endif
}
/**
@ -424,9 +419,9 @@ int blake2s_224_test(void)
*/
int blake2s_160_test(void)
{
#ifndef LTC_TEST
#ifndef LTC_TEST
return CRYPT_NOP;
#else
#else
static const struct {
char *msg;
unsigned char hash[20];
@ -452,7 +447,7 @@ int blake2s_160_test(void)
}
}
return CRYPT_OK;
#endif
#endif
}
/**
@ -461,9 +456,9 @@ int blake2s_160_test(void)
*/
int blake2s_128_test(void)
{
#ifndef LTC_TEST
#ifndef LTC_TEST
return CRYPT_NOP;
#else
#else
static const struct {
char *msg;
unsigned char hash[16];
@ -488,9 +483,7 @@ int blake2s_128_test(void)
}
}
return CRYPT_OK;
#endif
#endif
}
#endif