From 91233a014320374c8b3c9bbde27bedaf389aaa00 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 19 Sep 2017 23:56:12 +0200 Subject: [PATCH] Tag salsa208 as deprecated --- .../include/sodium/crypto_core_salsa208.h | 12 +++++++---- .../include/sodium/crypto_stream_salsa208.h | 20 ++++++++++++------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/libsodium/include/sodium/crypto_core_salsa208.h b/src/libsodium/include/sodium/crypto_core_salsa208.h index 3c13efa4..876bda89 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa208.h +++ b/src/libsodium/include/sodium/crypto_core_salsa208.h @@ -10,19 +10,23 @@ extern "C" { #define crypto_core_salsa208_OUTPUTBYTES 64U SODIUM_EXPORT -size_t crypto_core_salsa208_outputbytes(void); +size_t crypto_core_salsa208_outputbytes(void) + __attribute__ ((deprecated)); #define crypto_core_salsa208_INPUTBYTES 16U SODIUM_EXPORT -size_t crypto_core_salsa208_inputbytes(void); +size_t crypto_core_salsa208_inputbytes(void) + __attribute__ ((deprecated)); #define crypto_core_salsa208_KEYBYTES 32U SODIUM_EXPORT -size_t crypto_core_salsa208_keybytes(void); +size_t crypto_core_salsa208_keybytes(void) + __attribute__ ((deprecated)); #define crypto_core_salsa208_CONSTBYTES 16U SODIUM_EXPORT -size_t crypto_core_salsa208_constbytes(void); +size_t crypto_core_salsa208_constbytes(void) + __attribute__ ((deprecated)); SODIUM_EXPORT int crypto_core_salsa208(unsigned char *out, const unsigned char *in, diff --git a/src/libsodium/include/sodium/crypto_stream_salsa208.h b/src/libsodium/include/sodium/crypto_stream_salsa208.h index b7bc0d96..653f6504 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa208.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa208.h @@ -21,27 +21,33 @@ extern "C" { #define crypto_stream_salsa208_KEYBYTES 32U SODIUM_EXPORT -size_t crypto_stream_salsa208_keybytes(void); +size_t crypto_stream_salsa208_keybytes(void) + __attribute__ ((deprecated)); #define crypto_stream_salsa208_NONCEBYTES 8U SODIUM_EXPORT -size_t crypto_stream_salsa208_noncebytes(void); +size_t crypto_stream_salsa208_noncebytes(void) + __attribute__ ((deprecated)); #define crypto_stream_salsa208_MESSAGEBYTES_MAX SODIUM_SIZE_MAX -SODIUM_EXPORT -size_t crypto_stream_salsa208_messagebytes_max(void); + SODIUM_EXPORT +size_t crypto_stream_salsa208_messagebytes_max(void) + __attribute__ ((deprecated)); SODIUM_EXPORT int crypto_stream_salsa208(unsigned char *c, unsigned long long clen, - const unsigned char *n, const unsigned char *k); + const unsigned char *n, const unsigned char *k) + __attribute__ ((deprecated)); SODIUM_EXPORT int crypto_stream_salsa208_xor(unsigned char *c, const unsigned char *m, unsigned long long mlen, const unsigned char *n, - const unsigned char *k); + const unsigned char *k) + __attribute__ ((deprecated)); SODIUM_EXPORT -void crypto_stream_salsa208_keygen(unsigned char k[crypto_stream_salsa208_KEYBYTES]); +void crypto_stream_salsa208_keygen(unsigned char k[crypto_stream_salsa208_KEYBYTES]) + __attribute__ ((deprecated)); #ifdef __cplusplus }