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

Remove the non-IETF versions of crypto_aead_xchacha20poly1305

Browse Source
This commit is contained in:
Frank Denis
2017-01-13 19:24:48 +01:00
parent 43821d7756
commit 1686da3d3c
2 changed files with 0 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c
-129
View File
@@ -11,115 +11,6 @@
#include "private/common.h"
int
crypto_aead_xchacha20poly1305_encrypt_detached(unsigned char *c,
unsigned char *mac,
unsigned long long *maclen_p,
const unsigned char *m,
unsigned long long mlen,
const unsigned char *ad,
unsigned long long adlen,
const unsigned char *nsec,
const unsigned char *npub,
const unsigned char *k)
{
unsigned char k2[crypto_core_hchacha20_OUTPUTBYTES];
int ret;
crypto_core_hchacha20(k2, npub, k, NULL);
ret = crypto_aead_chacha20poly1305_encrypt_detached
(c, mac, maclen_p, m, mlen, ad, adlen, nsec,
npub + crypto_core_hchacha20_INPUTBYTES, k2);
sodium_memzero(k2, crypto_core_hchacha20_OUTPUTBYTES);
return ret;
}
int
crypto_aead_xchacha20poly1305_encrypt(unsigned char *c,
unsigned long long *clen_p,
const unsigned char *m,
unsigned long long mlen,
const unsigned char *ad,
unsigned long long adlen,
const unsigned char *nsec,
const unsigned char *npub,
const unsigned char *k)
{
unsigned long long clen = 0ULL;
int ret;
if (mlen > UINT64_MAX - crypto_aead_xchacha20poly1305_ABYTES) {
abort(); /* LCOV_EXCL_LINE */
}
ret = crypto_aead_xchacha20poly1305_encrypt_detached(c,
c + mlen, NULL,
m, mlen,
ad, adlen,
nsec, npub, k);
if (clen_p != NULL) {
if (ret == 0) {
clen = mlen + crypto_aead_xchacha20poly1305_ABYTES;
}
*clen_p = clen;
}
return ret;
}
int
crypto_aead_xchacha20poly1305_decrypt_detached(unsigned char *m,
unsigned char *nsec,
const unsigned char *c,
unsigned long long clen,
const unsigned char *mac,
const unsigned char *ad,
unsigned long long adlen,
const unsigned char *npub,
const unsigned char *k)
{
unsigned char k2[crypto_core_hchacha20_OUTPUTBYTES];
int ret;
crypto_core_hchacha20(k2, npub, k, NULL);
ret = crypto_aead_chacha20poly1305_decrypt_detached
(m, nsec, c, clen, mac, ad, adlen,
npub + crypto_core_hchacha20_INPUTBYTES, k2);
sodium_memzero(k2, crypto_core_hchacha20_OUTPUTBYTES);
return ret;
}
int
crypto_aead_xchacha20poly1305_decrypt(unsigned char *m,
unsigned long long *mlen_p,
unsigned char *nsec,
const unsigned char *c,
unsigned long long clen,
const unsigned char *ad,
unsigned long long adlen,
const unsigned char *npub,
const unsigned char *k)
{
unsigned long long mlen = 0ULL;
int ret = -1;
if (clen >= crypto_aead_xchacha20poly1305_ABYTES) {
ret = crypto_aead_xchacha20poly1305_decrypt_detached
(m, nsec,
c, clen - crypto_aead_xchacha20poly1305_ABYTES,
c + clen - crypto_aead_xchacha20poly1305_ABYTES,
ad, adlen, npub, k);
}
if (mlen_p != NULL) {
if (ret == 0) {
mlen = clen - crypto_aead_xchacha20poly1305_ABYTES;
}
*mlen_p = mlen;
}
return ret;
}
int
crypto_aead_xchacha20poly1305_ietf_encrypt_detached(unsigned char *c,
unsigned char *mac,
@@ -229,26 +120,6 @@ crypto_aead_xchacha20poly1305_ietf_decrypt(unsigned char *m,
return ret;
}
size_t
crypto_aead_xchacha20poly1305_keybytes(void) {
return crypto_aead_xchacha20poly1305_KEYBYTES;
}
size_t
crypto_aead_xchacha20poly1305_npubbytes(void) {
return crypto_aead_xchacha20poly1305_NPUBBYTES;
}
size_t
crypto_aead_xchacha20poly1305_nsecbytes(void) {
return crypto_aead_xchacha20poly1305_NSECBYTES;
}
size_t
crypto_aead_xchacha20poly1305_abytes(void) {
return crypto_aead_xchacha20poly1305_ABYTES;
}
size_t
crypto_aead_xchacha20poly1305_ietf_keybytes(void) {
return crypto_aead_xchacha20poly1305_ietf_KEYBYTES;
src/libsodium/include/sodium/crypto_aead_xchacha20poly1305.h
-63
View File
@@ -11,22 +11,6 @@
extern "C" {
#endif
#define crypto_aead_xchacha20poly1305_KEYBYTES 32U
SODIUM_EXPORT
size_t crypto_aead_xchacha20poly1305_keybytes(void);
#define crypto_aead_xchacha20poly1305_NSECBYTES 0U
SODIUM_EXPORT
size_t crypto_aead_xchacha20poly1305_nsecbytes(void);
#define crypto_aead_xchacha20poly1305_NPUBBYTES 24U
SODIUM_EXPORT
size_t crypto_aead_xchacha20poly1305_npubbytes(void);
#define crypto_aead_xchacha20poly1305_ABYTES 16U
SODIUM_EXPORT
size_t crypto_aead_xchacha20poly1305_abytes(void);
#define crypto_aead_xchacha20poly1305_ietf_KEYBYTES 32U
SODIUM_EXPORT
size_t crypto_aead_xchacha20poly1305_ietf_keybytes(void);
@@ -43,53 +27,6 @@ size_t crypto_aead_xchacha20poly1305_ietf_npubbytes(void);
SODIUM_EXPORT
size_t crypto_aead_xchacha20poly1305_ietf_abytes(void);
SODIUM_EXPORT
int crypto_aead_xchacha20poly1305_encrypt(unsigned char *c,
unsigned long long *clen_p,
const unsigned char *m,
unsigned long long mlen,
const unsigned char *ad,
unsigned long long adlen,
const unsigned char *nsec,
const unsigned char *npub,
const unsigned char *k);
SODIUM_EXPORT
int crypto_aead_xchacha20poly1305_decrypt(unsigned char *m,
unsigned long long *mlen_p,
unsigned char *nsec,
const unsigned char *c,
unsigned long long clen,
const unsigned char *ad,
unsigned long long adlen,
const unsigned char *npub,
const unsigned char *k)
__attribute__ ((warn_unused_result));
SODIUM_EXPORT
int crypto_aead_xchacha20poly1305_encrypt_detached(unsigned char *c,
unsigned char *mac,
unsigned long long *maclen_p,
const unsigned char *m,
unsigned long long mlen,
const unsigned char *ad,
unsigned long long adlen,
const unsigned char *nsec,
const unsigned char *npub,
const unsigned char *k);
SODIUM_EXPORT
int crypto_aead_xchacha20poly1305_decrypt_detached(unsigned char *m,
unsigned char *nsec,
const unsigned char *c,
unsigned long long clen,
const unsigned char *mac,
const unsigned char *ad,
unsigned long long adlen,
const unsigned char *npub,
const unsigned char *k)
__attribute__ ((warn_unused_result));
SODIUM_EXPORT
int crypto_aead_xchacha20poly1305_ietf_encrypt(unsigned char *c,
unsigned long long *clen_p,