From 54915743f4f5244cc3e91e94cb6dc6e1731278a6 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 11 Feb 2016 15:19:58 +0100 Subject: [PATCH] Define ZEROBYTES as BOXZEROBYTES + MACBYTES ZEROBYTES and BOXZEROBYTES are rarely used compared to MACBYTES, so it makes more sense to define MACBYTES and define the compat macros based on it that the other way round. --- .../sodium/crypto_box_curve25519xsalsa20poly1305.h | 12 ++++++------ .../sodium/crypto_secretbox_xsalsa20poly1305.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h index e9c38d6d..b18be201 100644 --- a/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h +++ b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h @@ -31,19 +31,19 @@ size_t crypto_box_curve25519xsalsa20poly1305_beforenmbytes(void); SODIUM_EXPORT size_t crypto_box_curve25519xsalsa20poly1305_noncebytes(void); -#define crypto_box_curve25519xsalsa20poly1305_ZEROBYTES 32U +#define crypto_box_curve25519xsalsa20poly1305_MACBYTES 16U SODIUM_EXPORT -size_t crypto_box_curve25519xsalsa20poly1305_zerobytes(void); +size_t crypto_box_curve25519xsalsa20poly1305_macbytes(void); #define crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES 16U SODIUM_EXPORT size_t crypto_box_curve25519xsalsa20poly1305_boxzerobytes(void); -#define crypto_box_curve25519xsalsa20poly1305_MACBYTES \ - (crypto_box_curve25519xsalsa20poly1305_ZEROBYTES - \ - crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES) +#define crypto_box_curve25519xsalsa20poly1305_ZEROBYTES \ + (crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES + \ + crypto_box_curve25519xsalsa20poly1305_MACBYTES) SODIUM_EXPORT -size_t crypto_box_curve25519xsalsa20poly1305_macbytes(void); +size_t crypto_box_curve25519xsalsa20poly1305_zerobytes(void); SODIUM_EXPORT int crypto_box_curve25519xsalsa20poly1305(unsigned char *c, diff --git a/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h index 4afc2cdf..a80f5b50 100644 --- a/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h +++ b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h @@ -19,19 +19,19 @@ size_t crypto_secretbox_xsalsa20poly1305_keybytes(void); SODIUM_EXPORT size_t crypto_secretbox_xsalsa20poly1305_noncebytes(void); -#define crypto_secretbox_xsalsa20poly1305_ZEROBYTES 32U +#define crypto_secretbox_xsalsa20poly1305_MACBYTES 16U SODIUM_EXPORT -size_t crypto_secretbox_xsalsa20poly1305_zerobytes(void); +size_t crypto_secretbox_xsalsa20poly1305_macbytes(void); #define crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES 16U SODIUM_EXPORT size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes(void); -#define crypto_secretbox_xsalsa20poly1305_MACBYTES \ - (crypto_secretbox_xsalsa20poly1305_ZEROBYTES - \ - crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES) +#define crypto_secretbox_xsalsa20poly1305_ZEROBYTES \ + (crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES + \ + crypto_secretbox_xsalsa20poly1305_MACBYTES) SODIUM_EXPORT -size_t crypto_secretbox_xsalsa20poly1305_macbytes(void); +size_t crypto_secretbox_xsalsa20poly1305_zerobytes(void); SODIUM_EXPORT int crypto_secretbox_xsalsa20poly1305(unsigned char *c,