arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add sbyte, sword16, sword32 and sword64 (GH #608, GH #609) 

Visual Studio 2008 kind of forced out hand with this. VS2008 lacks <stdint.h> and <cstdint> and it caused compile problems in NaCl gear. We were being a tad bit lazy by relying on int8_t, int32_t and int64_t, but the compiler errors made us act
pull/611/head
Jeffrey Walton 2018-03-27 20:47:20 -04:00
parent 1c60f6480f
commit 3958fad099
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
6 changed files with 192 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aria.cpp
View File

@ -17,7 +17,7 @@
// GCC cast warning. Note: this is used on round key table,
// which is word32 and naturally aligned.
#define UINT32_CAST(x) ((uint32_t *)(void *)(x))
#define UINT32_CAST(x) ((word32 *)(void *)(x))
NAMESPACE_BEGIN(CryptoPP)
NAMESPACE_BEGIN(ARIATab)

13
config.h
View File

@ -231,18 +231,31 @@ namespace CryptoPP { }
NAMESPACE_BEGIN(CryptoPP)
// Signed words added at Issue 609 for early versions of and Visual Studio and
// the NaCl gear. Also see https://github.com/weidai11/cryptopp/issues/609.
typedef unsigned char byte;
typedef unsigned short word16;
typedef unsigned int word32;
typedef signed char sbyte;
typedef signed short sword16;
typedef signed int sword32;
#if defined(_MSC_VER) || defined(__BORLANDC__)
typedef signed __int64 sword64;
typedef unsigned __int64 word64;
#define SW64LIT(x) x##i64
#define W64LIT(x) x##ui64
#elif (_LP64 || __LP64__)
typedef signed long sword64;
typedef unsigned long word64;
#define SW64LIT(x) x##L
#define W64LIT(x) x##UL
#else
typedef signed long long sword64;
typedef unsigned long long word64;
#define SW64LIT(x) x##LL
#define W64LIT(x) x##ULL
#endif

56
naclite.h
View File

@ -153,7 +153,7 @@ CRYPTOPP_CONSTANT(crypto_scalarmult_SCALARBYTES = 32)
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/box.html">NaCl crypto_box documentation</A>
/// \since Crypto++ 6.0
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);
int crypto_box(byte *c,const byte *m,word64 d,const byte *n,const byte *y,const byte *x);
/// \brief Verify and decrypt a message
/// \param m output byte buffer
@ -166,7 +166,7 @@ int crypto_box(uint8_t *c,const uint8_t *m,uint64_t d,const uint8_t *n,const uin
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/box.html">NaCl crypto_box documentation</A>
/// \since Crypto++ 6.0
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);
int crypto_box_open(byte *m,const byte *c,word64 d,const byte *n,const byte *y,const byte *x);
/// \brief Generate a keypair for encryption
/// \param y public key byte buffer
@ -174,7 +174,7 @@ int crypto_box_open(uint8_t *m,const uint8_t *c,uint64_t d,const uint8_t *n,cons
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/box.html">NaCl crypto_box documentation</A>
/// \since Crypto++ 6.0
int crypto_box_keypair(uint8_t *y,uint8_t *x);
int crypto_box_keypair(byte *y,byte *x);
/// \brief Encrypt and authenticate a message
/// \param k shared secret byte buffer
@ -185,7 +185,7 @@ int crypto_box_keypair(uint8_t *y,uint8_t *x);
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/box.html">NaCl crypto_box documentation</A>
/// \since Crypto++ 6.0
int crypto_box_beforenm(uint8_t *k,const uint8_t *y,const uint8_t *x);
int crypto_box_beforenm(byte *k,const byte *y,const byte *x);
/// \brief Encrypt and authenticate a message
/// \param m output byte buffer
@ -199,7 +199,7 @@ int crypto_box_beforenm(uint8_t *k,const uint8_t *y,const uint8_t *x);
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/box.html">NaCl crypto_box documentation</A>
/// \since Crypto++ 6.0
int crypto_box_afternm(uint8_t *c,const uint8_t *m,uint64_t d,const uint8_t *n,const uint8_t *k);
int crypto_box_afternm(byte *c,const byte *m,word64 d,const byte *n,const byte *k);
/// \brief Verify and decrypt a message
/// \param m output byte buffer
@ -213,7 +213,7 @@ int crypto_box_afternm(uint8_t *c,const uint8_t *m,uint64_t d,const uint8_t *n,c
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/box.html">NaCl crypto_box documentation</A>
/// \since Crypto++ 6.0
int crypto_box_open_afternm(uint8_t *m,const uint8_t *c,uint64_t d,const uint8_t *n,const uint8_t *k);
int crypto_box_open_afternm(byte *m,const byte *c,word64 d,const byte *n,const byte *k);
/// \brief Encrypt and authenticate a message
/// \param c output byte buffer
@ -237,7 +237,7 @@ int crypto_box_open_afternm(uint8_t *m,const uint8_t *c,uint64_t d,const uint8_t
/// <A HREF="https://github.com/jedisct1/libsodium/commit/afabd7e7386e1194">libsodium commit
/// afabd7e7386e1194</A>.
/// \since Crypto++ 6.0
int crypto_box_unchecked(uint8_t *c,const uint8_t *m,uint64_t d,const uint8_t *n,const uint8_t *y,const uint8_t *x);
int crypto_box_unchecked(byte *c,const byte *m,word64 d,const byte *n,const byte *y,const byte *x);
/// \brief Verify and decrypt a message
/// \param m output byte buffer
@ -261,7 +261,7 @@ int crypto_box_unchecked(uint8_t *c,const uint8_t *m,uint64_t d,const uint8_t *n
/// <A HREF="https://github.com/jedisct1/libsodium/commit/afabd7e7386e1194">libsodium commit
/// afabd7e7386e1194</A>.
/// \since Crypto++ 6.0
int crypto_box_open_unchecked(uint8_t *m,const uint8_t *c,uint64_t d,const uint8_t *n,const uint8_t *y,const uint8_t *x);
int crypto_box_open_unchecked(byte *m,const byte *c,word64 d,const byte *n,const byte *y,const byte *x);
/// \brief Encrypt and authenticate a message
/// \param k shared secret byte buffer
@ -283,69 +283,69 @@ int crypto_box_open_unchecked(uint8_t *m,const uint8_t *c,uint64_t d,const uint8
/// <A HREF="https://github.com/jedisct1/libsodium/commit/afabd7e7386e1194">libsodium commit
/// afabd7e7386e1194</A>.
/// \since Crypto++ 6.0
int crypto_box_beforenm_unchecked(uint8_t *k,const uint8_t *y,const uint8_t *x);
int crypto_box_beforenm_unchecked(byte *k,const byte *y,const byte *x);
/// \brief TODO
int crypto_core_salsa20(uint8_t *out,const uint8_t *in,const uint8_t *k,const uint8_t *c);
int crypto_core_salsa20(byte *out,const byte *in,const byte *k,const byte *c);
/// \brief TODO
/// \returns 0 on success, non-0 otherwise
/// \since Crypto++ 6.0
int crypto_core_hsalsa20(uint8_t *out,const uint8_t *in,const uint8_t *k,const uint8_t *c);
int crypto_core_hsalsa20(byte *out,const byte *in,const byte *k,const byte *c);
/// \brief Hash multiple blocks
/// \details crypto_hashblocks() uses crypto_hashblocks_sha512.
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/hash.html">NaCl crypto_hash documentation</A>
/// \since Crypto++ 6.0
int crypto_hashblocks(uint8_t *x,const uint8_t *m,uint64_t n);
int crypto_hashblocks(byte *x,const byte *m,word64 n);
/// \brief Hash a message
/// \details crypto_hash() uses crypto_hash_sha512.
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/hash.html">NaCl crypto_hash documentation</A>
/// \since Crypto++ 6.0
int crypto_hash(uint8_t *out,const uint8_t *m,uint64_t n);
int crypto_hash(byte *out,const byte *m,word64 n);
/// \brief Create an authentication tag for a message
/// \details crypto_onetimeauth() uses crypto_onetimeauth_poly1305.
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/onetimeauth.html">NaCl crypto_onetimeauth documentation</A>
/// \since Crypto++ 6.0
int crypto_onetimeauth(uint8_t *out,const uint8_t *m,uint64_t n,const uint8_t *k);
int crypto_onetimeauth(byte *out,const byte *m,word64 n,const byte *k);
/// \brief Verify an authentication tag on a message
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/onetimeauth.html">NaCl crypto_onetimeauth documentation</A>
/// \since Crypto++ 6.0
int crypto_onetimeauth_verify(const uint8_t *h,const uint8_t *m,uint64_t n,const uint8_t *k);
int crypto_onetimeauth_verify(const byte *h,const byte *m,word64 n,const byte *k);
/// \brief Scalar multiplication of a point
/// \details crypto_scalarmult() uses crypto_scalarmult_curve25519
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/scalarmult.html">NaCl crypto_scalarmult documentation</A>
/// \since Crypto++ 6.0
int crypto_scalarmult(uint8_t *q,const uint8_t *n,const uint8_t *p);
int crypto_scalarmult(byte *q,const byte *n,const byte *p);
/// \brief Scalar multiplication of base point
/// \details crypto_scalarmult_base() uses crypto_scalarmult_curve25519
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/scalarmult.html">NaCl crypto_scalarmult documentation</A>
/// \since Crypto++ 6.0
int crypto_scalarmult_base(uint8_t *q,const uint8_t *n);
int crypto_scalarmult_base(byte *q,const byte *n);
/// \brief Encrypt and authenticate a message
/// \details crypto_secretbox() uses a symmetric key to encrypt and authenticate a message.
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/secretbox.html">NaCl crypto_secretbox documentation</A>
/// \since Crypto++ 6.0
int crypto_secretbox(uint8_t *c,const uint8_t *m,uint64_t d,const uint8_t *n,const uint8_t *k);
int crypto_secretbox(byte *c,const byte *m,word64 d,const byte *n,const byte *k);
/// \brief Verify and decrypt a message
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/secretbox.html">NaCl crypto_secretbox documentation</A>
/// \since Crypto++ 6.0
int crypto_secretbox_open(uint8_t *m,const uint8_t *c,uint64_t d,const uint8_t *n,const uint8_t *k);
int crypto_secretbox_open(byte *m,const byte *c,word64 d,const byte *n,const byte *k);
/// \brief Sign a message
/// \param sm output byte buffer
@ -357,7 +357,7 @@ int crypto_secretbox_open(uint8_t *m,const uint8_t *c,uint64_t d,const uint8_t *
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/sign.html">NaCl crypto_sign documentation</A>
/// \since Crypto++ 6.0
int crypto_sign(uint8_t *sm,uint64_t *smlen,const uint8_t *m,uint64_t n,const uint8_t *sk);
int crypto_sign(byte *sm,word64 *smlen,const byte *m,word64 n,const byte *sk);
/// \brief Verify a message
/// \param m output byte buffer
@ -368,7 +368,7 @@ int crypto_sign(uint8_t *sm,uint64_t *smlen,const uint8_t *m,uint64_t n,const ui
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/sign.html">NaCl crypto_sign documentation</A>
/// \since Crypto++ 6.0
int crypto_sign_open(uint8_t *m,uint64_t *mlen,const uint8_t *sm,uint64_t n,const uint8_t *pk);
int crypto_sign_open(byte *m,word64 *mlen,const byte *sm,word64 n,const byte *pk);
/// \brief Generate a keypair for signing
/// \param pk public key byte buffer
@ -377,44 +377,44 @@ int crypto_sign_open(uint8_t *m,uint64_t *mlen,const uint8_t *sm,uint64_t n,cons
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/sign.html">NaCl crypto_sign documentation</A>
/// \since Crypto++ 6.0
int crypto_sign_keypair(uint8_t *pk, uint8_t *sk);
int crypto_sign_keypair(byte *pk, byte *sk);
/// \brief Produce a keystream using XSalsa20
/// \details crypto_stream() uses crypto_stream_xsalsa20
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/stream.html">NaCl crypto_stream documentation</A>
/// \since Crypto++ 6.0
int crypto_stream(uint8_t *c,uint64_t d,const uint8_t *n,const uint8_t *k);
int crypto_stream(byte *c,word64 d,const byte *n,const byte *k);
/// \brief Encrypt a message using XSalsa20
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/stream.html">NaCl crypto_stream documentation</A>
/// \since Crypto++ 6.0
int crypto_stream_xor(uint8_t *c,const uint8_t *m,uint64_t d,const uint8_t *n,const uint8_t *k);
int crypto_stream_xor(byte *c,const byte *m,word64 d,const byte *n,const byte *k);
/// \brief Produce a keystream using Salsa20
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/stream.html">NaCl crypto_stream documentation</A>
/// \since Crypto++ 6.0
int crypto_stream_salsa20(uint8_t *c,uint64_t d,const uint8_t *n,const uint8_t *k);
int crypto_stream_salsa20(byte *c,word64 d,const byte *n,const byte *k);
/// \brief Encrypt a message using Salsa20
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/stream.html">NaCl crypto_stream documentation</A>
/// \since Crypto++ 6.0
int crypto_stream_salsa20_xor(uint8_t *c,const uint8_t *m,uint64_t b,const uint8_t *n,const uint8_t *k);
int crypto_stream_salsa20_xor(byte *c,const byte *m,word64 b,const byte *n,const byte *k);
/// \brief Compare 16-byte buffers
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/verify.html">NaCl crypto_verify documentation</A>
/// \since Crypto++ 6.0
int crypto_verify_16(const uint8_t *x,const uint8_t *y);
int crypto_verify_16(const byte *x,const byte *y);
/// \brief Compare 32-byte buffers
/// \returns 0 on success, non-0 otherwise
/// \sa <A HREF="https://nacl.cr.yp.to/verify.html">NaCl crypto_verify documentation</A>
/// \since Crypto++ 6.0
int crypto_verify_32(const uint8_t *x,const uint8_t *y);
int crypto_verify_32(const byte *x,const byte *y);
NAMESPACE_END // CryptoPP
NAMESPACE_END // NaCl

1
stdcpp.h
View File

@ -52,7 +52,6 @@ namespace std {
#include <cstdlib>
#include <cstddef>
#include <cstring>
#include <cstdint>
#include <climits>
#include <cmath>

218
tweetnacl.cpp
View File

@ -20,9 +20,9 @@
NAMESPACE_BEGIN(CryptoPP)
NAMESPACE_BEGIN(NaCl)
typedef int64_t gf[16];
typedef sword64 gf[16];
static const uint8_t
static const byte
_0[32] = {0},
_9[32] = {9};
@ -37,63 +37,63 @@ static const gf
I = {0xa0b0, 0x4a0e, 0x1b27, 0xc4ee, 0xe478, 0xad2f, 0x1806, 0x2f43, 0xd7a7, 0x3dfb, 0x0099, 0x2b4d, 0xdf0b, 0x4fc1, 0x2480, 0x2b83};
// Added by Crypto++ for TweetNaCl
static void randombytes(uint8_t * block, uint64_t size)
static void randombytes(byte * block, word64 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 word32 L32(word32 x,int c) { return (x << c) | ((x&0xffffffff) >> (32 - c)); }
static uint32_t ld32(const uint8_t *x)
static word32 ld32(const byte *x)
{
uint32_t u = x[3];
word32 u = x[3];
u = (u<<8)|x[2];
u = (u<<8)|x[1];
return (u<<8)|x[0];
}
static uint64_t dl64(const uint8_t *x)
static word64 dl64(const byte *x)
{
uint64_t i,u=0;
word64 i,u=0;
for(i=0; i<8; ++i) u=(u<<8)|x[i];
return u;
}
static void st32(uint8_t *x,uint32_t u)
static void st32(byte *x,word32 u)
{
int i;
for(i=0; i<4; ++i) { x[i] = u; u >>= 8; }
}
static void ts64(uint8_t *x,uint64_t u)
static void ts64(byte *x,word64 u)
{
int i;
for (i = 7;i >= 0;--i) { x[i] = u; u >>= 8; }
}
// Extra cast due to Coverity CID 186949
static int verify_n(const uint8_t *x,const uint8_t *y,uint32_t n)
static int verify_n(const byte *x,const byte *y,word32 n)
{
uint32_t i,d = 0;
word32 i,d = 0;
for(i=0; i<n; ++i) d |= x[i]^y[i];
const int32_t v = (int32_t) d;
return (1 & ((uint32_t)(v - 1) >> 8)) - 1;
const sword32 v = (sword32) d;
return (1 & ((word32)(v - 1) >> 8)) - 1;
}
int crypto_verify_16(const uint8_t *x,const uint8_t *y)
int crypto_verify_16(const byte *x,const byte *y)
{
return verify_n(x,y,16);
}
int crypto_verify_32(const uint8_t *x,const uint8_t *y)
int crypto_verify_32(const byte *x,const byte *y)
{
return verify_n(x,y,32);
}
static void core(uint8_t *out,const uint8_t *in,const uint8_t *k,const uint8_t *c,int h)
static void core(byte *out,const byte *in,const byte *k,const byte *c,int h)
{
uint32_t w[16],x[16],y[16],t[4];
word32 w[16],x[16],y[16],t[4];
int i,j,m;
for(i=0; i<4; ++i) {
@ -131,24 +131,24 @@ static void core(uint8_t *out,const uint8_t *in,const uint8_t *k,const uint8_t *
for(i=0; i<16; ++i) st32(out + 4 * i,x[i] + y[i]);
}
int crypto_core_salsa20(uint8_t *out,const uint8_t *in,const uint8_t *k,const uint8_t *c)
int crypto_core_salsa20(byte *out,const byte *in,const byte *k,const byte *c)
{
core(out,in,k,c,0);
return 0;
}
int crypto_core_hsalsa20(uint8_t *out,const uint8_t *in,const uint8_t *k,const uint8_t *c)
int crypto_core_hsalsa20(byte *out,const byte *in,const byte *k,const byte *c)
{
core(out,in,k,c,1);
return 0;
}
static const uint8_t sigma[16] = {0x65,0x78,0x70,0x61,0x6E,0x64,0x20,0x33,0x32,0x2D,0x62,0x79,0x74,0x65,0x20,0x6B};
static const byte sigma[16] = {0x65,0x78,0x70,0x61,0x6E,0x64,0x20,0x33,0x32,0x2D,0x62,0x79,0x74,0x65,0x20,0x6B};
int crypto_stream_salsa20_xor(uint8_t *c,const uint8_t *m,uint64_t b,const uint8_t *n,const uint8_t *k)
int crypto_stream_salsa20_xor(byte *c,const byte *m,word64 b,const byte *n,const byte *k)
{
uint8_t z[16],x[64];
uint32_t u,i;
byte z[16],x[64];
word32 u,i;
if (!b) return 0;
for(i=0; i<16; ++i) z[i] = 0;
for(i=0; i<8; ++i) z[i] = n[i];
@ -157,7 +157,7 @@ int crypto_stream_salsa20_xor(uint8_t *c,const uint8_t *m,uint64_t b,const uint8
for(i=0; i<64; ++i) c[i] = (m?m[i]:0) ^ x[i];
u = 1;
for (i = 8;i < 16;++i) {
u += (uint32_t) z[i];
u += (word32) z[i];
z[i] = u;
u >>= 8;
}
@ -172,28 +172,28 @@ int crypto_stream_salsa20_xor(uint8_t *c,const uint8_t *m,uint64_t b,const uint8
return 0;
}
int crypto_stream_salsa20(uint8_t *c,uint64_t d,const uint8_t *n,const uint8_t *k)
int crypto_stream_salsa20(byte *c,word64 d,const byte *n,const byte *k)
{
return crypto_stream_salsa20_xor(c,0,d,n,k);
}
int crypto_stream(uint8_t *c,uint64_t d,const uint8_t *n,const uint8_t *k)
int crypto_stream(byte *c,word64 d,const byte *n,const byte *k)
{
uint8_t s[32];
byte s[32];
crypto_core_hsalsa20(s,n,k,sigma);
return crypto_stream_salsa20(c,d,n+16,s);
}
int crypto_stream_xor(uint8_t *c,const uint8_t *m,uint64_t d,const uint8_t *n,const uint8_t *k)
int crypto_stream_xor(byte *c,const byte *m,word64 d,const byte *n,const byte *k)
{
uint8_t s[32];
byte s[32];
crypto_core_hsalsa20(s,n,k,sigma);
return crypto_stream_salsa20_xor(c,m,d,n+16,s);
}
static void add1305(uint32_t *h,const uint32_t *c)
static void add1305(word32 *h,const word32 *c)
{
uint32_t j,u = 0;
word32 j,u = 0;
for(j=0; j<17; ++j) {
u += h[j] + c[j];
h[j] = u & 255;
@ -201,13 +201,13 @@ static void add1305(uint32_t *h,const uint32_t *c)
}
}
static const uint32_t minusp[17] = {
static const word32 minusp[17] = {
5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252
} ;
int crypto_onetimeauth(uint8_t *out,const uint8_t *m,uint64_t n,const uint8_t *k)
int crypto_onetimeauth(byte *out,const byte *m,word64 n,const byte *k)
{
uint32_t s,i,j,u,x[17],r[17],h[17],c[17],g[17];
word32 s,i,j,u,x[17],r[17],h[17],c[17],g[17];
for(j=0; j<17; ++j) r[j]=h[j]=0;
for(j=0; j<16; ++j) r[j]=k[j];
@ -258,14 +258,14 @@ int crypto_onetimeauth(uint8_t *out,const uint8_t *m,uint64_t n,const uint8_t *k
return 0;
}
int crypto_onetimeauth_verify(const uint8_t *h,const uint8_t *m,uint64_t n,const uint8_t *k)
int crypto_onetimeauth_verify(const byte *h,const byte *m,word64 n,const byte *k)
{
uint8_t x[16];
byte x[16];
crypto_onetimeauth(x,m,n,k);
return crypto_verify_16(h,x);
}
int crypto_secretbox(uint8_t *c,const uint8_t *m,uint64_t d,const uint8_t *n,const uint8_t *k)
int crypto_secretbox(byte *c,const byte *m,word64 d,const byte *n,const byte *k)
{
int i;
if (d < 32) return -1;
@ -275,10 +275,10 @@ int crypto_secretbox(uint8_t *c,const uint8_t *m,uint64_t d,const uint8_t *n,con
return 0;
}
int crypto_secretbox_open(uint8_t *m,const uint8_t *c,uint64_t d,const uint8_t *n,const uint8_t *k)
int crypto_secretbox_open(byte *m,const byte *c,word64 d,const byte *n,const byte *k)
{
int i;
uint8_t x[32];
byte 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;
@ -296,18 +296,18 @@ static void set25519(gf r, const gf a)
static void car25519(gf o)
{
int i;
int64_t c;
sword64 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]-=((uint64_t)c)<<16;
o[i]-=((word64)c)<<16;
}
}
static void sel25519(gf p,gf q,int b)
{
int64_t t,i,c=~(b-1);
sword64 t,i,c=~(b-1);
for(i=0; i<16; ++i) {
t= c&(p[i]^q[i]);
p[i]^=t;
@ -315,7 +315,7 @@ static void sel25519(gf p,gf q,int b)
}
}
static void pack25519(uint8_t *o,const gf n)
static void pack25519(byte *o,const gf n)
{
int i,j,b;
gf m,t;
@ -342,23 +342,23 @@ static void pack25519(uint8_t *o,const gf n)
static int neq25519(const gf a, const gf b)
{
uint8_t c[32],d[32];
byte c[32],d[32];
pack25519(c,a);
pack25519(d,b);
return crypto_verify_32(c,d);
}
static uint8_t par25519(const gf a)
static byte par25519(const gf a)
{
uint8_t d[32];
byte d[32];
pack25519(d,a);
return d[0]&1;
}
static void unpack25519(gf o, const uint8_t *n)
static void unpack25519(gf o, const byte *n)
{
int i;
for(i=0; i<16; ++i) o[i]=n[2*i]+((int64_t)n[2*i+1]<<8);
for(i=0; i<16; ++i) o[i]=n[2*i]+((sword64)n[2*i+1]<<8);
o[15]&=0x7fff;
}
@ -376,7 +376,7 @@ static void Z(gf o,const gf a,const gf b)
static void M(gf o,const gf a,const gf b)
{
int64_t i,j,t[31];
sword64 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];
@ -415,10 +415,10 @@ static void pow2523(gf o,const gf i)
}
// https://github.com/jedisct1/libsodium/blob/master/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
static int has_small_order(const uint8_t s[32])
static int has_small_order(const byte s[32])
{
CRYPTOPP_ALIGN_DATA(16)
const uint8_t blacklist[][32] = {
const byte blacklist[][32] = {
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
{ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
{ 0xe0, 0xeb, 0x7a, 0x7c, 0x3b, 0x41, 0xb8, 0xae, 0x16, 0x56, 0xe3, 0xfa, 0xf1, 0x9f, 0xc4, 0x6a, 0xda, 0x09, 0x8d, 0xeb, 0x9c, 0x32, 0xb1, 0xfd, 0x86, 0x62, 0x05, 0x16, 0x5f, 0x49, 0xb8, 0x00 },
@ -434,7 +434,7 @@ static int has_small_order(const uint8_t s[32])
};
CRYPTOPP_COMPILE_ASSERT(12 == COUNTOF(blacklist));
uint8_t c[12] = { 0 };
byte c[12] = { 0 };
for (size_t j = 0; j < 32; j++) {
for (size_t i = 0; i < COUNTOF(blacklist); i++) {
c[i] |= s[j] ^ blacklist[i][j];
@ -449,10 +449,10 @@ static int has_small_order(const uint8_t s[32])
return (int) ((k >> 8) & 1);
}
int crypto_scalarmult(uint8_t *q,const uint8_t *n,const uint8_t *p)
int crypto_scalarmult(byte *q,const byte *n,const byte *p)
{
uint8_t z[32];
int64_t x[80],r,i;
byte z[32];
sword64 x[80],r,i;
gf a,b,c,d,e,f;
for(i=0; i<31; ++i) z[i]=n[i];
z[31]=(n[31]&127)|64;
@ -500,12 +500,12 @@ int crypto_scalarmult(uint8_t *q,const uint8_t *n,const uint8_t *p)
return 0;
}
int crypto_scalarmult_base(uint8_t *q,const uint8_t *n)
int crypto_scalarmult_base(byte *q,const byte *n)
{
return crypto_scalarmult(q,n,_9);
}
int crypto_box_keypair(uint8_t *y,uint8_t *x)
int crypto_box_keypair(byte *y,byte *x)
{
randombytes(x,32);
return crypto_scalarmult_base(y,x);
@ -513,69 +513,69 @@ int crypto_box_keypair(uint8_t *y,uint8_t *x)
// Avoid small order elements. Also see https://eprint.iacr.org/2017/806.pdf
// and https://github.com/jedisct1/libsodium/commit/675149b9b8b66ff4.
int crypto_box_beforenm(uint8_t *k,const uint8_t *y,const uint8_t *x)
int crypto_box_beforenm(byte *k,const byte *y,const byte *x)
{
uint8_t s[32];
byte s[32];
if(crypto_scalarmult(s,x,y) != 0) return -1;
if(has_small_order(s) != 0) return -1;
return crypto_core_hsalsa20(k,_0,s,sigma);
}
// Allow small order elements. Also see https://eprint.iacr.org/2017/806.pdf
int crypto_box_beforenm_unchecked(uint8_t *k,const uint8_t *y,const uint8_t *x)
int crypto_box_beforenm_unchecked(byte *k,const byte *y,const byte *x)
{
uint8_t s[32];
byte s[32];
if(crypto_scalarmult(s,x,y) != 0) return -1;
return crypto_core_hsalsa20(k,_0,s,sigma);
}
int crypto_box_afternm(uint8_t *c,const uint8_t *m,uint64_t d,const uint8_t *n,const uint8_t *k)
int crypto_box_afternm(byte *c,const byte *m,word64 d,const byte *n,const byte *k)
{
return crypto_secretbox(c,m,d,n,k);
}
int crypto_box_open_afternm(uint8_t *m,const uint8_t *c,uint64_t d,const uint8_t *n,const uint8_t *k)
int crypto_box_open_afternm(byte *m,const byte *c,word64 d,const byte *n,const byte *k)
{
return crypto_secretbox_open(m,c,d,n,k);
}
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)
int crypto_box(byte *c, const byte *m, word64 d, const byte *n, const byte *y, const byte *x)
{
uint8_t k[32];
byte k[32];
if (crypto_box_beforenm(k, y, x) != 0) return -1;
return crypto_box_afternm(c, m, d, n, k);
}
int crypto_box_unchecked(uint8_t *c, const uint8_t *m, uint64_t d, const uint8_t *n, const uint8_t *y, const uint8_t *x)
int crypto_box_unchecked(byte *c, const byte *m, word64 d, const byte *n, const byte *y, const byte *x)
{
uint8_t k[32];
byte k[32];
crypto_box_beforenm_unchecked(k, y, x);
return crypto_box_afternm(c, m, d, n, k);
}
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)
int crypto_box_open(byte *m,const byte *c,word64 d,const byte *n,const byte *y,const byte *x)
{
uint8_t k[32];
byte k[32];
if(crypto_box_beforenm(k,y,x) != 0) return -1;
return crypto_box_open_afternm(m,c,d,n,k);
}
int crypto_box_open_unchecked(uint8_t *m,const uint8_t *c,uint64_t d,const uint8_t *n,const uint8_t *y,const uint8_t *x)
int crypto_box_open_unchecked(byte *m,const byte *c,word64 d,const byte *n,const byte *y,const byte *x)
{
uint8_t k[32];
byte k[32];
crypto_box_beforenm_unchecked(k,y,x);
return crypto_box_open_afternm(m,c,d,n,k);
}
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 word64 R(word64 x,int c) { return (x >> c) | (x << (64 - c)); }
static word64 Ch(word64 x,word64 y,word64 z) { return (x & y) ^ (~x & z); }
static word64 Maj(word64 x,word64 y,word64 z) { return (x & y) ^ (x & z) ^ (y & z); }
static word64 Sigma0(word64 x) { return R(x,28) ^ R(x,34) ^ R(x,39); }
static word64 Sigma1(word64 x) { return R(x,14) ^ R(x,18) ^ R(x,41); }
static word64 sigma0(word64 x) { return R(x, 1) ^ R(x, 8) ^ (x >> 7); }
static word64 sigma1(word64 x) { return R(x,19) ^ R(x,61) ^ (x >> 6); }
static const uint64_t K[80] =
static const word64 K[80] =
{
W64LIT(0x428a2f98d728ae22), W64LIT(0x7137449123ef65cd), W64LIT(0xb5c0fbcfec4d3b2f), W64LIT(0xe9b5dba58189dbbc),
W64LIT(0x3956c25bf348b538), W64LIT(0x59f111f1b605d019), W64LIT(0x923f82a4af194f9b), W64LIT(0xab1c5ed5da6d8118),
@ -599,9 +599,9 @@ static const uint64_t K[80] =
W64LIT(0x4cc5d4becb3e42b6), W64LIT(0x597f299cfc657e2a), W64LIT(0x5fcb6fab3ad6faec), W64LIT(0x6c44198c4a475817)
};
int crypto_hashblocks(uint8_t *x,const uint8_t *m,uint64_t n)
int crypto_hashblocks(byte *x,const byte *m,word64 n)
{
uint64_t z[8],b[8],a[8],w[16],t;
word64 z[8],b[8],a[8],w[16],t;
int i,j;
for(i=0; i<8; ++i) z[i] = a[i] = dl64(x + 8 * i);
@ -631,7 +631,7 @@ int crypto_hashblocks(uint8_t *x,const uint8_t *m,uint64_t n)
return n;
}
static const uint8_t iv[64] = {
static const byte 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,
@ -642,10 +642,10 @@ static const uint8_t iv[64] = {
0x5b,0xe0,0xcd,0x19,0x13,0x7e,0x21,0x79
} ;
int crypto_hash(uint8_t *out,const uint8_t *m,uint64_t n)
int crypto_hash(byte *out,const byte *m,word64 n)
{
uint8_t h[64],x[256];
uint64_t i,b = n;
byte h[64],x[256];
word64 i,b = n;
for(i=0; i<64; ++i) h[i] = iv[i];
@ -693,14 +693,14 @@ static void add(gf p[4],gf q[4])
M(p[3], e, h);
}
static void cswap(gf p[4],gf q[4],uint8_t b)
static void cswap(gf p[4],gf q[4],byte b)
{
int i;
for(i=0; i<4; ++i)
sel25519(p[i],q[i],b);
}
static void pack(uint8_t *r,gf p[4])
static void pack(byte *r,gf p[4])
{
gf tx, ty, zi;
inv25519(zi, p[2]);
@ -710,7 +710,7 @@ static void pack(uint8_t *r,gf p[4])
r[31] ^= par25519(tx) << 7;
}
static void scalarmult(gf p[4],gf q[4],const uint8_t *s)
static void scalarmult(gf p[4],gf q[4],const byte *s)
{
int i;
set25519(p[0],gf0);
@ -718,7 +718,7 @@ static void scalarmult(gf p[4],gf q[4],const uint8_t *s)
set25519(p[2],gf1);
set25519(p[3],gf0);
for (i = 255;i >= 0;--i) {
uint8_t b = (s[i/8]>>(i&7))&1;
byte b = (s[i/8]>>(i&7))&1;
cswap(p,q,b);
add(q,p);
add(p,p);
@ -726,7 +726,7 @@ static void scalarmult(gf p[4],gf q[4],const uint8_t *s)
}
}
static void scalarbase(gf p[4],const uint8_t *s)
static void scalarbase(gf p[4],const byte *s)
{
gf q[4];
set25519(q[0],X);
@ -736,9 +736,9 @@ static void scalarbase(gf p[4],const uint8_t *s)
scalarmult(p,q,s);
}
int crypto_sign_keypair(uint8_t *pk, uint8_t *sk)
int crypto_sign_keypair(byte *pk, byte *sk)
{
uint8_t d[64];
byte d[64];
gf p[4];
int i;
@ -755,17 +755,17 @@ int crypto_sign_keypair(uint8_t *pk, uint8_t *sk)
return 0;
}
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};
static const word64 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 void modL(uint8_t *r,int64_t x[64])
static void modL(byte *r,sword64 x[64])
{
int64_t carry,i,j;
sword64 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] -= ((uint64_t)carry) << 8;
x[j] -= ((word64)carry) << 8;
}
x[j] += carry;
x[i] = 0;
@ -783,18 +783,18 @@ static void modL(uint8_t *r,int64_t x[64])
}
}
static void reduce(uint8_t *r)
static void reduce(byte *r)
{
int64_t x[64],i;
for(i=0; i<64; ++i) x[i] = (uint64_t) r[i];
sword64 x[64],i;
for(i=0; i<64; ++i) x[i] = (word64) r[i];
for(i=0; i<64; ++i) r[i] = 0;
modL(r,x);
}
int crypto_sign(uint8_t *sm,uint64_t *smlen,const uint8_t *m,uint64_t n,const uint8_t *sk)
int crypto_sign(byte *sm,word64 *smlen,const byte *m,word64 n,const byte *sk)
{
uint8_t d[64],h[64],r[64];
uint64_t i; int64_t j,x[64];
byte d[64],h[64],r[64];
word64 i; sword64 j,x[64];
gf p[4];
crypto_hash(d, sk, 32);
@ -816,14 +816,14 @@ int crypto_sign(uint8_t *sm,uint64_t *smlen,const uint8_t *m,uint64_t n,const ui
reduce(h);
for(i=0; i<64; ++i) x[i] = 0;
for(i=0; i<32; ++i) x[i] = (uint64_t) r[i];
for(i=0; i<32; ++i) for(j=0; j<32; ++j) x[i+j] += h[i] * (uint64_t) d[j];
for(i=0; i<32; ++i) x[i] = (word64) r[i];
for(i=0; i<32; ++i) for(j=0; j<32; ++j) x[i+j] += h[i] * (word64) d[j];
modL(sm + 32,x);
return 0;
}
static int unpackneg(gf r[4],const uint8_t p[32])
static int unpackneg(gf r[4],const byte p[32])
{
gf t, chk, num, den, den2, den4, den6;
set25519(r[2],gf1);
@ -859,10 +859,10 @@ static int unpackneg(gf r[4],const uint8_t p[32])
return 0;
}
int crypto_sign_open(uint8_t *m,uint64_t *mlen,const uint8_t *sm,uint64_t n,const uint8_t *pk)
int crypto_sign_open(byte *m,word64 *mlen,const byte *sm,word64 n,const byte *pk)
{
uint32_t i;
uint8_t t[32],h[64];
word32 i;
byte t[32],h[64];
gf p[4],q[4];
*mlen = -1;

82
validat4.cpp
View File

@ -45,31 +45,31 @@ USING_NAMESPACE(NaCl)
bool TestCryptoBox()
{
// https://github.com/jedisct1/libsodium/blob/master/test/default/box.c
const uint8_t alicesk[32] = {
const byte alicesk[32] = {
0x77, 0x07, 0x6d, 0x0a, 0x73, 0x18, 0xa5, 0x7d, 0x3c, 0x16, 0xc1,
0x72, 0x51, 0xb2, 0x66, 0x45, 0xdf, 0x4c, 0x2f, 0x87, 0xeb, 0xc0,
0x99, 0x2a, 0xb1, 0x77, 0xfb, 0xa5, 0x1d, 0xb9, 0x2c, 0x2a
};
const uint8_t bobpk[32] = {
const byte bobpk[32] = {
0xde, 0x9e, 0xdb, 0x7d, 0x7b, 0x7d, 0xc1, 0xb4, 0xd3, 0x5b, 0x61,
0xc2, 0xec, 0xe4, 0x35, 0x37, 0x3f, 0x83, 0x43, 0xc8, 0x5b, 0x78,
0x67, 0x4d, 0xad, 0xfc, 0x7e, 0x14, 0x6f, 0x88, 0x2b, 0x4f
};
const uint8_t small_order_p[crypto_box_PUBLICKEYBYTES] = {
const byte small_order_p[crypto_box_PUBLICKEYBYTES] = {
0xe0, 0xeb, 0x7a, 0x7c, 0x3b, 0x41, 0xb8, 0xae, 0x16, 0x56, 0xe3,
0xfa, 0xf1, 0x9f, 0xc4, 0x6a, 0xda, 0x09, 0x8d, 0xeb, 0x9c, 0x32,
0xb1, 0xfd, 0x86, 0x62, 0x05, 0x16, 0x5f, 0x49, 0xb8, 0x00
};
const uint8_t nonce[24] = {
const byte nonce[24] = {
0x69, 0x69, 0x6e, 0xe9, 0x55, 0xb6, 0x2b, 0x73, 0xcd, 0x62, 0xbd, 0xa8,
0x75, 0xfc, 0x73, 0xd6, 0x82, 0x19, 0xe0, 0x03, 0x6b, 0x7a, 0x0b, 0x37
};
/* API requires first 32 bytes to be 0 */
const uint8_t m[163] = {
const byte m[163] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0xbe, 0x07, 0x5f, 0xc5,
@ -86,7 +86,7 @@ bool TestCryptoBox()
0x76, 0x38, 0x48, 0x64, 0x5e, 0x07, 0x05
};
const uint8_t exp1[] = {
const byte exp1[] = {
0xf3,0xff,0xc7,0x70,0x3f,0x94,0x00,0xe5 ,0x2a,0x7d,0xfb,0x4b,0x3d,0x33,0x05,0xd9,
0x8e,0x99,0x3b,0x9f,0x48,0x68,0x12,0x73 ,0xc2,0x96,0x50,0xba,0x32,0xfc,0x76,0xce,
0x48,0x33,0x2e,0xa7,0x16,0x4d,0x96,0xa4 ,0x47,0x6f,0xb8,0xc5,0x31,0xa1,0x18,0x6a,
@ -99,7 +99,7 @@ bool TestCryptoBox()
0xe3,0x55,0xa5
};
const uint8_t exp2[] = {
const byte exp2[] = {
0xf3,0xff,0xc7,0x70,0x3f,0x94,0x00,0xe5 ,0x2a,0x7d,0xfb,0x4b,0x3d,0x33,0x05,0xd9,
0x8e,0x99,0x3b,0x9f,0x48,0x68,0x12,0x73 ,0xc2,0x96,0x50,0xba,0x32,0xfc,0x76,0xce,
0x48,0x33,0x2e,0xa7,0x16,0x4d,0x96,0xa4 ,0x47,0x6f,0xb8,0xc5,0x31,0xa1,0x18,0x6a,
@ -112,8 +112,8 @@ bool TestCryptoBox()
0xe3,0x55,0xa5
};
uint8_t c[163];
uint8_t k[crypto_box_BEFORENMBYTES];
byte c[163];
byte k[crypto_box_BEFORENMBYTES];
bool pass = true; int rc;
@ -161,31 +161,31 @@ bool TestCryptoBox()
bool TestCryptoBoxOpen()
{
// https://github.com/jedisct1/libsodium/blob/master/test/default/box2.c
const uint8_t bobsk[32] = {
const byte bobsk[32] = {
0x5d, 0xab, 0x08, 0x7e, 0x62, 0x4a, 0x8a, 0x4b, 0x79, 0xe1, 0x7f, 0x8b, 0x83, 0x80,
0x0e, 0xe6, 0x6f, 0x3b, 0xb1, 0x29, 0x26, 0x18, 0xb6, 0xfd, 0x1c, 0x2f, 0x8b, 0x27,
0xff, 0x88, 0xe0, 0xeb
};
const uint8_t alicepk[32] = {
const byte alicepk[32] = {
0x85, 0x20, 0xf0, 0x09, 0x89, 0x30, 0xa7, 0x54, 0x74, 0x8b, 0x7d, 0xdc, 0xb4, 0x3e,
0xf7, 0x5a, 0x0d, 0xbf, 0x3a, 0x0d, 0x26, 0x38, 0x1a, 0xf4, 0xeb, 0xa4, 0xa9, 0x8e,
0xaa, 0x9b, 0x4e, 0x6a
};
static const uint8_t small_order_p[crypto_box_PUBLICKEYBYTES] = {
static const byte small_order_p[crypto_box_PUBLICKEYBYTES] = {
0xe0, 0xeb, 0x7a, 0x7c, 0x3b, 0x41, 0xb8, 0xae, 0x16, 0x56, 0xe3, 0xfa, 0xf1, 0x9f,
0xc4, 0x6a, 0xda, 0x09, 0x8d, 0xeb, 0x9c, 0x32, 0xb1, 0xfd, 0x86, 0x62, 0x05, 0x16,
0x5f, 0x49, 0xb8, 0x00
};
const uint8_t nonce[24] = {
const byte nonce[24] = {
0x69, 0x69, 0x6e, 0xe9, 0x55, 0xb6, 0x2b, 0x73, 0xcd, 0x62, 0xbd, 0xa8,
0x75, 0xfc, 0x73, 0xd6, 0x82, 0x19, 0xe0, 0x03, 0x6b, 0x7a, 0x0b, 0x37
};
/* API requires first 16 bytes to be 0 */
const uint8_t c[163] = {
const byte c[163] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0xf3, 0xff, 0xc7, 0x70, 0x3f, 0x94, 0x00, 0xe5,
0x2a, 0x7d, 0xfb, 0x4b, 0x3d, 0x33, 0x05, 0xd9, 0x8e, 0x99, 0x3b, 0x9f,
@ -202,7 +202,7 @@ bool TestCryptoBoxOpen()
0x4c, 0xb4, 0x5a, 0x74, 0xe3, 0x55, 0xa5
};
const uint8_t exp1[] = {
const byte exp1[] = {
0xbe,0x07,0x5f,0xc5,0x3c,0x81,0xf2,0xd5, 0xcf,0x14,0x13,0x16,0xeb,0xeb,0x0c,0x7b,
0x52,0x28,0xc5,0x2a,0x4c,0x62,0xcb,0xd4, 0x4b,0x66,0x84,0x9b,0x64,0x24,0x4f,0xfc,
0xe5,0xec,0xba,0xaf,0x33,0xbd,0x75,0x1a, 0x1a,0xc7,0x28,0xd4,0x5e,0x6c,0x61,0x29,
@ -214,7 +214,7 @@ bool TestCryptoBoxOpen()
0x5e,0x07,0x05
};
const uint8_t exp2[] = {
const byte exp2[] = {
0xbe,0x07,0x5f,0xc5,0x3c,0x81,0xf2,0xd5, 0xcf,0x14,0x13,0x16,0xeb,0xeb,0x0c,0x7b,
0x52,0x28,0xc5,0x2a,0x4c,0x62,0xcb,0xd4, 0x4b,0x66,0x84,0x9b,0x64,0x24,0x4f,0xfc,
0xe5,0xec,0xba,0xaf,0x33,0xbd,0x75,0x1a, 0x1a,0xc7,0x28,0xd4,0x5e,0x6c,0x61,0x29,
@ -226,8 +226,8 @@ bool TestCryptoBoxOpen()
0x5e,0x07,0x05
};
uint8_t m[163];
uint8_t k[crypto_box_BEFORENMBYTES];
byte m[163];
byte k[crypto_box_BEFORENMBYTES];
bool pass = true; int rc;
@ -273,14 +273,14 @@ bool TestCryptoBoxKeys()
const unsigned int MAX_TEST = 64;
const unsigned int MAX_MESSAGE = 4096;
uint8_t alicesk[crypto_box_SECRETKEYBYTES];
uint8_t alicepk[crypto_box_PUBLICKEYBYTES];
uint8_t bobsk[crypto_box_SECRETKEYBYTES];
uint8_t bobpk[crypto_box_PUBLICKEYBYTES];
byte alicesk[crypto_box_SECRETKEYBYTES];
byte alicepk[crypto_box_PUBLICKEYBYTES];
byte bobsk[crypto_box_SECRETKEYBYTES];
byte bobpk[crypto_box_PUBLICKEYBYTES];
// uint8_t m[MAX_MESSAGE+32];
// uint8_t c[MAX_MESSAGE+32];
// uint8_t r[MAX_MESSAGE+32];
// byte m[MAX_MESSAGE+32];
// byte c[MAX_MESSAGE+32];
// byte r[MAX_MESSAGE+32];
bool pass = true, fail; int rc;
for (unsigned int i=0; i < MAX_TEST; ++i)
@ -291,7 +291,7 @@ bool TestCryptoBoxKeys()
pass = !fail && pass;
SecByteBlock m, c, r, n;
const uint32_t len = (i == 0 ? 0 : GlobalRNG().GenerateWord32(1, MAX_MESSAGE));
const word32 len = (i == 0 ? 0 : GlobalRNG().GenerateWord32(1, MAX_MESSAGE));
m.New(len+crypto_box_ZEROBYTES);
c.New(len+crypto_box_BOXZEROBYTES+crypto_box_MACBYTES);
@ -319,10 +319,10 @@ bool TestCryptoBoxKeys()
}
struct TestData {
const uint8_t sk[crypto_sign_SEEDBYTES];
const uint8_t pk[crypto_sign_PUBLICKEYBYTES];
const uint8_t sig[crypto_sign_BYTES];
const uint32_t len;
const byte sk[crypto_sign_SEEDBYTES];
const byte pk[crypto_sign_PUBLICKEYBYTES];
const byte sig[crypto_sign_BYTES];
const word32 len;
const char* msg;
};
@ -401,8 +401,8 @@ bool TestCryptoSign()
// https://github.com/jedisct1/libsodium/blob/master/test/default/sign.c
const unsigned int MAX_MESSAGE = 65; // Sync with test data
uint8_t pk[crypto_sign_PUBLICKEYBYTES];
uint8_t sk[crypto_sign_SECRETKEYBYTES];
byte pk[crypto_sign_PUBLICKEYBYTES];
byte sk[crypto_sign_SECRETKEYBYTES];
SecByteBlock sm(MAX_MESSAGE+crypto_sign_BYTES);
SecByteBlock rm(MAX_MESSAGE+crypto_sign_BYTES);
@ -415,20 +415,20 @@ bool TestCryptoSign()
std::memcpy(sk+crypto_sign_SEEDBYTES, data.pk, crypto_sign_PUBLICKEYBYTES);
std::memcpy(pk, data.pk, crypto_sign_PUBLICKEYBYTES);
const uint8_t* m = reinterpret_cast<const uint8_t*>(data.msg);
const uint64_t l = data.len;
uint64_t smlen;
const byte* m = reinterpret_cast<const byte*>(data.msg);
const word64 l = data.len;
word64 smlen;
rc = crypto_sign(sm, &smlen, m, l, sk);
fail = (rc != 0); pass = !fail && pass;
uint64_t s = STDMIN(smlen, (uint64_t)crypto_sign_BYTES);
word64 s = STDMIN(smlen, (word64)crypto_sign_BYTES);
pass = (s >= crypto_sign_BYTES) && pass;
fail = std::memcmp(sm, data.sig, (size_t)s) != 0;
pass = !fail && pass;
uint64_t rmlen;
word64 rmlen;
rc = crypto_sign_open(rm, &rmlen, sm, smlen, pk);
fail = (rc != 0); pass = !fail && pass;
@ -446,8 +446,8 @@ bool TestCryptoSignKeys()
const unsigned int MAX_TEST = 64;
const unsigned int MAX_MESSAGE = 4096;
uint8_t pk[crypto_sign_PUBLICKEYBYTES];
uint8_t sk[crypto_sign_SECRETKEYBYTES];
byte pk[crypto_sign_PUBLICKEYBYTES];
byte sk[crypto_sign_SECRETKEYBYTES];
bool pass = true, fail; int rc;
@ -456,11 +456,11 @@ bool TestCryptoSignKeys()
fail = (crypto_sign_keypair(pk, sk) != 0);
pass = !fail && pass;
const uint32_t len = (i == 0 ? 0 : GlobalRNG().GenerateWord32(1, MAX_MESSAGE));
const word32 len = (i == 0 ? 0 : GlobalRNG().GenerateWord32(1, MAX_MESSAGE));
SecByteBlock m(len), sm(len+crypto_sign_BYTES), rm(len+crypto_sign_BYTES);
if (len) { GlobalRNG().GenerateBlock(m, len); }
uint64_t mlen = len, smlen, rmlen;
word64 mlen = len, smlen, rmlen;
rc = crypto_sign(sm, &smlen, m, mlen, sk);
fail = (rc != 0); pass = !fail && pass;