Name parameters in all prototypes.

This commit is contained in:
Frank Denis
2014-05-12 22:04:03 -07:00
parent a3527a476a
commit 37ed9bada9
24 changed files with 211 additions and 118 deletions
@@ -7,7 +7,7 @@
#include "common.h"
#include "consts.h"
int crypto_stream_afternm(unsigned char *outp, unsigned long long len, const unsigned char *noncep, const unsigned char *c)
int crypto_stream_afternm(unsigned char *out, unsigned long long len, const unsigned char *nonce, const unsigned char *c)
{
int128 xmm0;
@@ -38,7 +38,7 @@ int crypto_stream_afternm(unsigned char *outp, unsigned long long len, const uns
uint32 tmp;
/* Copy nonce on the stack */
copy2(&nonce_stack, (const int128 *) (noncep + 0));
copy2(&nonce_stack, (const int128 *) (nonce + 0));
np = (unsigned char *)&nonce_stack;
enc_block:
@@ -92,17 +92,17 @@ int crypto_stream_afternm(unsigned char *outp, unsigned long long len, const uns
tmp += 8;
store32_bigendian(np + 12, tmp);
*(int128 *) (outp + 0) = xmm8;
*(int128 *) (outp + 16) = xmm9;
*(int128 *) (outp + 32) = xmm12;
*(int128 *) (outp + 48) = xmm14;
*(int128 *) (outp + 64) = xmm11;
*(int128 *) (outp + 80) = xmm15;
*(int128 *) (outp + 96) = xmm10;
*(int128 *) (outp + 112) = xmm13;
*(int128 *) (out + 0) = xmm8;
*(int128 *) (out + 16) = xmm9;
*(int128 *) (out + 32) = xmm12;
*(int128 *) (out + 48) = xmm14;
*(int128 *) (out + 64) = xmm11;
*(int128 *) (out + 80) = xmm15;
*(int128 *) (out + 96) = xmm10;
*(int128 *) (out + 112) = xmm13;
len -= 128;
outp += 128;
out += 128;
goto enc_block;
@@ -130,10 +130,10 @@ int crypto_stream_afternm(unsigned char *outp, unsigned long long len, const uns
if(lensav == 0) goto end;
b = blp[0]; /* clang false positive */
*(unsigned char *)(outp + 0) = b;
*(unsigned char *)(out + 0) = b;
blp += 1;
outp +=1;
out +=1;
lensav -= 1;
goto bytes;
@@ -144,14 +144,14 @@ int crypto_stream_afternm(unsigned char *outp, unsigned long long len, const uns
tmp += 8;
store32_bigendian(np + 12, tmp);
*(int128 *) (outp + 0) = xmm8;
*(int128 *) (outp + 16) = xmm9;
*(int128 *) (outp + 32) = xmm12;
*(int128 *) (outp + 48) = xmm14;
*(int128 *) (outp + 64) = xmm11;
*(int128 *) (outp + 80) = xmm15;
*(int128 *) (outp + 96) = xmm10;
*(int128 *) (outp + 112) = xmm13;
*(int128 *) (out + 0) = xmm8;
*(int128 *) (out + 16) = xmm9;
*(int128 *) (out + 32) = xmm12;
*(int128 *) (out + 48) = xmm14;
*(int128 *) (out + 64) = xmm11;
*(int128 *) (out + 80) = xmm15;
*(int128 *) (out + 96) = xmm10;
*(int128 *) (out + 112) = xmm13;
end:
return 0;
@@ -8,7 +8,7 @@
#include "common.h"
#include "consts.h"
int crypto_stream_xor_afternm(unsigned char *outp, const unsigned char *inp, unsigned long long len, const unsigned char *noncep, const unsigned char *c)
int crypto_stream_xor_afternm(unsigned char *out, const unsigned char *in, unsigned long long len, const unsigned char *nonce, const unsigned char *c)
{
int128 xmm0;
@@ -39,7 +39,7 @@ int crypto_stream_xor_afternm(unsigned char *outp, const unsigned char *inp, uns
uint32 tmp;
/* Copy nonce on the stack */
copy2(&nonce_stack, (const int128 *) (noncep + 0));
copy2(&nonce_stack, (const int128 *) (nonce + 0));
np = (unsigned char *)&nonce_stack;
enc_block:
@@ -93,27 +93,27 @@ int crypto_stream_xor_afternm(unsigned char *outp, const unsigned char *inp, uns
tmp += 8;
store32_bigendian(np + 12, tmp);
xor2(&xmm8, (const int128 *)(inp + 0));
xor2(&xmm9, (const int128 *)(inp + 16));
xor2(&xmm12, (const int128 *)(inp + 32));
xor2(&xmm14, (const int128 *)(inp + 48));
xor2(&xmm11, (const int128 *)(inp + 64));
xor2(&xmm15, (const int128 *)(inp + 80));
xor2(&xmm10, (const int128 *)(inp + 96));
xor2(&xmm13, (const int128 *)(inp + 112));
xor2(&xmm8, (const int128 *)(in + 0));
xor2(&xmm9, (const int128 *)(in + 16));
xor2(&xmm12, (const int128 *)(in + 32));
xor2(&xmm14, (const int128 *)(in + 48));
xor2(&xmm11, (const int128 *)(in + 64));
xor2(&xmm15, (const int128 *)(in + 80));
xor2(&xmm10, (const int128 *)(in + 96));
xor2(&xmm13, (const int128 *)(in + 112));
*(int128 *) (outp + 0) = xmm8;
*(int128 *) (outp + 16) = xmm9;
*(int128 *) (outp + 32) = xmm12;
*(int128 *) (outp + 48) = xmm14;
*(int128 *) (outp + 64) = xmm11;
*(int128 *) (outp + 80) = xmm15;
*(int128 *) (outp + 96) = xmm10;
*(int128 *) (outp + 112) = xmm13;
*(int128 *) (out + 0) = xmm8;
*(int128 *) (out + 16) = xmm9;
*(int128 *) (out + 32) = xmm12;
*(int128 *) (out + 48) = xmm14;
*(int128 *) (out + 64) = xmm11;
*(int128 *) (out + 80) = xmm15;
*(int128 *) (out + 96) = xmm10;
*(int128 *) (out + 112) = xmm13;
len -= 128;
inp += 128;
outp += 128;
in += 128;
out += 128;
goto enc_block;
@@ -141,12 +141,12 @@ int crypto_stream_xor_afternm(unsigned char *outp, const unsigned char *inp, uns
if(lensav == 0) goto end;
b = blp[0]; /* clang false positive */
b ^= *(const unsigned char *)(inp + 0);
*(unsigned char *)(outp + 0) = b;
b ^= *(const unsigned char *)(in + 0);
*(unsigned char *)(out + 0) = b;
blp += 1;
inp +=1;
outp +=1;
in +=1;
out +=1;
lensav -= 1;
goto bytes;
@@ -157,23 +157,23 @@ int crypto_stream_xor_afternm(unsigned char *outp, const unsigned char *inp, uns
tmp += 8;
store32_bigendian(np + 12, tmp);
xor2(&xmm8, (const int128 *)(inp + 0));
xor2(&xmm9, (const int128 *)(inp + 16));
xor2(&xmm12, (const int128 *)(inp + 32));
xor2(&xmm14, (const int128 *)(inp + 48));
xor2(&xmm11, (const int128 *)(inp + 64));
xor2(&xmm15, (const int128 *)(inp + 80));
xor2(&xmm10, (const int128 *)(inp + 96));
xor2(&xmm13, (const int128 *)(inp + 112));
xor2(&xmm8, (const int128 *)(in + 0));
xor2(&xmm9, (const int128 *)(in + 16));
xor2(&xmm12, (const int128 *)(in + 32));
xor2(&xmm14, (const int128 *)(in + 48));
xor2(&xmm11, (const int128 *)(in + 64));
xor2(&xmm15, (const int128 *)(in + 80));
xor2(&xmm10, (const int128 *)(in + 96));
xor2(&xmm13, (const int128 *)(in + 112));
*(int128 *) (outp + 0) = xmm8;
*(int128 *) (outp + 16) = xmm9;
*(int128 *) (outp + 32) = xmm12;
*(int128 *) (outp + 48) = xmm14;
*(int128 *) (outp + 64) = xmm11;
*(int128 *) (outp + 80) = xmm15;
*(int128 *) (outp + 96) = xmm10;
*(int128 *) (outp + 112) = xmm13;
*(int128 *) (out + 0) = xmm8;
*(int128 *) (out + 16) = xmm9;
*(int128 *) (out + 32) = xmm12;
*(int128 *) (out + 48) = xmm14;
*(int128 *) (out + 64) = xmm11;
*(int128 *) (out + 80) = xmm15;
*(int128 *) (out + 96) = xmm10;
*(int128 *) (out + 112) = xmm13;
end:
return 0;
@@ -186,30 +186,30 @@ crypto_stream_beforenm(unsigned char *c, const unsigned char *k)
}
int
crypto_stream_afternm(unsigned char *outp, unsigned long long len,
const unsigned char *noncep, const unsigned char *c)
crypto_stream_afternm(unsigned char *out, unsigned long long len,
const unsigned char *nonce, const unsigned char *c)
{
ECRYPT_ctx * const ctx = (ECRYPT_ctx *) c;
unsigned long long i;
ECRYPT_ivsetup(ctx, noncep);
ECRYPT_ivsetup(ctx, nonce);
for (i = 0U; i < len; ++i) {
outp[i] = 0U;
out[i] = 0U;
}
ECRYPT_encrypt_bytes(ctx, (u8 *) outp, (u8 *) outp, len);
ECRYPT_encrypt_bytes(ctx, (u8 *) out, (u8 *) out, len);
return 0;
}
int
crypto_stream_xor_afternm(unsigned char *outp, const unsigned char *inp,
unsigned long long len, const unsigned char *noncep,
crypto_stream_xor_afternm(unsigned char *out, const unsigned char *in,
unsigned long long len, const unsigned char *nonce,
const unsigned char *c)
{
ECRYPT_ctx * const ctx = (ECRYPT_ctx *) c;
ECRYPT_ivsetup(ctx, noncep);
ECRYPT_encrypt_bytes(ctx, (const u8 *) inp, (u8 *) outp, len);
ECRYPT_ivsetup(ctx, nonce);
ECRYPT_encrypt_bytes(ctx, (const u8 *) in, (u8 *) out, len);
return 0;
}
@@ -30,10 +30,16 @@ SODIUM_EXPORT
const char * crypto_auth_hmacsha256_primitive(void);
SODIUM_EXPORT
int crypto_auth_hmacsha256(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
int crypto_auth_hmacsha256(unsigned char *out,
const unsigned char *in,
unsigned long long inlen,
const unsigned char *k);
SODIUM_EXPORT
int crypto_auth_hmacsha256_verify(const unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
int crypto_auth_hmacsha256_verify(const unsigned char *h,
const unsigned char *in,
unsigned long long inlen,
const unsigned char *k);
SODIUM_EXPORT
int crypto_auth_hmacsha256_init(crypto_auth_hmacsha256_state *state,
@@ -30,10 +30,16 @@ SODIUM_EXPORT
const char * crypto_auth_hmacsha512_primitive(void);
SODIUM_EXPORT
int crypto_auth_hmacsha512(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
int crypto_auth_hmacsha512(unsigned char *out,
const unsigned char *in,
unsigned long long inlen,
const unsigned char *k);
SODIUM_EXPORT
int crypto_auth_hmacsha512_verify(const unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
int crypto_auth_hmacsha512_verify(const unsigned char *h,
const unsigned char *in,
unsigned long long inlen,
const unsigned char *k);
SODIUM_EXPORT
int crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state,
@@ -27,10 +27,14 @@ SODIUM_EXPORT
const char * crypto_auth_hmacsha512256_primitive(void);
SODIUM_EXPORT
int crypto_auth_hmacsha512256(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
int crypto_auth_hmacsha512256(unsigned char *out, const unsigned char *in,
unsigned long long inlen,const unsigned char *k);
SODIUM_EXPORT
int crypto_auth_hmacsha512256_verify(const unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
int crypto_auth_hmacsha512256_verify(const unsigned char *h,
const unsigned char *in,
unsigned long long inlen,
const unsigned char *k);
SODIUM_EXPORT
int crypto_auth_hmacsha512256_init(crypto_auth_hmacsha512256_state *state,
@@ -44,22 +44,42 @@ SODIUM_EXPORT
const char * crypto_box_curve25519xsalsa20poly1305_primitive(void);
SODIUM_EXPORT
int crypto_box_curve25519xsalsa20poly1305(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *,const unsigned char *);
int crypto_box_curve25519xsalsa20poly1305(unsigned char *c,
const unsigned char *m,
unsigned long long mlen,
const unsigned char *n,
const unsigned char *pk,
const unsigned char *sk);
SODIUM_EXPORT
int crypto_box_curve25519xsalsa20poly1305_open(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *,const unsigned char *);
int crypto_box_curve25519xsalsa20poly1305_open(unsigned char *m,
const unsigned char *c,
unsigned long long clen,
const unsigned char *n,
const unsigned char *pk,
const unsigned char *sk);
SODIUM_EXPORT
int crypto_box_curve25519xsalsa20poly1305_keypair(unsigned char *,unsigned char *);
int crypto_box_curve25519xsalsa20poly1305_keypair(unsigned char *pk, unsigned char *sk);
SODIUM_EXPORT
int crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *,const unsigned char *,const unsigned char *);
int crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *k,
const unsigned char *pk,
const unsigned char *sk);
SODIUM_EXPORT
int crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char *c,
const unsigned char *m,
unsigned long long mlen,
const unsigned char *n,
const unsigned char *k);
SODIUM_EXPORT
int crypto_box_curve25519xsalsa20poly1305_open_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_box_curve25519xsalsa20poly1305_open_afternm(unsigned char *m,
const unsigned char *c,
unsigned long long clen,
const unsigned char *n,
const unsigned char *k);
#ifdef __cplusplus
}
@@ -29,7 +29,8 @@ SODIUM_EXPORT
const char * crypto_core_hsalsa20_primitive(void);
SODIUM_EXPORT
int crypto_core_hsalsa20(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
int crypto_core_hsalsa20(unsigned char *out, const unsigned char *in,
const unsigned char *k, const unsigned char *c);
#ifdef __cplusplus
}
@@ -29,7 +29,8 @@ SODIUM_EXPORT
const char * crypto_core_salsa20_primitive(void);
SODIUM_EXPORT
int crypto_core_salsa20(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
int crypto_core_salsa20(unsigned char *out, const unsigned char *in,
const unsigned char *k, const unsigned char *c);
#ifdef __cplusplus
}
@@ -29,7 +29,8 @@ SODIUM_EXPORT
const char * crypto_core_salsa2012_primitive(void);
SODIUM_EXPORT
int crypto_core_salsa2012(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
int crypto_core_salsa2012(unsigned char *out, const unsigned char *in,
const unsigned char *k, const unsigned char *c);
#ifdef __cplusplus
}
@@ -29,7 +29,8 @@ SODIUM_EXPORT
const char * crypto_core_salsa208_primitive(void);
SODIUM_EXPORT
int crypto_core_salsa208(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
int crypto_core_salsa208(unsigned char *out, const unsigned char *in,
const unsigned char *k, const unsigned char *c);
#ifdef __cplusplus
}
@@ -30,7 +30,8 @@ SODIUM_EXPORT
const char * crypto_hash_sha256_primitive(void);
SODIUM_EXPORT
int crypto_hash_sha256(unsigned char *,const unsigned char *,unsigned long long);
int crypto_hash_sha256(unsigned char *out, const unsigned char *in,
unsigned long long inlen);
SODIUM_EXPORT
int crypto_hash_sha256_init(crypto_hash_sha256_state *state);
@@ -30,7 +30,8 @@ SODIUM_EXPORT
const char * crypto_hash_sha512_primitive(void);
SODIUM_EXPORT
int crypto_hash_sha512(unsigned char *,const unsigned char *,unsigned long long);
int crypto_hash_sha512(unsigned char *out, const unsigned char *in,
unsigned long long inlen);
SODIUM_EXPORT
int crypto_hash_sha512_init(crypto_hash_sha512_state *state);
@@ -18,10 +18,11 @@ SODIUM_EXPORT
size_t crypto_scalarmult_curve25519_scalarbytes(void);
SODIUM_EXPORT
int crypto_scalarmult_curve25519(unsigned char *,const unsigned char *,const unsigned char *);
int crypto_scalarmult_curve25519(unsigned char *q, const unsigned char *n,
const unsigned char *p);
SODIUM_EXPORT
int crypto_scalarmult_curve25519_base(unsigned char *,const unsigned char *);
int crypto_scalarmult_curve25519_base(unsigned char *q, const unsigned char *n);
#ifdef __cplusplus
}
@@ -36,10 +36,18 @@ SODIUM_EXPORT
const char * crypto_secretbox_xsalsa20poly1305_primitive(void);
SODIUM_EXPORT
int crypto_secretbox_xsalsa20poly1305(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_secretbox_xsalsa20poly1305(unsigned char *c,
const unsigned char *m,
unsigned long long mlen,
const unsigned char *n,
const unsigned char *k);
SODIUM_EXPORT
int crypto_secretbox_xsalsa20poly1305_open(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_secretbox_xsalsa20poly1305_open(unsigned char *m,
const unsigned char *c,
unsigned long long clen,
const unsigned char *n,
const unsigned char *k);
#ifdef __cplusplus
}
@@ -24,7 +24,8 @@ SODIUM_EXPORT
const char * crypto_shorthash_siphash24_primitive(void);
SODIUM_EXPORT
int crypto_shorthash_siphash24(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
int crypto_shorthash_siphash24(unsigned char *out, const unsigned char *in,
unsigned long long inlen, const unsigned char *k);
#ifdef __cplusplus
}
@@ -32,16 +32,21 @@ SODIUM_EXPORT
const char * crypto_sign_ed25519_primitive(void);
SODIUM_EXPORT
int crypto_sign_ed25519(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *);
int crypto_sign_ed25519(unsigned char *sm, unsigned long long *smlen,
const unsigned char *m, unsigned long long mlen,
const unsigned char *sk);
SODIUM_EXPORT
int crypto_sign_ed25519_open(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *);
int crypto_sign_ed25519_open(unsigned char *m, unsigned long long *mlen,
const unsigned char *sm, unsigned long long smlen,
const unsigned char *pk);
SODIUM_EXPORT
int crypto_sign_ed25519_keypair(unsigned char *,unsigned char *);
int crypto_sign_ed25519_keypair(unsigned char *pk, unsigned char *sk);
SODIUM_EXPORT
int crypto_sign_ed25519_seed_keypair(unsigned char *,unsigned char *,const unsigned char *);
int crypto_sign_ed25519_seed_keypair(unsigned char *pk, unsigned char *sk,
const unsigned char *seed);
#ifdef __cplusplus
}
@@ -28,13 +28,22 @@ SODIUM_EXPORT
const char * crypto_sign_edwards25519sha512batch_primitive(void);
SODIUM_EXPORT
int crypto_sign_edwards25519sha512batch(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *);
int crypto_sign_edwards25519sha512batch(unsigned char *sm,
unsigned long long *smlen,
const unsigned char *m,
unsigned long long mlen,
const unsigned char *sk);
SODIUM_EXPORT
int crypto_sign_edwards25519sha512batch_open(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *);
int crypto_sign_edwards25519sha512batch_open(unsigned char *m,
unsigned long long *mlen,
const unsigned char *sm,
unsigned long long smlen,
const unsigned char *pk);
SODIUM_EXPORT
int crypto_sign_edwards25519sha512batch_keypair(unsigned char *,unsigned char *);
int crypto_sign_edwards25519sha512batch_keypair(unsigned char *pk,
unsigned char *sk);
#ifdef __cplusplus
}
@@ -36,19 +36,26 @@ SODIUM_EXPORT
const char * crypto_stream_aes128ctr_primitive(void);
SODIUM_EXPORT
int crypto_stream_aes128ctr(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_aes128ctr(unsigned char *out, unsigned long long outlen,
const unsigned char *n, const unsigned char *k);
SODIUM_EXPORT
int crypto_stream_aes128ctr_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_aes128ctr_xor(unsigned char *out, const unsigned char *in,
unsigned long long inlen, const unsigned char *n,
const unsigned char *k);
SODIUM_EXPORT
int crypto_stream_aes128ctr_beforenm(unsigned char *,const unsigned char *);
int crypto_stream_aes128ctr_beforenm(unsigned char *c, const unsigned char *k);
SODIUM_EXPORT
int crypto_stream_aes128ctr_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_aes128ctr_afternm(unsigned char *out, unsigned long long len,
const unsigned char *nonce, const unsigned char *c);
SODIUM_EXPORT
int crypto_stream_aes128ctr_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_aes128ctr_xor_afternm(unsigned char *out, const unsigned char *in,
unsigned long long len,
const unsigned char *nonce,
const unsigned char *c);
#ifdef __cplusplus
}
@@ -37,19 +37,27 @@ SODIUM_EXPORT
const char * crypto_stream_aes256estream_primitive(void);
SODIUM_EXPORT
int crypto_stream_aes256estream(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_aes256estream(unsigned char *out, unsigned long long len,
const unsigned char *nonce, const unsigned char *c);
SODIUM_EXPORT
int crypto_stream_aes256estream_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_aes256estream_xor(unsigned char *out, const unsigned char *in,
unsigned long long inlen, const unsigned char *n,
const unsigned char *k);
SODIUM_EXPORT
int crypto_stream_aes256estream_beforenm(unsigned char *,const unsigned char *);
int crypto_stream_aes256estream_beforenm(unsigned char *c, const unsigned char *k);
SODIUM_EXPORT
int crypto_stream_aes256estream_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_aes256estream_afternm(unsigned char *out, unsigned long long len,
const unsigned char *nonce,
const unsigned char *c);
SODIUM_EXPORT
int crypto_stream_aes256estream_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_aes256estream_xor_afternm(unsigned char *out, const unsigned char *in,
unsigned long long len,
const unsigned char *nonce,
const unsigned char *c);
#ifdef __cplusplus
}
@@ -31,10 +31,13 @@ SODIUM_EXPORT
const char * crypto_stream_salsa20_primitive(void);
SODIUM_EXPORT
int crypto_stream_salsa20(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_salsa20(unsigned char *c, unsigned long long clen,
const unsigned char *n, const unsigned char *k);
SODIUM_EXPORT
int crypto_stream_salsa20_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_salsa20_xor(unsigned char *c, const unsigned char *m,
unsigned long long mlen, const unsigned char *n,
const unsigned char *k);
#ifdef __cplusplus
}
@@ -31,10 +31,13 @@ SODIUM_EXPORT
const char * crypto_stream_salsa2012_primitive(void);
SODIUM_EXPORT
int crypto_stream_salsa2012(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_salsa2012(unsigned char *c, unsigned long long clen,
const unsigned char *n, const unsigned char *k);
SODIUM_EXPORT
int crypto_stream_salsa2012_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_salsa2012_xor(unsigned char *c, const unsigned char *m,
unsigned long long mlen, const unsigned char *n,
const unsigned char *k);
#ifdef __cplusplus
}
@@ -31,10 +31,13 @@ SODIUM_EXPORT
const char * crypto_stream_salsa208_primitive(void);
SODIUM_EXPORT
int crypto_stream_salsa208(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_salsa208(unsigned char *c, unsigned long long clen,
const unsigned char *n, const unsigned char *k);
SODIUM_EXPORT
int crypto_stream_salsa208_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_salsa208_xor(unsigned char *c, const unsigned char *m,
unsigned long long mlen, const unsigned char *n,
const unsigned char *k);
#ifdef __cplusplus
}
@@ -32,10 +32,13 @@ SODIUM_EXPORT
const char * crypto_stream_xsalsa20_primitive(void);
SODIUM_EXPORT
int crypto_stream_xsalsa20(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_xsalsa20(unsigned char *c, unsigned long long clen,
const unsigned char *n, const unsigned char *k);
SODIUM_EXPORT
int crypto_stream_xsalsa20_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
int crypto_stream_xsalsa20_xor(unsigned char *c, const unsigned char *m,
unsigned long long mlen, const unsigned char *n,
const unsigned char *k);
#ifdef __cplusplus
}