QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-27 04:07:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename arguments for consistency

Browse Source
This commit is contained in:
Frank Denis
2015-05-09 12:37:27 +02:00
parent e7ec16a35d
commit a593e37983
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_box/crypto_box_seal.c
+11 -11
View File
@@ -20,8 +20,8 @@ _crypto_box_seal_nonce(unsigned char *nonce,
}
int
crypto_box_seal(unsigned char *out, const unsigned char *in,
unsigned long long inlen, const unsigned char *pk)
crypto_box_seal(unsigned char *c, const unsigned char *m,
unsigned long long mlen, const unsigned char *pk)
{
unsigned char nonce[crypto_box_NONCEBYTES];
unsigned char epk[crypto_box_PUBLICKEYBYTES];
@@ -31,9 +31,9 @@ crypto_box_seal(unsigned char *out, const unsigned char *in,
if (crypto_box_keypair(epk, esk) != 0) {
return -1;
}
memcpy(out, epk, crypto_box_PUBLICKEYBYTES);
memcpy(c, epk, crypto_box_PUBLICKEYBYTES);
_crypto_box_seal_nonce(nonce, epk, pk);
ret = crypto_box_easy(out + crypto_box_PUBLICKEYBYTES, in, inlen,
ret = crypto_box_easy(c + crypto_box_PUBLICKEYBYTES, m, mlen,
nonce, pk, esk);
sodium_memzero(esk, sizeof esk);
@@ -41,21 +41,21 @@ crypto_box_seal(unsigned char *out, const unsigned char *in,
}
int
crypto_box_seal_open(unsigned char *out, const unsigned char *in,
unsigned long long inlen,
crypto_box_seal_open(unsigned char *m, const unsigned char *c,
unsigned long long clen,
const unsigned char *pk, const unsigned char *sk)
{
unsigned char nonce[crypto_box_NONCEBYTES];
if (inlen < crypto_box_SEALBYTES) {
if (clen < crypto_box_SEALBYTES) {
return -1;
}
_crypto_box_seal_nonce(nonce, in, pk);
_crypto_box_seal_nonce(nonce, c, pk);
(void) sizeof(int[crypto_box_PUBLICKEYBYTES < crypto_box_SEALBYTES ? 1 : -1]);
return crypto_box_open_easy(out, in + crypto_box_PUBLICKEYBYTES,
inlen - crypto_box_PUBLICKEYBYTES,
nonce, in, sk);
return crypto_box_open_easy(m, c + crypto_box_PUBLICKEYBYTES,
clen - crypto_box_PUBLICKEYBYTES,
nonce, c, sk);
}
size_t
src/libsodium/include/sodium/crypto_box.h
+4 -4
View File
@@ -113,12 +113,12 @@ SODIUM_EXPORT
size_t crypto_box_sealbytes(void);
SODIUM_EXPORT
int crypto_box_seal(unsigned char *out, const unsigned char *in,
unsigned long long inlen, const unsigned char *pk);
int crypto_box_seal(unsigned char *c, const unsigned char *m,
unsigned long long mlen, const unsigned char *pk);
SODIUM_EXPORT
int crypto_box_seal_open(unsigned char *out, const unsigned char *in,
unsigned long long inlen,
int crypto_box_seal_open(unsigned char *m, const unsigned char *c,
unsigned long long clen,
const unsigned char *pk, const unsigned char *sk);
/* -- NaCl compatibility interface ; Requires padding -- */