--- tweetnacl.c 2018-01-17 21:26:25.086390308 -0500 +++ tweetnacl.cpp 2018-01-17 21:26:25.088390282 -0500 @@ -1,19 +1,33 @@ -#include "tweetnacl.h" -#define FOR(i,n) for (i = 0;i < n;++i) -#define sv static void - -typedef unsigned char u8; -typedef unsigned long u32; -typedef unsigned long long u64; -typedef long long i64; -typedef i64 gf[16]; -extern void randombytes(u8 *,u64); +// tweetnacl.cpp - modified tweetnacl.c placed in public domain by Jeffrey Walton. +// The NaCl library and tweetnacl.c is public domain source code +// written by Daniel J. Bernstein, Bernard van Gastel, Wesley +// Janssen, Tanja Lange, Peter Schwabe and Sjaak Smetsers. + +#include "pch.h" +#include "config.h" +#include "nacl.h" +#include "misc.h" +#include "osrng.h" +#include "stdcpp.h" + +// Don't destroy const time properties when squashing warnings. +#if CRYPTOPP_MSC_VERSION +# pragma warning(disable: 4242 4244 4245) +#endif + +#ifndef CRYPTOPP_DISABLE_NACL -static const u8 - _0[16], +NAMESPACE_BEGIN(CryptoPP) +NAMESPACE_BEGIN(NaCl) + +typedef int64_t gf[16]; + +static const uint8_t + _0[32] = {0}, _9[32] = {9}; + static const gf - gf0, + gf0 = {0}, gf1 = {1}, _121665 = {0xDB41,1}, D = {0x78a3, 0x1359, 0x4dca, 0x75eb, 0xd8ab, 0x4141, 0x0a4d, 0x0070, 0xe898, 0x7779, 0x4079, 0x8cc7, 0xfe73, 0x2b6f, 0x6cee, 0x5203}, @@ -22,119 +36,126 @@ Y = {0x6658, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666}, I = {0xa0b0, 0x4a0e, 0x1b27, 0xc4ee, 0xe478, 0xad2f, 0x1806, 0x2f43, 0xd7a7, 0x3dfb, 0x0099, 0x2b4d, 0xdf0b, 0x4fc1, 0x2480, 0x2b83}; -static u32 L32(u32 x,int c) { return (x << c) | ((x&0xffffffff) >> (32 - c)); } +// Added by Crypto++ for TweetNaCl +static void randombytes(uint8_t * block, uint64_t size) +{ + DefaultAutoSeededRNG prng; + prng.GenerateBlock(block, (size_t)size); +} + +static uint32_t L32(uint32_t x,int c) { return (x << c) | ((x&0xffffffff) >> (32 - c)); } -static u32 ld32(const u8 *x) +static uint32_t ld32(const uint8_t *x) { - u32 u = x[3]; + uint32_t u = x[3]; u = (u<<8)|x[2]; u = (u<<8)|x[1]; return (u<<8)|x[0]; } -static u64 dl64(const u8 *x) +static uint64_t dl64(const uint8_t *x) { - u64 i,u=0; - FOR(i,8) u=(u<<8)|x[i]; + uint64_t i,u=0; + for(i=0; i<8; ++i) u=(u<<8)|x[i]; return u; } -sv st32(u8 *x,u32 u) +static void st32(uint8_t *x,uint32_t u) { int i; - FOR(i,4) { x[i] = u; u >>= 8; } + for(i=0; i<4; ++i) { x[i] = u; u >>= 8; } } -sv ts64(u8 *x,u64 u) +static void ts64(uint8_t *x,uint64_t u) { int i; for (i = 7;i >= 0;--i) { x[i] = u; u >>= 8; } } -static int vn(const u8 *x,const u8 *y,int n) +static int verify_n(const uint8_t *x,const uint8_t *y,uint32_t n) { - u32 i,d = 0; - FOR(i,n) d |= x[i]^y[i]; + uint32_t i,d = 0; + for(i=0; i> 8)) - 1; } -int crypto_verify_16(const u8 *x,const u8 *y) +int crypto_verify_16(const uint8_t *x,const uint8_t *y) { - return vn(x,y,16); + return verify_n(x,y,16); } -int crypto_verify_32(const u8 *x,const u8 *y) +int crypto_verify_32(const uint8_t *x,const uint8_t *y) { - return vn(x,y,32); + return verify_n(x,y,32); } -sv core(u8 *out,const u8 *in,const u8 *k,const u8 *c,int h) +static void core(uint8_t *out,const uint8_t *in,const uint8_t *k,const uint8_t *c,int h) { - u32 w[16],x[16],y[16],t[4]; + uint32_t w[16],x[16],y[16],t[4]; int i,j,m; - FOR(i,4) { + for(i=0; i<4; ++i) { x[5*i] = ld32(c+4*i); x[1+i] = ld32(k+4*i); x[6+i] = ld32(in+4*i); x[11+i] = ld32(k+16+4*i); } - FOR(i,16) y[i] = x[i]; + for(i=0; i<16; ++i) y[i] = x[i]; - FOR(i,20) { - FOR(j,4) { - FOR(m,4) t[m] = x[(5*j+4*m)%16]; + for(i=0; i<20; ++i) { + for(j=0; j<4; ++j) { + for(m=0; m<4; ++m) t[m] = x[(5*j+4*m)%16]; t[1] ^= L32(t[0]+t[3], 7); t[2] ^= L32(t[1]+t[0], 9); t[3] ^= L32(t[2]+t[1],13); t[0] ^= L32(t[3]+t[2],18); - FOR(m,4) w[4*j+(j+m)%4] = t[m]; + for(m=0; m<4; ++m) w[4*j+(j+m)%4] = t[m]; } - FOR(m,16) x[m] = w[m]; + for(m=0; m<16; ++m) x[m] = w[m]; } if (h) { - FOR(i,16) x[i] += y[i]; - FOR(i,4) { + for(i=0; i<16; ++i) x[i] += y[i]; + for(i=0; i<4; ++i) { x[5*i] -= ld32(c+4*i); x[6+i] -= ld32(in+4*i); } - FOR(i,4) { + for(i=0; i<4; ++i) { st32(out+4*i,x[5*i]); st32(out+16+4*i,x[6+i]); } } else - FOR(i,16) st32(out + 4 * i,x[i] + y[i]); + for(i=0; i<16; ++i) st32(out + 4 * i,x[i] + y[i]); } -int crypto_core_salsa20(u8 *out,const u8 *in,const u8 *k,const u8 *c) +int crypto_core_salsa20(uint8_t *out,const uint8_t *in,const uint8_t *k,const uint8_t *c) { core(out,in,k,c,0); return 0; } -int crypto_core_hsalsa20(u8 *out,const u8 *in,const u8 *k,const u8 *c) +int crypto_core_hsalsa20(uint8_t *out,const uint8_t *in,const uint8_t *k,const uint8_t *c) { core(out,in,k,c,1); return 0; } -static const u8 sigma[16] = "expand 32-byte k"; +static const uint8_t sigma[16] = {0x65,0x78,0x70,0x61,0x6E,0x64,0x20,0x33,0x32,0x2D,0x62,0x79,0x74,0x65,0x20,0x6B}; -int crypto_stream_salsa20_xor(u8 *c,const u8 *m,u64 b,const u8 *n,const u8 *k) +int crypto_stream_salsa20_xor(uint8_t *c,const uint8_t *m,uint64_t b,const uint8_t *n,const uint8_t *k) { - u8 z[16],x[64]; - u32 u,i; + uint8_t z[16],x[64]; + uint32_t u,i; if (!b) return 0; - FOR(i,16) z[i] = 0; - FOR(i,8) z[i] = n[i]; + for(i=0; i<16; ++i) z[i] = 0; + for(i=0; i<8; ++i) z[i] = n[i]; while (b >= 64) { crypto_core_salsa20(x,z,k,sigma); - FOR(i,64) c[i] = (m?m[i]:0) ^ x[i]; + for(i=0; i<64; ++i) c[i] = (m?m[i]:0) ^ x[i]; u = 1; for (i = 8;i < 16;++i) { - u += (u32) z[i]; + u += (uint32_t) z[i]; z[i] = u; u >>= 8; } @@ -144,50 +165,50 @@ } if (b) { crypto_core_salsa20(x,z,k,sigma); - FOR(i,b) c[i] = (m?m[i]:0) ^ x[i]; + for(i=0; i>= 8; } } -static const u32 minusp[17] = { +static const uint32_t minusp[17] = { 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252 } ; -int crypto_onetimeauth(u8 *out,const u8 *m,u64 n,const u8 *k) +int crypto_onetimeauth(uint8_t *out,const uint8_t *m,uint64_t n,const uint8_t *k) { - u32 s,i,j,u,x[17],r[17],h[17],c[17],g[17]; + uint32_t s,i,j,u,x[17],r[17],h[17],c[17],g[17]; - FOR(j,17) r[j]=h[j]=0; - FOR(j,16) r[j]=k[j]; + for(j=0; j<17; ++j) r[j]=h[j]=0; + for(j=0; j<16; ++j) r[j]=k[j]; r[3]&=15; r[4]&=252; r[7]&=15; @@ -197,25 +218,25 @@ r[15]&=15; while (n > 0) { - FOR(j,17) c[j] = 0; + for(j=0; j<17; ++j) c[j] = 0; for (j = 0;(j < 16) && (j < n);++j) c[j] = m[j]; c[j] = 1; m += j; n -= j; add1305(h,c); - FOR(i,17) { + for(i=0; i<17; ++i) { x[i] = 0; - FOR(j,17) x[i] += h[j] * ((j <= i) ? r[i - j] : 320 * r[i + 17 - j]); + for(j=0; j<17; ++j) x[i] += h[j] * ((j <= i) ? r[i - j] : 320 * r[i + 17 - j]); } - FOR(i,17) h[i] = x[i]; + for(i=0; i<17; ++i) h[i] = x[i]; u = 0; - FOR(j,16) { + for(j=0; j<16; ++j) { u += h[j]; h[j] = u & 255; u >>= 8; } u += h[16]; h[16] = u & 3; u = 5 * (u >> 2); - FOR(j,16) { + for(j=0; j<16; ++j) { u += h[j]; h[j] = u & 255; u >>= 8; @@ -223,84 +244,84 @@ u += h[16]; h[16] = u; } - FOR(j,17) g[j] = h[j]; + for(j=0; j<17; ++j) g[j] = h[j]; add1305(h,minusp); s = -(h[16] >> 7); - FOR(j,17) h[j] ^= s & (g[j] ^ h[j]); + for(j=0; j<17; ++j) h[j] ^= s & (g[j] ^ h[j]); - FOR(j,16) c[j] = k[j + 16]; + for(j=0; j<16; ++j) c[j] = k[j + 16]; c[16] = 0; add1305(h,c); - FOR(j,16) out[j] = h[j]; + for(j=0; j<16; ++j) out[j] = h[j]; return 0; } -int crypto_onetimeauth_verify(const u8 *h,const u8 *m,u64 n,const u8 *k) +int crypto_onetimeauth_verify(const uint8_t *h,const uint8_t *m,uint64_t n,const uint8_t *k) { - u8 x[16]; + uint8_t x[16]; crypto_onetimeauth(x,m,n,k); return crypto_verify_16(h,x); } -int crypto_secretbox(u8 *c,const u8 *m,u64 d,const u8 *n,const u8 *k) +int crypto_secretbox(uint8_t *c,const uint8_t *m,uint64_t d,const uint8_t *n,const uint8_t *k) { int i; if (d < 32) return -1; crypto_stream_xor(c,m,d,n,k); crypto_onetimeauth(c + 16,c + 32,d - 32,c); - FOR(i,16) c[i] = 0; + for(i=0; i<16; ++i) c[i] = 0; return 0; } -int crypto_secretbox_open(u8 *m,const u8 *c,u64 d,const u8 *n,const u8 *k) +int crypto_secretbox_open(uint8_t *m,const uint8_t *c,uint64_t d,const uint8_t *n,const uint8_t *k) { int i; - u8 x[32]; + uint8_t x[32]; if (d < 32) return -1; crypto_stream(x,32,n,k); if (crypto_onetimeauth_verify(c + 16,c + 32,d - 32,x) != 0) return -1; crypto_stream_xor(m,c,d,n,k); - FOR(i,32) m[i] = 0; + for(i=0; i<32; ++i) m[i] = 0; return 0; } -sv set25519(gf r, const gf a) +static void set25519(gf r, const gf a) { int i; - FOR(i,16) r[i]=a[i]; + for(i=0; i<16; ++i) r[i]=a[i]; } -sv car25519(gf o) +static void car25519(gf o) { int i; - i64 c; - FOR(i,16) { + int64_t c; + for(i=0; i<16; ++i) { o[i]+=(1LL<<16); c=o[i]>>16; o[(i+1)*(i<15)]+=c-1+37*(c-1)*(i==15); - o[i]-=c<<16; + o[i]-=((uint64_t)c)<<16; } } -sv sel25519(gf p,gf q,int b) +static void sel25519(gf p,gf q,int b) { - i64 t,i,c=~(b-1); - FOR(i,16) { + int64_t t,i,c=~(b-1); + for(i=0; i<16; ++i) { t= c&(p[i]^q[i]); p[i]^=t; q[i]^=t; } } -sv pack25519(u8 *o,const gf n) +static void pack25519(uint8_t *o,const gf n) { int i,j,b; gf m,t; - FOR(i,16) t[i]=n[i]; + for(i=0; i<16; ++i) t[i]=n[i]; car25519(t); car25519(t); car25519(t); - FOR(j,2) { + for(j=0; j<2; ++j) { m[0]=t[0]-0xffed; for(i=1;i<15;i++) { m[i]=t[i]-0xffff-((m[i-1]>>16)&1); @@ -311,7 +332,7 @@ m[14]&=0xffff; sel25519(t,m,1-b); } - FOR(i,16) { + for(i=0; i<16; ++i) { o[2*i]=t[i]&0xff; o[2*i+1]=t[i]>>8; } @@ -319,88 +340,88 @@ static int neq25519(const gf a, const gf b) { - u8 c[32],d[32]; + uint8_t c[32],d[32]; pack25519(c,a); pack25519(d,b); return crypto_verify_32(c,d); } -static u8 par25519(const gf a) +static uint8_t par25519(const gf a) { - u8 d[32]; + uint8_t d[32]; pack25519(d,a); return d[0]&1; } -sv unpack25519(gf o, const u8 *n) +static void unpack25519(gf o, const uint8_t *n) { int i; - FOR(i,16) o[i]=n[2*i]+((i64)n[2*i+1]<<8); + for(i=0; i<16; ++i) o[i]=n[2*i]+((int64_t)n[2*i+1]<<8); o[15]&=0x7fff; } -sv A(gf o,const gf a,const gf b) +static void A(gf o,const gf a,const gf b) { int i; - FOR(i,16) o[i]=a[i]+b[i]; + for(i=0; i<16; ++i) o[i]=a[i]+b[i]; } -sv Z(gf o,const gf a,const gf b) +static void Z(gf o,const gf a,const gf b) { int i; - FOR(i,16) o[i]=a[i]-b[i]; + for(i=0; i<16; ++i) o[i]=a[i]-b[i]; } -sv M(gf o,const gf a,const gf b) +static void M(gf o,const gf a,const gf b) { - i64 i,j,t[31]; - FOR(i,31) t[i]=0; - FOR(i,16) FOR(j,16) t[i+j]+=a[i]*b[j]; - FOR(i,15) t[i]+=38*t[i+16]; - FOR(i,16) o[i]=t[i]; + int64_t i,j,t[31]; + for(i=0; i<31; ++i) t[i]=0; + for(i=0; i<16; ++i) for(j=0; j<16; ++j) t[i+j]+=a[i]*b[j]; + for(i=0; i<15; ++i) t[i]+=38*t[i+16]; + for(i=0; i<16; ++i) o[i]=t[i]; car25519(o); car25519(o); } -sv S(gf o,const gf a) +static void S(gf o,const gf a) { M(o,a,a); } -sv inv25519(gf o,const gf i) +static void inv25519(gf o,const gf i) { gf c; int a; - FOR(a,16) c[a]=i[a]; + for(a=0; a<16; ++a) c[a]=i[a]; for(a=253;a>=0;a--) { S(c,c); if(a!=2&&a!=4) M(c,c,i); } - FOR(a,16) o[a]=c[a]; + for(a=0; a<16; ++a) o[a]=c[a]; } -sv pow2523(gf o,const gf i) +static void pow2523(gf o,const gf i) { gf c; int a; - FOR(a,16) c[a]=i[a]; + for(a=0; a<16; ++a) c[a]=i[a]; for(a=250;a>=0;a--) { S(c,c); if(a!=1) M(c,c,i); } - FOR(a,16) o[a]=c[a]; + for(a=0; a<16; ++a) o[a]=c[a]; } -int crypto_scalarmult(u8 *q,const u8 *n,const u8 *p) +int crypto_scalarmult(uint8_t *q,const uint8_t *n,const uint8_t *p) { - u8 z[32]; - i64 x[80],r,i; + uint8_t z[32]; + int64_t x[80],r,i; gf a,b,c,d,e,f; - FOR(i,31) z[i]=n[i]; + for(i=0; i<31; ++i) z[i]=n[i]; z[31]=(n[31]&127)|64; z[0]&=248; unpack25519(x,p); - FOR(i,16) { + for(i=0; i<16; ++i) { b[i]=x[i]; d[i]=a[i]=c[i]=0; } @@ -430,7 +451,7 @@ sel25519(a,b,r); sel25519(c,d,r); } - FOR(i,16) { + for(i=0; i<16; ++i) { x[i+16]=a[i]; x[i+32]=c[i]; x[i+48]=b[i]; @@ -442,113 +463,115 @@ return 0; } -int crypto_scalarmult_base(u8 *q,const u8 *n) +int crypto_scalarmult_base(uint8_t *q,const uint8_t *n) { return crypto_scalarmult(q,n,_9); } -int crypto_box_keypair(u8 *y,u8 *x) +int crypto_box_keypair(uint8_t *y,uint8_t *x) { randombytes(x,32); return crypto_scalarmult_base(y,x); } -int crypto_box_beforenm(u8 *k,const u8 *y,const u8 *x) +// S must not be all 0's +int crypto_box_beforenm(uint8_t *k,const uint8_t *y,const uint8_t *x) { - u8 s[32]; - crypto_scalarmult(s,x,y); + uint8_t s[32]; + if(crypto_scalarmult(s,x,y) != 0) return -1; + if(verify_n(s,_0,32) != -1) return -1; return crypto_core_hsalsa20(k,_0,s,sigma); } -int crypto_box_afternm(u8 *c,const u8 *m,u64 d,const u8 *n,const u8 *k) +int crypto_box_afternm(uint8_t *c,const uint8_t *m,uint64_t d,const uint8_t *n,const uint8_t *k) { return crypto_secretbox(c,m,d,n,k); } -int crypto_box_open_afternm(u8 *m,const u8 *c,u64 d,const u8 *n,const u8 *k) +int crypto_box_open_afternm(uint8_t *m,const uint8_t *c,uint64_t d,const uint8_t *n,const uint8_t *k) { return crypto_secretbox_open(m,c,d,n,k); } -int crypto_box(u8 *c,const u8 *m,u64 d,const u8 *n,const u8 *y,const u8 *x) +int crypto_box(uint8_t *c,const uint8_t *m,uint64_t d,const uint8_t *n,const uint8_t *y,const uint8_t *x) { - u8 k[32]; - crypto_box_beforenm(k,y,x); + uint8_t k[32]; + if(crypto_box_beforenm(k,y,x) != 0) return -1; return crypto_box_afternm(c,m,d,n,k); } -int crypto_box_open(u8 *m,const u8 *c,u64 d,const u8 *n,const u8 *y,const u8 *x) +int crypto_box_open(uint8_t *m,const uint8_t *c,uint64_t d,const uint8_t *n,const uint8_t *y,const uint8_t *x) { - u8 k[32]; - crypto_box_beforenm(k,y,x); + uint8_t k[32]; + if(crypto_box_beforenm(k,y,x) != 0) return -1; return crypto_box_open_afternm(m,c,d,n,k); } -static u64 R(u64 x,int c) { return (x >> c) | (x << (64 - c)); } -static u64 Ch(u64 x,u64 y,u64 z) { return (x & y) ^ (~x & z); } -static u64 Maj(u64 x,u64 y,u64 z) { return (x & y) ^ (x & z) ^ (y & z); } -static u64 Sigma0(u64 x) { return R(x,28) ^ R(x,34) ^ R(x,39); } -static u64 Sigma1(u64 x) { return R(x,14) ^ R(x,18) ^ R(x,41); } -static u64 sigma0(u64 x) { return R(x, 1) ^ R(x, 8) ^ (x >> 7); } -static u64 sigma1(u64 x) { return R(x,19) ^ R(x,61) ^ (x >> 6); } - -static const u64 K[80] = -{ - 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL, - 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, - 0xd807aa98a3030242ULL, 0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL, - 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL, - 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, - 0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL, - 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL, - 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, - 0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL, - 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL, - 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, - 0xd192e819d6ef5218ULL, 0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL, - 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL, - 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, - 0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL, - 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL, - 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, - 0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL, - 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL, - 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL +static uint64_t R(uint64_t x,int c) { return (x >> c) | (x << (64 - c)); } +static uint64_t Ch(uint64_t x,uint64_t y,uint64_t z) { return (x & y) ^ (~x & z); } +static uint64_t Maj(uint64_t x,uint64_t y,uint64_t z) { return (x & y) ^ (x & z) ^ (y & z); } +static uint64_t Sigma0(uint64_t x) { return R(x,28) ^ R(x,34) ^ R(x,39); } +static uint64_t Sigma1(uint64_t x) { return R(x,14) ^ R(x,18) ^ R(x,41); } +static uint64_t sigma0(uint64_t x) { return R(x, 1) ^ R(x, 8) ^ (x >> 7); } +static uint64_t sigma1(uint64_t x) { return R(x,19) ^ R(x,61) ^ (x >> 6); } + +static const uint64_t K[80] = +{ + W64LIT(0x428a2f98d728ae22), W64LIT(0x7137449123ef65cd), W64LIT(0xb5c0fbcfec4d3b2f), W64LIT(0xe9b5dba58189dbbc), + W64LIT(0x3956c25bf348b538), W64LIT(0x59f111f1b605d019), W64LIT(0x923f82a4af194f9b), W64LIT(0xab1c5ed5da6d8118), + W64LIT(0xd807aa98a3030242), W64LIT(0x12835b0145706fbe), W64LIT(0x243185be4ee4b28c), W64LIT(0x550c7dc3d5ffb4e2), + W64LIT(0x72be5d74f27b896f), W64LIT(0x80deb1fe3b1696b1), W64LIT(0x9bdc06a725c71235), W64LIT(0xc19bf174cf692694), + W64LIT(0xe49b69c19ef14ad2), W64LIT(0xefbe4786384f25e3), W64LIT(0x0fc19dc68b8cd5b5), W64LIT(0x240ca1cc77ac9c65), + W64LIT(0x2de92c6f592b0275), W64LIT(0x4a7484aa6ea6e483), W64LIT(0x5cb0a9dcbd41fbd4), W64LIT(0x76f988da831153b5), + W64LIT(0x983e5152ee66dfab), W64LIT(0xa831c66d2db43210), W64LIT(0xb00327c898fb213f), W64LIT(0xbf597fc7beef0ee4), + W64LIT(0xc6e00bf33da88fc2), W64LIT(0xd5a79147930aa725), W64LIT(0x06ca6351e003826f), W64LIT(0x142929670a0e6e70), + W64LIT(0x27b70a8546d22ffc), W64LIT(0x2e1b21385c26c926), W64LIT(0x4d2c6dfc5ac42aed), W64LIT(0x53380d139d95b3df), + W64LIT(0x650a73548baf63de), W64LIT(0x766a0abb3c77b2a8), W64LIT(0x81c2c92e47edaee6), W64LIT(0x92722c851482353b), + W64LIT(0xa2bfe8a14cf10364), W64LIT(0xa81a664bbc423001), W64LIT(0xc24b8b70d0f89791), W64LIT(0xc76c51a30654be30), + W64LIT(0xd192e819d6ef5218), W64LIT(0xd69906245565a910), W64LIT(0xf40e35855771202a), W64LIT(0x106aa07032bbd1b8), + W64LIT(0x19a4c116b8d2d0c8), W64LIT(0x1e376c085141ab53), W64LIT(0x2748774cdf8eeb99), W64LIT(0x34b0bcb5e19b48a8), + W64LIT(0x391c0cb3c5c95a63), W64LIT(0x4ed8aa4ae3418acb), W64LIT(0x5b9cca4f7763e373), W64LIT(0x682e6ff3d6b2b8a3), + W64LIT(0x748f82ee5defb2fc), W64LIT(0x78a5636f43172f60), W64LIT(0x84c87814a1f0ab72), W64LIT(0x8cc702081a6439ec), + W64LIT(0x90befffa23631e28), W64LIT(0xa4506cebde82bde9), W64LIT(0xbef9a3f7b2c67915), W64LIT(0xc67178f2e372532b), + W64LIT(0xca273eceea26619c), W64LIT(0xd186b8c721c0c207), W64LIT(0xeada7dd6cde0eb1e), W64LIT(0xf57d4f7fee6ed178), + W64LIT(0x06f067aa72176fba), W64LIT(0x0a637dc5a2c898a6), W64LIT(0x113f9804bef90dae), W64LIT(0x1b710b35131c471b), + W64LIT(0x28db77f523047d84), W64LIT(0x32caab7b40c72493), W64LIT(0x3c9ebe0a15c9bebc), W64LIT(0x431d67c49c100d4c), + W64LIT(0x4cc5d4becb3e42b6), W64LIT(0x597f299cfc657e2a), W64LIT(0x5fcb6fab3ad6faec), W64LIT(0x6c44198c4a475817) }; -int crypto_hashblocks(u8 *x,const u8 *m,u64 n) +int crypto_hashblocks(uint8_t *x,const uint8_t *m,uint64_t n) { - u64 z[8],b[8],a[8],w[16],t; + uint64_t z[8],b[8],a[8],w[16],t; int i,j; - FOR(i,8) z[i] = a[i] = dl64(x + 8 * i); + for(i=0; i<8; ++i) z[i] = a[i] = dl64(x + 8 * i); while (n >= 128) { - FOR(i,16) w[i] = dl64(m + 8 * i); + for(i=0; i<16; ++i) w[i] = dl64(m + 8 * i); - FOR(i,80) { - FOR(j,8) b[j] = a[j]; + for(i=0; i<80; ++i) { + for(j=0; j<8; ++j) b[j] = a[j]; t = a[7] + Sigma1(a[4]) + Ch(a[4],a[5],a[6]) + K[i] + w[i%16]; b[7] = t + Sigma0(a[0]) + Maj(a[0],a[1],a[2]); b[3] += t; - FOR(j,8) a[(j+1)%8] = b[j]; + for(j=0; j<8; ++j) a[(j+1)%8] = b[j]; if (i%16 == 15) - FOR(j,16) + for(j=0; j<16; ++j) w[j] += w[(j+9)%16] + sigma0(w[(j+1)%16]) + sigma1(w[(j+14)%16]); } - FOR(i,8) { a[i] += z[i]; z[i] = a[i]; } + for(i=0; i<8; ++i) { a[i] += z[i]; z[i] = a[i]; } m += 128; n -= 128; } - FOR(i,8) ts64(x+8*i,z[i]); + for(i=0; i<8; ++i) ts64(x+8*i,z[i]); return n; } -static const u8 iv[64] = { +static const uint8_t iv[64] = { 0x6a,0x09,0xe6,0x67,0xf3,0xbc,0xc9,0x08, 0xbb,0x67,0xae,0x85,0x84,0xca,0xa7,0x3b, 0x3c,0x6e,0xf3,0x72,0xfe,0x94,0xf8,0x2b, @@ -559,20 +582,20 @@ 0x5b,0xe0,0xcd,0x19,0x13,0x7e,0x21,0x79 } ; -int crypto_hash(u8 *out,const u8 *m,u64 n) +int crypto_hash(uint8_t *out,const uint8_t *m,uint64_t n) { - u8 h[64],x[256]; - u64 i,b = n; + uint8_t h[64],x[256]; + uint64_t i,b = n; - FOR(i,64) h[i] = iv[i]; + for(i=0; i<64; ++i) h[i] = iv[i]; crypto_hashblocks(h,m,n); m += n; n &= 127; m -= n; - FOR(i,256) x[i] = 0; - FOR(i,n) x[i] = m[i]; + for(i=0; i<256; ++i) x[i] = 0; + for(i=0; i= 0;--i) { - u8 b = (s[i/8]>>(i&7))&1; + uint8_t b = (s[i/8]>>(i&7))&1; cswap(p,q,b); add(q,p); add(p,p); @@ -643,7 +666,7 @@ } } -sv scalarbase(gf p[4],const u8 *s) +static void scalarbase(gf p[4],const uint8_t *s) { gf q[4]; set25519(q[0],X); @@ -653,9 +676,9 @@ scalarmult(p,q,s); } -int crypto_sign_keypair(u8 *pk, u8 *sk) +int crypto_sign_keypair(uint8_t *pk, uint8_t *sk) { - u8 d[64]; + uint8_t d[64]; gf p[4]; int i; @@ -668,50 +691,50 @@ scalarbase(p,d); pack(pk,p); - FOR(i,32) sk[32 + i] = pk[i]; + for(i=0; i<32; ++i) sk[32 + i] = pk[i]; return 0; } -static const u64 L[32] = {0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58, 0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10}; +static const uint64_t L[32] = {0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58, 0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10}; -sv modL(u8 *r,i64 x[64]) +static void modL(uint8_t *r,int64_t x[64]) { - i64 carry,i,j; + int64_t carry,i,j; for (i = 63;i >= 32;--i) { carry = 0; for (j = i - 32;j < i - 12;++j) { x[j] += carry - 16 * x[i] * L[j - (i - 32)]; carry = (x[j] + 128) >> 8; - x[j] -= carry << 8; + x[j] -= ((uint64_t)carry) << 8; } x[j] += carry; x[i] = 0; } carry = 0; - FOR(j,32) { + for(j=0; j<32; ++j) { x[j] += carry - (x[31] >> 4) * L[j]; carry = x[j] >> 8; x[j] &= 255; } - FOR(j,32) x[j] -= carry * L[j]; - FOR(i,32) { + for(j=0; j<32; ++j) x[j] -= carry * L[j]; + for(i=0; i<32; ++i) { x[i+1] += x[i] >> 8; r[i] = x[i] & 255; } } -sv reduce(u8 *r) +static void reduce(uint8_t *r) { - i64 x[64],i; - FOR(i,64) x[i] = (u64) r[i]; - FOR(i,64) r[i] = 0; + int64_t x[64],i; + for(i=0; i<64; ++i) x[i] = (uint64_t) r[i]; + for(i=0; i<64; ++i) r[i] = 0; modL(r,x); } -int crypto_sign(u8 *sm,u64 *smlen,const u8 *m,u64 n,const u8 *sk) +int crypto_sign(uint8_t *sm,uint64_t *smlen,const uint8_t *m,uint64_t n,const uint8_t *sk) { - u8 d[64],h[64],r[64]; - i64 i,j,x[64]; + uint8_t d[64],h[64],r[64]; + uint64_t i; int64_t j,x[64]; gf p[4]; crypto_hash(d, sk, 32); @@ -720,27 +743,27 @@ d[31] |= 64; *smlen = n+64; - FOR(i,n) sm[64 + i] = m[i]; - FOR(i,32) sm[32 + i] = d[32 + i]; + for(i=0; i