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

crypto_(secret)box_easy_detached() -> crypto_(secret)box_detached()

Browse Source
This commit is contained in:
Frank Denis
2014-06-27 18:29:03 -07:00
parent 9d8b184c1a
commit 768b78b711
8 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packaging/nuget/package.config
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- These values are populated into the package.gsl templates by package.bat. -->
<!-- The target attribute controls path and file name only, id controls package naming. -->
<package id="libsodium_vc120" target="libsodium" version = "0.5.1.0" pathversion="0_5_0_0" platformtoolset="v120" />
<package id="libsodium_vc120" target="libsodium" version = "0.6.0.0" pathversion="0_5_0_0" platformtoolset="v120" />
packaging/nuget/package.nuspec
+1 -1
View File
@@ -7,7 +7,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
<metadata minClientVersion="2.5">
<id>libsodium_vc120</id>
<version>0.5.1.0</version>
<version>0.6.0.0</version>
<title>libsodium_vc120</title>
<authors>libsodium contributors</authors>
<owners>Eric Voskuil</owners>
src/libsodium/crypto_box/crypto_box_easy.c
+13 -13
View File
@@ -4,10 +4,10 @@
#include "utils.h"
int
crypto_box_easy_detached(unsigned char *c, unsigned char *mac,
const unsigned char *m, unsigned long long mlen,
const unsigned char *n, const unsigned char *pk,
const unsigned char *sk)
crypto_box_detached(unsigned char *c, unsigned char *mac,
const unsigned char *m, unsigned long long mlen,
const unsigned char *n, const unsigned char *pk,
const unsigned char *sk)
{
unsigned char k[crypto_box_BEFORENMBYTES];
int ret;
@@ -15,7 +15,7 @@ crypto_box_easy_detached(unsigned char *c, unsigned char *mac,
(void) sizeof(int[crypto_box_BEFORENMBYTES >=
crypto_secretbox_KEYBYTES ? 1 : -1]);
crypto_box_beforenm(k, pk, sk);
ret = crypto_secretbox_easy_detached(c, mac, m, mlen, n, k);
ret = crypto_secretbox_detached(c, mac, m, mlen, n, k);
sodium_memzero(k, sizeof k);
return ret;
@@ -26,13 +26,13 @@ crypto_box_easy(unsigned char *c, const unsigned char *m,
unsigned long long mlen, const unsigned char *n,
const unsigned char *pk, const unsigned char *sk)
{
return crypto_box_easy_detached(c + crypto_box_MACBYTES, c, m, mlen, n,
pk, sk);
return crypto_box_detached(c + crypto_box_MACBYTES, c, m, mlen, n,
pk, sk);
}
int
crypto_box_open_easy_detached(unsigned char *m, const unsigned char *c,
const unsigned char *mac,
crypto_box_open_detached(unsigned char *m, const unsigned char *c,
const unsigned char *mac,
unsigned long long clen, const unsigned char *n,
const unsigned char *pk, const unsigned char *sk)
{
@@ -40,7 +40,7 @@ crypto_box_open_easy_detached(unsigned char *m, const unsigned char *c,
int ret;
crypto_box_beforenm(k, pk, sk);
ret = crypto_secretbox_open_easy_detached(m, c, mac, clen, n, k);
ret = crypto_secretbox_open_detached(m, c, mac, clen, n, k);
sodium_memzero(k, sizeof k);
return ret;
@@ -54,7 +54,7 @@ crypto_box_open_easy(unsigned char *m, const unsigned char *c,
if (clen < crypto_box_MACBYTES) {
return -1;
}
return crypto_box_open_easy_detached(m, c + crypto_box_MACBYTES, c,
clen - crypto_box_MACBYTES,
n, pk, sk);
return crypto_box_open_detached(m, c + crypto_box_MACBYTES, c,
clen - crypto_box_MACBYTES,
n, pk, sk);
}
src/libsodium/crypto_secretbox/crypto_secretbox_easy.c
+18 -18
View File
@@ -16,10 +16,10 @@ static const unsigned char sigma[16] = {
};
int
crypto_secretbox_easy_detached(unsigned char *c, unsigned char *mac,
const unsigned char *m,
unsigned long long mlen, const unsigned char *n,
const unsigned char *k)
crypto_secretbox_detached(unsigned char *c, unsigned char *mac,
const unsigned char *m,
unsigned long long mlen, const unsigned char *n,
const unsigned char *k)
{
crypto_onetimeauth_poly1305_state state;
unsigned char block0[64U];
@@ -68,21 +68,21 @@ crypto_secretbox_easy(unsigned char *c, const unsigned char *m,
unsigned long long mlen, const unsigned char *n,
const unsigned char *k)
{
return crypto_secretbox_easy_detached(c + crypto_secretbox_MACBYTES,
c, m, mlen, n, k);
return crypto_secretbox_detached(c + crypto_secretbox_MACBYTES,
c, m, mlen, n, k);
}
int
crypto_secretbox_open_easy_detached(unsigned char *m, const unsigned char *c,
const unsigned char *mac,
unsigned long long clen,
const unsigned char *n,
const unsigned char *k)
crypto_secretbox_open_detached(unsigned char *m, const unsigned char *c,
const unsigned char *mac,
unsigned long long clen,
const unsigned char *n,
const unsigned char *k)
{
unsigned char block0[64U];
unsigned char subkey[crypto_stream_salsa20_KEYBYTES];
unsigned long long i;
unsigned long long mlen0;
unsigned char block0[64U];
unsigned char subkey[crypto_stream_salsa20_KEYBYTES];
unsigned long long i;
unsigned long long mlen0;
crypto_core_hsalsa20(subkey, n, k, sigma);
crypto_stream_salsa20(block0, crypto_stream_salsa20_KEYBYTES,
@@ -119,7 +119,7 @@ crypto_secretbox_open_easy(unsigned char *m, const unsigned char *c,
if (clen < crypto_secretbox_MACBYTES) {
return -1;
}
return crypto_secretbox_open_easy_detached
(m, c + crypto_secretbox_MACBYTES, c,
clen - crypto_secretbox_MACBYTES, n, k);
return crypto_secretbox_open_detached(m, c + crypto_secretbox_MACBYTES, c,
clen - crypto_secretbox_MACBYTES,
n, k);
}
src/libsodium/include/sodium/crypto_box.h
+10 -10
View File
@@ -98,18 +98,18 @@ int crypto_box_open_easy(unsigned char *m, const unsigned char *c,
const unsigned char *pk, const unsigned char *sk);
SODIUM_EXPORT
int crypto_box_easy_detached(unsigned char *c, unsigned char *mac,
const unsigned char *m, unsigned long long mlen,
const unsigned char *n, const unsigned char *pk,
const unsigned char *sk);
int crypto_box_detached(unsigned char *c, unsigned char *mac,
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_open_easy_detached(unsigned char *m, const unsigned char *c,
const unsigned char *mac,
unsigned long long clen,
const unsigned char *n,
const unsigned char *pk,
const unsigned char *sk);
int crypto_box_open_detached(unsigned char *m, const unsigned char *c,
const unsigned char *mac,
unsigned long long clen,
const unsigned char *n,
const unsigned char *pk,
const unsigned char *sk);
#ifdef __cplusplus
}
#endif
src/libsodium/include/sodium/crypto_secretbox.h
+11 -11
View File
@@ -58,19 +58,19 @@ int crypto_secretbox_open_easy(unsigned char *m, const unsigned char *c,
const unsigned char *k);
SODIUM_EXPORT
int crypto_secretbox_easy_detached(unsigned char *c, unsigned char *mac,
const unsigned char *m,
unsigned long long mlen,
const unsigned char *n,
const unsigned char *k);
int crypto_secretbox_detached(unsigned char *c, unsigned char *mac,
const unsigned char *m,
unsigned long long mlen,
const unsigned char *n,
const unsigned char *k);
SODIUM_EXPORT
int crypto_secretbox_open_easy_detached(unsigned char *m,
const unsigned char *c,
const unsigned char *mac,
unsigned long long clen,
const unsigned char *n,
const unsigned char *k);
int crypto_secretbox_open_detached(unsigned char *m,
const unsigned char *c,
const unsigned char *mac,
unsigned long long clen,
const unsigned char *n,
const unsigned char *k);
#ifdef __cplusplus
}
#endif
test/default/secretbox_easy.c
+1 -1
View File
@@ -50,7 +50,7 @@ int main(void)
}
printf("\n");
crypto_secretbox_easy_detached(c, mac, m, 131, nonce, firstkey);
crypto_secretbox_detached(c, mac, m, 131, nonce, firstkey);
for (i = 0;i < crypto_secretbox_MACBYTES; ++i) {
printf(",0x%02x",(unsigned int) mac[i]);
if (i % 8 == 7) printf("\n");
test/default/secretbox_easy2.c
+2 -2
View File
@@ -24,8 +24,8 @@ int main(void)
nonce, k);
printf("%d\n", memcmp(m, m2, mlen));
crypto_secretbox_easy_detached(c, mac, m, mlen, nonce, k);
crypto_secretbox_open_easy_detached(m2, c, mac, mlen, nonce, k);
crypto_secretbox_detached(c, mac, m, mlen, nonce, k);
crypto_secretbox_open_detached(m2, c, mac, mlen, nonce, k);
printf("%d\n", memcmp(m, m2, mlen));
return 0;