From e53e0895e7b81951f378e604896e863cebd46977 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 16 Apr 2013 10:59:40 +0200 Subject: [PATCH] Remove *_implementation_ macros. They are identical for all implementations of a given primitive and it's bound to always be the case. We will eventually pick suitable implementations at run-time, so these won't make any sense. Remove implementation names/versions macros as well. These should be functions, not macros. --- src/libsodium/include/sodium/crypto_auth.h | 2 -- .../include/sodium/crypto_auth_hmacsha256.h | 11 ++------ .../sodium/crypto_auth_hmacsha512256.h | 11 ++------ src/libsodium/include/sodium/crypto_box.h | 4 +-- .../crypto_box_curve25519xsalsa20poly1305.h | 25 ++++++------------- .../include/sodium/crypto_core_hsalsa20.h | 17 +++---------- .../include/sodium/crypto_core_salsa20.h | 17 +++---------- .../include/sodium/crypto_core_salsa2012.h | 17 +++---------- .../include/sodium/crypto_core_salsa208.h | 17 +++---------- .../sodium/crypto_generichash_blake2b.h | 5 ---- src/libsodium/include/sodium/crypto_hash.h | 2 -- .../include/sodium/crypto_hash_sha256.h | 8 +----- .../include/sodium/crypto_hash_sha512.h | 8 +----- .../include/sodium/crypto_hashblocks_sha256.h | 11 ++------ .../include/sodium/crypto_hashblocks_sha512.h | 11 ++------ .../include/sodium/crypto_onetimeauth.h | 2 -- .../sodium/crypto_onetimeauth_poly1305.h | 14 ++++------- .../sodium/crypto_scalarmult_curve25519.h | 11 ++------ .../include/sodium/crypto_secretbox.h | 2 -- .../crypto_secretbox_xsalsa20poly1305.h | 17 +++---------- .../include/sodium/crypto_shorthash.h | 2 -- .../sodium/crypto_shorthash_siphash24.h | 11 ++------ src/libsodium/include/sodium/crypto_sign.h | 2 -- .../include/sodium/crypto_sign_ed25519.h | 14 +++-------- .../crypto_sign_edwards25519sha512batch.h | 14 +++-------- src/libsodium/include/sodium/crypto_stream.h | 3 --- .../include/sodium/crypto_stream_aes128ctr.h | 14 +++-------- .../include/sodium/crypto_stream_salsa20.h | 12 ++------- .../include/sodium/crypto_stream_salsa2012.h | 12 ++------- .../include/sodium/crypto_stream_salsa208.h | 12 ++------- .../include/sodium/crypto_stream_xsalsa20.h | 12 ++------- .../include/sodium/crypto_verify_16.h | 8 +----- .../include/sodium/crypto_verify_32.h | 8 +----- 33 files changed, 66 insertions(+), 270 deletions(-) diff --git a/src/libsodium/include/sodium/crypto_auth.h b/src/libsodium/include/sodium/crypto_auth.h index 32775575..450152ca 100644 --- a/src/libsodium/include/sodium/crypto_auth.h +++ b/src/libsodium/include/sodium/crypto_auth.h @@ -8,7 +8,5 @@ #define crypto_auth_BYTES crypto_auth_hmacsha512256_BYTES #define crypto_auth_KEYBYTES crypto_auth_hmacsha512256_KEYBYTES #define crypto_auth_PRIMITIVE "hmacsha512256" -#define crypto_auth_IMPLEMENTATION crypto_auth_hmacsha512256_IMPLEMENTATION -#define crypto_auth_VERSION crypto_auth_hmacsha512256_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h index a79ec8e6..73e8db5d 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha256.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h @@ -1,8 +1,8 @@ #ifndef crypto_auth_hmacsha256_H #define crypto_auth_hmacsha256_H -#define crypto_auth_hmacsha256_ref_BYTES 32 -#define crypto_auth_hmacsha256_ref_KEYBYTES 32 +#define crypto_auth_hmacsha256_BYTES 32 +#define crypto_auth_hmacsha256_KEYBYTES 32 #ifdef __cplusplus extern "C" { #endif @@ -14,12 +14,5 @@ extern int crypto_auth_hmacsha256_ref_verify(const unsigned char *,const unsigne #define crypto_auth_hmacsha256 crypto_auth_hmacsha256_ref #define crypto_auth_hmacsha256_verify crypto_auth_hmacsha256_ref_verify -#define crypto_auth_hmacsha256_BYTES crypto_auth_hmacsha256_ref_BYTES -#define crypto_auth_hmacsha256_KEYBYTES crypto_auth_hmacsha256_ref_KEYBYTES -#define crypto_auth_hmacsha256_IMPLEMENTATION "crypto_auth/hmacsha256/ref" -#ifndef crypto_auth_hmacsha256_ref_VERSION -#define crypto_auth_hmacsha256_ref_VERSION "-" -#endif -#define crypto_auth_hmacsha256_VERSION crypto_auth_hmacsha256_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h index e65d042e..943a4ab1 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h @@ -1,8 +1,8 @@ #ifndef crypto_auth_hmacsha512256_H #define crypto_auth_hmacsha512256_H -#define crypto_auth_hmacsha512256_ref_BYTES 32 -#define crypto_auth_hmacsha512256_ref_KEYBYTES 32 +#define crypto_auth_hmacsha512256_BYTES 32 +#define crypto_auth_hmacsha512256_KEYBYTES 32 #ifdef __cplusplus extern "C" { #endif @@ -14,12 +14,5 @@ extern int crypto_auth_hmacsha512256_ref_verify(const unsigned char *,const unsi #define crypto_auth_hmacsha512256 crypto_auth_hmacsha512256_ref #define crypto_auth_hmacsha512256_verify crypto_auth_hmacsha512256_ref_verify -#define crypto_auth_hmacsha512256_BYTES crypto_auth_hmacsha512256_ref_BYTES -#define crypto_auth_hmacsha512256_KEYBYTES crypto_auth_hmacsha512256_ref_KEYBYTES -#define crypto_auth_hmacsha512256_IMPLEMENTATION "crypto_auth/hmacsha512256/ref" -#ifndef crypto_auth_hmacsha512256_ref_VERSION -#define crypto_auth_hmacsha512256_ref_VERSION "-" -#endif -#define crypto_auth_hmacsha512256_VERSION crypto_auth_hmacsha512256_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_box.h b/src/libsodium/include/sodium/crypto_box.h index 40273020..ecca5b37 100644 --- a/src/libsodium/include/sodium/crypto_box.h +++ b/src/libsodium/include/sodium/crypto_box.h @@ -15,9 +15,7 @@ #define crypto_box_NONCEBYTES crypto_box_curve25519xsalsa20poly1305_NONCEBYTES #define crypto_box_ZEROBYTES crypto_box_curve25519xsalsa20poly1305_ZEROBYTES #define crypto_box_BOXZEROBYTES crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES -#define crypto_box_MACBYTES (crypto_box_ZEROBYTES - crypto_box_BOXZEROBYTES) +#define crypto_box_MACBYTES crypto_box_curve25519xsalsa20poly1305_MACBYTES #define crypto_box_PRIMITIVE "curve25519xsalsa20poly1305" -#define crypto_box_IMPLEMENTATION crypto_box_curve25519xsalsa20poly1305_IMPLEMENTATION -#define crypto_box_VERSION crypto_box_curve25519xsalsa20poly1305_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h index bfd15a12..9cbc3134 100644 --- a/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h +++ b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h @@ -1,12 +1,13 @@ #ifndef crypto_box_curve25519xsalsa20poly1305_H #define crypto_box_curve25519xsalsa20poly1305_H -#define crypto_box_curve25519xsalsa20poly1305_ref_PUBLICKEYBYTES 32 -#define crypto_box_curve25519xsalsa20poly1305_ref_SECRETKEYBYTES 32 -#define crypto_box_curve25519xsalsa20poly1305_ref_BEFORENMBYTES 32 -#define crypto_box_curve25519xsalsa20poly1305_ref_NONCEBYTES 24 -#define crypto_box_curve25519xsalsa20poly1305_ref_ZEROBYTES 32 -#define crypto_box_curve25519xsalsa20poly1305_ref_BOXZEROBYTES 16 +#define crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES 32 +#define crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES 32 +#define crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES 32 +#define crypto_box_curve25519xsalsa20poly1305_NONCEBYTES 24 +#define crypto_box_curve25519xsalsa20poly1305_ZEROBYTES 32 +#define crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES 16 +#define crypto_box_curve25519xsalsa20poly1305_MACBYTES (crypto_box_curve25519xsalsa20poly1305_ZEROBYTES - crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES) #ifdef __cplusplus extern "C" { #endif @@ -26,17 +27,5 @@ extern int crypto_box_curve25519xsalsa20poly1305_ref_open_afternm(unsigned char #define crypto_box_curve25519xsalsa20poly1305_beforenm crypto_box_curve25519xsalsa20poly1305_ref_beforenm #define crypto_box_curve25519xsalsa20poly1305_afternm crypto_box_curve25519xsalsa20poly1305_ref_afternm #define crypto_box_curve25519xsalsa20poly1305_open_afternm crypto_box_curve25519xsalsa20poly1305_ref_open_afternm -#define crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES crypto_box_curve25519xsalsa20poly1305_ref_PUBLICKEYBYTES -#define crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES crypto_box_curve25519xsalsa20poly1305_ref_SECRETKEYBYTES -#define crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES crypto_box_curve25519xsalsa20poly1305_ref_BEFORENMBYTES -#define crypto_box_curve25519xsalsa20poly1305_NONCEBYTES crypto_box_curve25519xsalsa20poly1305_ref_NONCEBYTES -#define crypto_box_curve25519xsalsa20poly1305_ZEROBYTES crypto_box_curve25519xsalsa20poly1305_ref_ZEROBYTES -#define crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES crypto_box_curve25519xsalsa20poly1305_ref_BOXZEROBYTES -#define crypto_box_curve25519xsalsa20poly1305_MACBYTES (crypto_box_curve25519xsalsa20poly1305_ZEROBYTES - crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES) -#define crypto_box_curve25519xsalsa20poly1305_IMPLEMENTATION "crypto_box/curve25519xsalsa20poly1305/ref" -#ifndef crypto_box_curve25519xsalsa20poly1305_ref_VERSION -#define crypto_box_curve25519xsalsa20poly1305_ref_VERSION "-" -#endif -#define crypto_box_curve25519xsalsa20poly1305_VERSION crypto_box_curve25519xsalsa20poly1305_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_core_hsalsa20.h b/src/libsodium/include/sodium/crypto_core_hsalsa20.h index 99dd42c1..6f4a966c 100644 --- a/src/libsodium/include/sodium/crypto_core_hsalsa20.h +++ b/src/libsodium/include/sodium/crypto_core_hsalsa20.h @@ -1,10 +1,10 @@ #ifndef crypto_core_hsalsa20_H #define crypto_core_hsalsa20_H -#define crypto_core_hsalsa20_ref2_OUTPUTBYTES 32 -#define crypto_core_hsalsa20_ref2_INPUTBYTES 16 -#define crypto_core_hsalsa20_ref2_KEYBYTES 32 -#define crypto_core_hsalsa20_ref2_CONSTBYTES 16 +#define crypto_core_hsalsa20_OUTPUTBYTES 32 +#define crypto_core_hsalsa20_INPUTBYTES 16 +#define crypto_core_hsalsa20_KEYBYTES 32 +#define crypto_core_hsalsa20_CONSTBYTES 16 #ifdef __cplusplus extern "C" { #endif @@ -14,14 +14,5 @@ extern int crypto_core_hsalsa20_ref2(unsigned char *,const unsigned char *,const #endif #define crypto_core_hsalsa20 crypto_core_hsalsa20_ref2 -#define crypto_core_hsalsa20_OUTPUTBYTES crypto_core_hsalsa20_ref2_OUTPUTBYTES -#define crypto_core_hsalsa20_INPUTBYTES crypto_core_hsalsa20_ref2_INPUTBYTES -#define crypto_core_hsalsa20_KEYBYTES crypto_core_hsalsa20_ref2_KEYBYTES -#define crypto_core_hsalsa20_CONSTBYTES crypto_core_hsalsa20_ref2_CONSTBYTES -#define crypto_core_hsalsa20_IMPLEMENTATION "crypto_core/hsalsa20/ref2" -#ifndef crypto_core_hsalsa20_ref2_VERSION -#define crypto_core_hsalsa20_ref2_VERSION "-" -#endif -#define crypto_core_hsalsa20_VERSION crypto_core_hsalsa20_ref2_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_core_salsa20.h b/src/libsodium/include/sodium/crypto_core_salsa20.h index aa5c253f..f9401dce 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa20.h +++ b/src/libsodium/include/sodium/crypto_core_salsa20.h @@ -1,10 +1,10 @@ #ifndef crypto_core_salsa20_H #define crypto_core_salsa20_H -#define crypto_core_salsa20_ref_OUTPUTBYTES 64 -#define crypto_core_salsa20_ref_INPUTBYTES 16 -#define crypto_core_salsa20_ref_KEYBYTES 32 -#define crypto_core_salsa20_ref_CONSTBYTES 16 +#define crypto_core_salsa20_OUTPUTBYTES 64 +#define crypto_core_salsa20_INPUTBYTES 16 +#define crypto_core_salsa20_KEYBYTES 32 +#define crypto_core_salsa20_CONSTBYTES 16 #ifdef __cplusplus extern "C" { #endif @@ -14,14 +14,5 @@ extern int crypto_core_salsa20_ref(unsigned char *,const unsigned char *,const u #endif #define crypto_core_salsa20 crypto_core_salsa20_ref -#define crypto_core_salsa20_OUTPUTBYTES crypto_core_salsa20_ref_OUTPUTBYTES -#define crypto_core_salsa20_INPUTBYTES crypto_core_salsa20_ref_INPUTBYTES -#define crypto_core_salsa20_KEYBYTES crypto_core_salsa20_ref_KEYBYTES -#define crypto_core_salsa20_CONSTBYTES crypto_core_salsa20_ref_CONSTBYTES -#define crypto_core_salsa20_IMPLEMENTATION "crypto_core/salsa20/ref" -#ifndef crypto_core_salsa20_ref_VERSION -#define crypto_core_salsa20_ref_VERSION "-" -#endif -#define crypto_core_salsa20_VERSION crypto_core_salsa20_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_core_salsa2012.h b/src/libsodium/include/sodium/crypto_core_salsa2012.h index fdbc5b96..15d6a767 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa2012.h +++ b/src/libsodium/include/sodium/crypto_core_salsa2012.h @@ -1,10 +1,10 @@ #ifndef crypto_core_salsa2012_H #define crypto_core_salsa2012_H -#define crypto_core_salsa2012_ref_OUTPUTBYTES 64 -#define crypto_core_salsa2012_ref_INPUTBYTES 16 -#define crypto_core_salsa2012_ref_KEYBYTES 32 -#define crypto_core_salsa2012_ref_CONSTBYTES 16 +#define crypto_core_salsa2012_OUTPUTBYTES 64 +#define crypto_core_salsa2012_INPUTBYTES 16 +#define crypto_core_salsa2012_KEYBYTES 32 +#define crypto_core_salsa2012_CONSTBYTES 16 #ifdef __cplusplus extern "C" { #endif @@ -14,14 +14,5 @@ extern int crypto_core_salsa2012_ref(unsigned char *,const unsigned char *,const #endif #define crypto_core_salsa2012 crypto_core_salsa2012_ref -#define crypto_core_salsa2012_OUTPUTBYTES crypto_core_salsa2012_ref_OUTPUTBYTES -#define crypto_core_salsa2012_INPUTBYTES crypto_core_salsa2012_ref_INPUTBYTES -#define crypto_core_salsa2012_KEYBYTES crypto_core_salsa2012_ref_KEYBYTES -#define crypto_core_salsa2012_CONSTBYTES crypto_core_salsa2012_ref_CONSTBYTES -#define crypto_core_salsa2012_IMPLEMENTATION "crypto_core/salsa2012/ref" -#ifndef crypto_core_salsa2012_ref_VERSION -#define crypto_core_salsa2012_ref_VERSION "-" -#endif -#define crypto_core_salsa2012_VERSION crypto_core_salsa2012_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_core_salsa208.h b/src/libsodium/include/sodium/crypto_core_salsa208.h index 8a0de9b9..64424ca9 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa208.h +++ b/src/libsodium/include/sodium/crypto_core_salsa208.h @@ -1,10 +1,10 @@ #ifndef crypto_core_salsa208_H #define crypto_core_salsa208_H -#define crypto_core_salsa208_ref_OUTPUTBYTES 64 -#define crypto_core_salsa208_ref_INPUTBYTES 16 -#define crypto_core_salsa208_ref_KEYBYTES 32 -#define crypto_core_salsa208_ref_CONSTBYTES 16 +#define crypto_core_salsa208_OUTPUTBYTES 64 +#define crypto_core_salsa208_INPUTBYTES 16 +#define crypto_core_salsa208_KEYBYTES 32 +#define crypto_core_salsa208_CONSTBYTES 16 #ifdef __cplusplus extern "C" { #endif @@ -14,14 +14,5 @@ extern int crypto_core_salsa208_ref(unsigned char *,const unsigned char *,const #endif #define crypto_core_salsa208 crypto_core_salsa208_ref -#define crypto_core_salsa208_OUTPUTBYTES crypto_core_salsa208_ref_OUTPUTBYTES -#define crypto_core_salsa208_INPUTBYTES crypto_core_salsa208_ref_INPUTBYTES -#define crypto_core_salsa208_KEYBYTES crypto_core_salsa208_ref_KEYBYTES -#define crypto_core_salsa208_CONSTBYTES crypto_core_salsa208_ref_CONSTBYTES -#define crypto_core_salsa208_IMPLEMENTATION "crypto_core/salsa208/ref" -#ifndef crypto_core_salsa208_ref_VERSION -#define crypto_core_salsa208_ref_VERSION "-" -#endif -#define crypto_core_salsa208_VERSION crypto_core_salsa208_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_generichash_blake2b.h b/src/libsodium/include/sodium/crypto_generichash_blake2b.h index 908395c9..afd90521 100644 --- a/src/libsodium/include/sodium/crypto_generichash_blake2b.h +++ b/src/libsodium/include/sodium/crypto_generichash_blake2b.h @@ -17,10 +17,5 @@ extern int crypto_generichash_blake2b_ref(unsigned char *out, const unsigned cha #endif #define crypto_generichash_blake2b crypto_generichash_blake2b_ref -#define crypto_generichash_blake2b_IMPLEMENTATION -#ifndef crypto_generichash_blake2b_ref_VERSION -#define crypto_generichash_blake2b_ref_VERSION "-" -#endif -#define crypto_generichash_blake2b_VERSION crypto_generichash_blake2b_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_hash.h b/src/libsodium/include/sodium/crypto_hash.h index c24f367e..b4822e7e 100644 --- a/src/libsodium/include/sodium/crypto_hash.h +++ b/src/libsodium/include/sodium/crypto_hash.h @@ -6,7 +6,5 @@ #define crypto_hash crypto_hash_sha512 #define crypto_hash_BYTES crypto_hash_sha512_BYTES #define crypto_hash_PRIMITIVE "sha512" -#define crypto_hash_IMPLEMENTATION crypto_hash_sha512_IMPLEMENTATION -#define crypto_hash_VERSION crypto_hash_sha512_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_hash_sha256.h b/src/libsodium/include/sodium/crypto_hash_sha256.h index d451cf13..63775eb3 100644 --- a/src/libsodium/include/sodium/crypto_hash_sha256.h +++ b/src/libsodium/include/sodium/crypto_hash_sha256.h @@ -1,7 +1,7 @@ #ifndef crypto_hash_sha256_H #define crypto_hash_sha256_H -#define crypto_hash_sha256_ref_BYTES 32 +#define crypto_hash_sha256_BYTES 32 #ifdef __cplusplus extern "C" { #endif @@ -11,11 +11,5 @@ extern int crypto_hash_sha256_ref(unsigned char *,const unsigned char *,unsigned #endif #define crypto_hash_sha256 crypto_hash_sha256_ref -#define crypto_hash_sha256_BYTES crypto_hash_sha256_ref_BYTES -#define crypto_hash_sha256_IMPLEMENTATION "crypto_hash/sha256/ref" -#ifndef crypto_hash_sha256_ref_VERSION -#define crypto_hash_sha256_ref_VERSION "-" -#endif -#define crypto_hash_sha256_VERSION crypto_hash_sha256_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_hash_sha512.h b/src/libsodium/include/sodium/crypto_hash_sha512.h index 0e92bddb..8c6bf077 100644 --- a/src/libsodium/include/sodium/crypto_hash_sha512.h +++ b/src/libsodium/include/sodium/crypto_hash_sha512.h @@ -1,7 +1,7 @@ #ifndef crypto_hash_sha512_H #define crypto_hash_sha512_H -#define crypto_hash_sha512_ref_BYTES 64 +#define crypto_hash_sha512_BYTES 64 #ifdef __cplusplus extern "C" { #endif @@ -11,11 +11,5 @@ extern int crypto_hash_sha512_ref(unsigned char *,const unsigned char *,unsigned #endif #define crypto_hash_sha512 crypto_hash_sha512_ref -#define crypto_hash_sha512_BYTES crypto_hash_sha512_ref_BYTES -#define crypto_hash_sha512_IMPLEMENTATION "crypto_hash/sha512/ref" -#ifndef crypto_hash_sha512_ref_VERSION -#define crypto_hash_sha512_ref_VERSION "-" -#endif -#define crypto_hash_sha512_VERSION crypto_hash_sha512_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_hashblocks_sha256.h b/src/libsodium/include/sodium/crypto_hashblocks_sha256.h index 4c0a4ce0..34daeaa6 100644 --- a/src/libsodium/include/sodium/crypto_hashblocks_sha256.h +++ b/src/libsodium/include/sodium/crypto_hashblocks_sha256.h @@ -1,8 +1,8 @@ #ifndef crypto_hashblocks_sha256_H #define crypto_hashblocks_sha256_H -#define crypto_hashblocks_sha256_ref_STATEBYTES 32 -#define crypto_hashblocks_sha256_ref_BLOCKBYTES 64 +#define crypto_hashblocks_sha256_STATEBYTES 32 +#define crypto_hashblocks_sha256_BLOCKBYTES 64 #ifdef __cplusplus extern "C" { #endif @@ -12,12 +12,5 @@ extern int crypto_hashblocks_sha256_ref(unsigned char *,const unsigned char *,un #endif #define crypto_hashblocks_sha256 crypto_hashblocks_sha256_ref -#define crypto_hashblocks_sha256_STATEBYTES crypto_hashblocks_sha256_ref_STATEBYTES -#define crypto_hashblocks_sha256_BLOCKBYTES crypto_hashblocks_sha256_ref_BLOCKBYTES -#define crypto_hashblocks_sha256_IMPLEMENTATION "crypto_hashblocks/sha256/ref" -#ifndef crypto_hashblocks_sha256_ref_VERSION -#define crypto_hashblocks_sha256_ref_VERSION "-" -#endif -#define crypto_hashblocks_sha256_VERSION crypto_hashblocks_sha256_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_hashblocks_sha512.h b/src/libsodium/include/sodium/crypto_hashblocks_sha512.h index 65953ba5..a26fd927 100644 --- a/src/libsodium/include/sodium/crypto_hashblocks_sha512.h +++ b/src/libsodium/include/sodium/crypto_hashblocks_sha512.h @@ -1,8 +1,8 @@ #ifndef crypto_hashblocks_sha512_H #define crypto_hashblocks_sha512_H -#define crypto_hashblocks_sha512_ref_STATEBYTES 64 -#define crypto_hashblocks_sha512_ref_BLOCKBYTES 128 +#define crypto_hashblocks_sha512_STATEBYTES 64 +#define crypto_hashblocks_sha512_BLOCKBYTES 128 #ifdef __cplusplus extern "C" { #endif @@ -12,12 +12,5 @@ extern int crypto_hashblocks_sha512_ref(unsigned char *,const unsigned char *,un #endif #define crypto_hashblocks_sha512 crypto_hashblocks_sha512_ref -#define crypto_hashblocks_sha512_STATEBYTES crypto_hashblocks_sha512_ref_STATEBYTES -#define crypto_hashblocks_sha512_BLOCKBYTES crypto_hashblocks_sha512_ref_BLOCKBYTES -#define crypto_hashblocks_sha512_IMPLEMENTATION "crypto_hashblocks/sha512/ref" -#ifndef crypto_hashblocks_sha512_ref_VERSION -#define crypto_hashblocks_sha512_ref_VERSION "-" -#endif -#define crypto_hashblocks_sha512_VERSION crypto_hashblocks_sha512_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_onetimeauth.h b/src/libsodium/include/sodium/crypto_onetimeauth.h index 450e122d..368efe3a 100644 --- a/src/libsodium/include/sodium/crypto_onetimeauth.h +++ b/src/libsodium/include/sodium/crypto_onetimeauth.h @@ -8,7 +8,5 @@ #define crypto_onetimeauth_BYTES crypto_onetimeauth_poly1305_BYTES #define crypto_onetimeauth_KEYBYTES crypto_onetimeauth_poly1305_KEYBYTES #define crypto_onetimeauth_PRIMITIVE "poly1305" -#define crypto_onetimeauth_IMPLEMENTATION crypto_onetimeauth_poly1305_IMPLEMENTATION -#define crypto_onetimeauth_VERSION crypto_onetimeauth_poly1305_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h index 6ccb5574..7e88177c 100644 --- a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h +++ b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h @@ -1,25 +1,21 @@ #ifndef crypto_onetimeauth_poly1305_H #define crypto_onetimeauth_poly1305_H -#define crypto_onetimeauth_poly1305_ref_BYTES 16 -#define crypto_onetimeauth_poly1305_ref_KEYBYTES 32 +#define crypto_onetimeauth_poly1305_BYTES 16 +#define crypto_onetimeauth_poly1305_KEYBYTES 32 #ifdef __cplusplus extern "C" { #endif extern int crypto_onetimeauth_poly1305_ref(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); extern int crypto_onetimeauth_poly1305_ref_verify(const unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); + +extern int crypto_onetimeauth_poly1305_53(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); +extern int crypto_onetimeauth_poly1305_53_verify(const unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); #ifdef __cplusplus } #endif #define crypto_onetimeauth_poly1305 crypto_onetimeauth_poly1305_ref #define crypto_onetimeauth_poly1305_verify crypto_onetimeauth_poly1305_ref_verify -#define crypto_onetimeauth_poly1305_BYTES crypto_onetimeauth_poly1305_ref_BYTES -#define crypto_onetimeauth_poly1305_KEYBYTES crypto_onetimeauth_poly1305_ref_KEYBYTES -#define crypto_onetimeauth_poly1305_IMPLEMENTATION "crypto_onetimeauth/poly1305/ref" -#ifndef crypto_onetimeauth_poly1305_ref_VERSION -#define crypto_onetimeauth_poly1305_ref_VERSION "-" -#endif -#define crypto_onetimeauth_poly1305_VERSION crypto_onetimeauth_poly1305_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h b/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h index 72ad7df0..9b9bd091 100644 --- a/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h +++ b/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h @@ -1,8 +1,8 @@ #ifndef crypto_scalarmult_curve25519_H #define crypto_scalarmult_curve25519_H -#define crypto_scalarmult_curve25519_ref_BYTES 32 -#define crypto_scalarmult_curve25519_ref_SCALARBYTES 32 +#define crypto_scalarmult_curve25519_BYTES 32 +#define crypto_scalarmult_curve25519_SCALARBYTES 32 #ifdef __cplusplus extern "C" { #endif @@ -14,12 +14,5 @@ extern int crypto_scalarmult_curve25519_ref_base(unsigned char *,const unsigned #define crypto_scalarmult_curve25519 crypto_scalarmult_curve25519_ref #define crypto_scalarmult_curve25519_base crypto_scalarmult_curve25519_ref_base -#define crypto_scalarmult_curve25519_BYTES crypto_scalarmult_curve25519_ref_BYTES -#define crypto_scalarmult_curve25519_SCALARBYTES crypto_scalarmult_curve25519_ref_SCALARBYTES -#define crypto_scalarmult_curve25519_IMPLEMENTATION "crypto_scalarmult/curve25519/ref" -#ifndef crypto_scalarmult_curve25519_ref_VERSION -#define crypto_scalarmult_curve25519_ref_VERSION "-" -#endif -#define crypto_scalarmult_curve25519_VERSION crypto_scalarmult_curve25519_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_secretbox.h b/src/libsodium/include/sodium/crypto_secretbox.h index 7409dd04..d2dfda0a 100644 --- a/src/libsodium/include/sodium/crypto_secretbox.h +++ b/src/libsodium/include/sodium/crypto_secretbox.h @@ -10,7 +10,5 @@ #define crypto_secretbox_ZEROBYTES crypto_secretbox_xsalsa20poly1305_ZEROBYTES #define crypto_secretbox_BOXZEROBYTES crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES #define crypto_secretbox_PRIMITIVE "xsalsa20poly1305" -#define crypto_secretbox_IMPLEMENTATION crypto_secretbox_xsalsa20poly1305_IMPLEMENTATION -#define crypto_secretbox_VERSION crypto_secretbox_xsalsa20poly1305_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h index cc5898c1..0945b162 100644 --- a/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h +++ b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h @@ -1,10 +1,10 @@ #ifndef crypto_secretbox_xsalsa20poly1305_H #define crypto_secretbox_xsalsa20poly1305_H -#define crypto_secretbox_xsalsa20poly1305_ref_KEYBYTES 32 -#define crypto_secretbox_xsalsa20poly1305_ref_NONCEBYTES 24 -#define crypto_secretbox_xsalsa20poly1305_ref_ZEROBYTES 32 -#define crypto_secretbox_xsalsa20poly1305_ref_BOXZEROBYTES 16 +#define crypto_secretbox_xsalsa20poly1305_KEYBYTES 32 +#define crypto_secretbox_xsalsa20poly1305_NONCEBYTES 24 +#define crypto_secretbox_xsalsa20poly1305_ZEROBYTES 32 +#define crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES 16 #ifdef __cplusplus extern "C" { #endif @@ -16,14 +16,5 @@ extern int crypto_secretbox_xsalsa20poly1305_ref_open(unsigned char *,const unsi #define crypto_secretbox_xsalsa20poly1305 crypto_secretbox_xsalsa20poly1305_ref #define crypto_secretbox_xsalsa20poly1305_open crypto_secretbox_xsalsa20poly1305_ref_open -#define crypto_secretbox_xsalsa20poly1305_KEYBYTES crypto_secretbox_xsalsa20poly1305_ref_KEYBYTES -#define crypto_secretbox_xsalsa20poly1305_NONCEBYTES crypto_secretbox_xsalsa20poly1305_ref_NONCEBYTES -#define crypto_secretbox_xsalsa20poly1305_ZEROBYTES crypto_secretbox_xsalsa20poly1305_ref_ZEROBYTES -#define crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES crypto_secretbox_xsalsa20poly1305_ref_BOXZEROBYTES -#define crypto_secretbox_xsalsa20poly1305_IMPLEMENTATION "crypto_secretbox/xsalsa20poly1305/ref" -#ifndef crypto_secretbox_xsalsa20poly1305_ref_VERSION -#define crypto_secretbox_xsalsa20poly1305_ref_VERSION "-" -#endif -#define crypto_secretbox_xsalsa20poly1305_VERSION crypto_secretbox_xsalsa20poly1305_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_shorthash.h b/src/libsodium/include/sodium/crypto_shorthash.h index 885b6f0a..925b4a63 100644 --- a/src/libsodium/include/sodium/crypto_shorthash.h +++ b/src/libsodium/include/sodium/crypto_shorthash.h @@ -7,7 +7,5 @@ #define crypto_shorthash_BYTES crypto_shorthash_siphash24_BYTES #define crypto_shorthash_KEYBYTES crypto_shorthash_siphash24_KEYBYTES #define crypto_shorthash_PRIMITIVE "siphash24" -#define crypto_shorthash_IMPLEMENTATION crypto_shorthash_siphash24_IMPLEMENTATION -#define crypto_shorthash_VERSION crypto_shorthash_siphash24_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_shorthash_siphash24.h b/src/libsodium/include/sodium/crypto_shorthash_siphash24.h index e49e0b90..5e18501e 100644 --- a/src/libsodium/include/sodium/crypto_shorthash_siphash24.h +++ b/src/libsodium/include/sodium/crypto_shorthash_siphash24.h @@ -1,8 +1,8 @@ #ifndef crypto_shorthash_siphash24_H #define crypto_shorthash_siphash24_H -#define crypto_shorthash_siphash24_ref_BYTES 8 -#define crypto_shorthash_siphash24_ref_KEYBYTES 16 +#define crypto_shorthash_siphash24_BYTES 8 +#define crypto_shorthash_siphash24_KEYBYTES 16 #ifdef __cplusplus extern "C" { #endif @@ -12,12 +12,5 @@ extern int crypto_shorthash_siphash24_ref(unsigned char *,const unsigned char *, #endif #define crypto_shorthash_siphash24 crypto_shorthash_siphash24_ref -#define crypto_shorthash_siphash24_BYTES crypto_shorthash_siphash24_ref_BYTES -#define crypto_shorthash_siphash24_KEYBYTES crypto_shorthash_siphash24_ref_KEYBYTES -#define crypto_shorthash_siphash24_IMPLEMENTATION -#ifndef crypto_shorthash_siphash24_ref_VERSION -#define crypto_shorthash_siphash24_ref_VERSION "-" -#endif -#define crypto_shorthash_siphash24_VERSION crypto_shorthash_siphash24_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_sign.h b/src/libsodium/include/sodium/crypto_sign.h index c5f19e7f..59403943 100644 --- a/src/libsodium/include/sodium/crypto_sign.h +++ b/src/libsodium/include/sodium/crypto_sign.h @@ -11,7 +11,5 @@ #define crypto_sign_PUBLICKEYBYTES crypto_sign_ed25519_PUBLICKEYBYTES #define crypto_sign_SECRETKEYBYTES crypto_sign_ed25519_SECRETKEYBYTES #define crypto_sign_PRIMITIVE "ed25519" -#define crypto_sign_IMPLEMENTATION crypto_sign_ed25519_IMPLEMENTATION -#define crypto_sign_VERSION crypto_sign_ed25519_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_sign_ed25519.h b/src/libsodium/include/sodium/crypto_sign_ed25519.h index f8ed4fec..94471184 100644 --- a/src/libsodium/include/sodium/crypto_sign_ed25519.h +++ b/src/libsodium/include/sodium/crypto_sign_ed25519.h @@ -1,9 +1,9 @@ #ifndef crypto_sign_ed25519_H #define crypto_sign_ed25519_H -#define crypto_sign_ed25519_ref10_SECRETKEYBYTES 64 -#define crypto_sign_ed25519_ref10_PUBLICKEYBYTES 32 -#define crypto_sign_ed25519_ref10_BYTES 64 +#define crypto_sign_ed25519_SECRETKEYBYTES 64 +#define crypto_sign_ed25519_PUBLICKEYBYTES 32 +#define crypto_sign_ed25519_BYTES 64 #ifdef __cplusplus extern "C" { @@ -20,13 +20,5 @@ extern int crypto_sign_ed25519_ref10_seed_keypair(unsigned char *,unsigned char #define crypto_sign_ed25519_open crypto_sign_ed25519_ref10_open #define crypto_sign_ed25519_keypair crypto_sign_ed25519_ref10_keypair #define crypto_sign_ed25519_seed_keypair crypto_sign_ed25519_ref10_seed_keypair -#define crypto_sign_ed25519_BYTES crypto_sign_ed25519_ref10_BYTES -#define crypto_sign_ed25519_PUBLICKEYBYTES crypto_sign_ed25519_ref10_PUBLICKEYBYTES -#define crypto_sign_ed25519_SECRETKEYBYTES crypto_sign_ed25519_ref10_SECRETKEYBYTES -#define crypto_sign_ed25519_IMPLEMENTATION "crypto_sign/ed25519/ref10" -#ifndef crypto_sign_ed25519_ref10_VERSION -#define crypto_sign_ed25519_ref10_VERSION "-" -#endif -#define crypto_sign_ed25519_VERSION crypto_sign_ed25519_ref10_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h b/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h index b7284469..dca6d7cd 100644 --- a/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h +++ b/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h @@ -1,9 +1,9 @@ #ifndef crypto_sign_edwards25519sha512batch_H #define crypto_sign_edwards25519sha512batch_H -#define crypto_sign_edwards25519sha512batch_ref_SECRETKEYBYTES 64 -#define crypto_sign_edwards25519sha512batch_ref_PUBLICKEYBYTES 32 -#define crypto_sign_edwards25519sha512batch_ref_BYTES 64 +#define crypto_sign_edwards25519sha512batch_SECRETKEYBYTES 64 +#define crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES 32 +#define crypto_sign_edwards25519sha512batch_BYTES 64 #ifdef __cplusplus extern "C" { #endif @@ -17,13 +17,5 @@ extern int crypto_sign_edwards25519sha512batch_ref_keypair(unsigned char *,unsig #define crypto_sign_edwards25519sha512batch crypto_sign_edwards25519sha512batch_ref #define crypto_sign_edwards25519sha512batch_open crypto_sign_edwards25519sha512batch_ref_open #define crypto_sign_edwards25519sha512batch_keypair crypto_sign_edwards25519sha512batch_ref_keypair -#define crypto_sign_edwards25519sha512batch_BYTES crypto_sign_edwards25519sha512batch_ref_BYTES -#define crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES crypto_sign_edwards25519sha512batch_ref_PUBLICKEYBYTES -#define crypto_sign_edwards25519sha512batch_SECRETKEYBYTES crypto_sign_edwards25519sha512batch_ref_SECRETKEYBYTES -#define crypto_sign_edwards25519sha512batch_IMPLEMENTATION "crypto_sign/edwards25519sha512batch/ref" -#ifndef crypto_sign_edwards25519sha512batch_ref_VERSION -#define crypto_sign_edwards25519sha512batch_ref_VERSION "-" -#endif -#define crypto_sign_edwards25519sha512batch_VERSION crypto_sign_edwards25519sha512batch_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_stream.h b/src/libsodium/include/sodium/crypto_stream.h index 02d2409c..bfdd215b 100644 --- a/src/libsodium/include/sodium/crypto_stream.h +++ b/src/libsodium/include/sodium/crypto_stream.h @@ -10,9 +10,6 @@ #define crypto_stream_xor_afternm crypto_stream_xsalsa20_xor_afternm #define crypto_stream_KEYBYTES crypto_stream_xsalsa20_KEYBYTES #define crypto_stream_NONCEBYTES crypto_stream_xsalsa20_NONCEBYTES -#define crypto_stream_BEFORENMBYTES crypto_stream_xsalsa20_BEFORENMBYTES #define crypto_stream_PRIMITIVE "xsalsa20" -#define crypto_stream_IMPLEMENTATION crypto_stream_xsalsa20_IMPLEMENTATION -#define crypto_stream_VERSION crypto_stream_xsalsa20_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_stream_aes128ctr.h b/src/libsodium/include/sodium/crypto_stream_aes128ctr.h index dcb0bc42..db7d22ab 100644 --- a/src/libsodium/include/sodium/crypto_stream_aes128ctr.h +++ b/src/libsodium/include/sodium/crypto_stream_aes128ctr.h @@ -1,9 +1,9 @@ #ifndef crypto_stream_aes128ctr_H #define crypto_stream_aes128ctr_H -#define crypto_stream_aes128ctr_portable_KEYBYTES 16 -#define crypto_stream_aes128ctr_portable_NONCEBYTES 16 -#define crypto_stream_aes128ctr_portable_BEFORENMBYTES 1408 +#define crypto_stream_aes128ctr_KEYBYTES 16 +#define crypto_stream_aes128ctr_NONCEBYTES 16 +#define crypto_stream_aes128ctr_BEFORENMBYTES 1408 #ifdef __cplusplus extern "C" { #endif @@ -21,13 +21,5 @@ extern int crypto_stream_aes128ctr_portable_xor_afternm(unsigned char *,const un #define crypto_stream_aes128ctr_beforenm crypto_stream_aes128ctr_portable_beforenm #define crypto_stream_aes128ctr_afternm crypto_stream_aes128ctr_portable_afternm #define crypto_stream_aes128ctr_xor_afternm crypto_stream_aes128ctr_portable_xor_afternm -#define crypto_stream_aes128ctr_KEYBYTES crypto_stream_aes128ctr_portable_KEYBYTES -#define crypto_stream_aes128ctr_NONCEBYTES crypto_stream_aes128ctr_portable_NONCEBYTES -#define crypto_stream_aes128ctr_BEFORENMBYTES crypto_stream_aes128ctr_portable_BEFORENMBYTES -#define crypto_stream_aes128ctr_IMPLEMENTATION "crypto_stream/aes128ctr/portable" -#ifndef crypto_stream_aes128ctr_portable_VERSION -#define crypto_stream_aes128ctr_portable_VERSION "-" -#endif -#define crypto_stream_aes128ctr_VERSION crypto_stream_aes128ctr_portable_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_stream_salsa20.h b/src/libsodium/include/sodium/crypto_stream_salsa20.h index 588e2c3f..d3975ce0 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa20.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa20.h @@ -1,8 +1,8 @@ #ifndef crypto_stream_salsa20_H #define crypto_stream_salsa20_H -#define crypto_stream_salsa20_ref_KEYBYTES 32 -#define crypto_stream_salsa20_ref_NONCEBYTES 8 +#define crypto_stream_salsa20_KEYBYTES 32 +#define crypto_stream_salsa20_NONCEBYTES 8 #ifdef __cplusplus extern "C" { #endif @@ -20,13 +20,5 @@ extern int crypto_stream_salsa20_ref_xor_afternm(unsigned char *,const unsigned #define crypto_stream_salsa20_beforenm crypto_stream_salsa20_ref_beforenm #define crypto_stream_salsa20_afternm crypto_stream_salsa20_ref_afternm #define crypto_stream_salsa20_xor_afternm crypto_stream_salsa20_ref_xor_afternm -#define crypto_stream_salsa20_KEYBYTES crypto_stream_salsa20_ref_KEYBYTES -#define crypto_stream_salsa20_NONCEBYTES crypto_stream_salsa20_ref_NONCEBYTES -#define crypto_stream_salsa20_BEFORENMBYTES crypto_stream_salsa20_ref_BEFORENMBYTES -#define crypto_stream_salsa20_IMPLEMENTATION "crypto_stream/salsa20/ref" -#ifndef crypto_stream_salsa20_ref_VERSION -#define crypto_stream_salsa20_ref_VERSION "-" -#endif -#define crypto_stream_salsa20_VERSION crypto_stream_salsa20_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_stream_salsa2012.h b/src/libsodium/include/sodium/crypto_stream_salsa2012.h index 3cda90e5..b34a436e 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa2012.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa2012.h @@ -1,8 +1,8 @@ #ifndef crypto_stream_salsa2012_H #define crypto_stream_salsa2012_H -#define crypto_stream_salsa2012_ref_KEYBYTES 32 -#define crypto_stream_salsa2012_ref_NONCEBYTES 8 +#define crypto_stream_salsa2012_KEYBYTES 32 +#define crypto_stream_salsa2012_NONCEBYTES 8 #ifdef __cplusplus extern "C" { #endif @@ -20,13 +20,5 @@ extern int crypto_stream_salsa2012_ref_xor_afternm(unsigned char *,const unsigne #define crypto_stream_salsa2012_beforenm crypto_stream_salsa2012_ref_beforenm #define crypto_stream_salsa2012_afternm crypto_stream_salsa2012_ref_afternm #define crypto_stream_salsa2012_xor_afternm crypto_stream_salsa2012_ref_xor_afternm -#define crypto_stream_salsa2012_KEYBYTES crypto_stream_salsa2012_ref_KEYBYTES -#define crypto_stream_salsa2012_NONCEBYTES crypto_stream_salsa2012_ref_NONCEBYTES -#define crypto_stream_salsa2012_BEFORENMBYTES crypto_stream_salsa2012_ref_BEFORENMBYTES -#define crypto_stream_salsa2012_IMPLEMENTATION "crypto_stream/salsa2012/ref" -#ifndef crypto_stream_salsa2012_ref_VERSION -#define crypto_stream_salsa2012_ref_VERSION "-" -#endif -#define crypto_stream_salsa2012_VERSION crypto_stream_salsa2012_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_stream_salsa208.h b/src/libsodium/include/sodium/crypto_stream_salsa208.h index 3277803d..5688d77b 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa208.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa208.h @@ -1,8 +1,8 @@ #ifndef crypto_stream_salsa208_H #define crypto_stream_salsa208_H -#define crypto_stream_salsa208_ref_KEYBYTES 32 -#define crypto_stream_salsa208_ref_NONCEBYTES 8 +#define crypto_stream_salsa208_KEYBYTES 32 +#define crypto_stream_salsa208_NONCEBYTES 8 #ifdef __cplusplus extern "C" { #endif @@ -20,13 +20,5 @@ extern int crypto_stream_salsa208_ref_xor_afternm(unsigned char *,const unsigned #define crypto_stream_salsa208_beforenm crypto_stream_salsa208_ref_beforenm #define crypto_stream_salsa208_afternm crypto_stream_salsa208_ref_afternm #define crypto_stream_salsa208_xor_afternm crypto_stream_salsa208_ref_xor_afternm -#define crypto_stream_salsa208_KEYBYTES crypto_stream_salsa208_ref_KEYBYTES -#define crypto_stream_salsa208_NONCEBYTES crypto_stream_salsa208_ref_NONCEBYTES -#define crypto_stream_salsa208_BEFORENMBYTES crypto_stream_salsa208_ref_BEFORENMBYTES -#define crypto_stream_salsa208_IMPLEMENTATION "crypto_stream/salsa208/ref" -#ifndef crypto_stream_salsa208_ref_VERSION -#define crypto_stream_salsa208_ref_VERSION "-" -#endif -#define crypto_stream_salsa208_VERSION crypto_stream_salsa208_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_stream_xsalsa20.h b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h index 2786ff22..22925a7c 100644 --- a/src/libsodium/include/sodium/crypto_stream_xsalsa20.h +++ b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h @@ -1,8 +1,8 @@ #ifndef crypto_stream_xsalsa20_H #define crypto_stream_xsalsa20_H -#define crypto_stream_xsalsa20_ref_KEYBYTES 32 -#define crypto_stream_xsalsa20_ref_NONCEBYTES 24 +#define crypto_stream_xsalsa20_KEYBYTES 32 +#define crypto_stream_xsalsa20_NONCEBYTES 24 #ifdef __cplusplus extern "C" { #endif @@ -20,13 +20,5 @@ extern int crypto_stream_xsalsa20_ref_xor_afternm(unsigned char *,const unsigned #define crypto_stream_xsalsa20_beforenm crypto_stream_xsalsa20_ref_beforenm #define crypto_stream_xsalsa20_afternm crypto_stream_xsalsa20_ref_afternm #define crypto_stream_xsalsa20_xor_afternm crypto_stream_xsalsa20_ref_xor_afternm -#define crypto_stream_xsalsa20_KEYBYTES crypto_stream_xsalsa20_ref_KEYBYTES -#define crypto_stream_xsalsa20_NONCEBYTES crypto_stream_xsalsa20_ref_NONCEBYTES -#define crypto_stream_xsalsa20_BEFORENMBYTES crypto_stream_xsalsa20_ref_BEFORENMBYTES -#define crypto_stream_xsalsa20_IMPLEMENTATION "crypto_stream/xsalsa20/ref" -#ifndef crypto_stream_xsalsa20_ref_VERSION -#define crypto_stream_xsalsa20_ref_VERSION "-" -#endif -#define crypto_stream_xsalsa20_VERSION crypto_stream_xsalsa20_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_verify_16.h b/src/libsodium/include/sodium/crypto_verify_16.h index 2057ffde..2731c3fa 100644 --- a/src/libsodium/include/sodium/crypto_verify_16.h +++ b/src/libsodium/include/sodium/crypto_verify_16.h @@ -1,7 +1,7 @@ #ifndef crypto_verify_16_H #define crypto_verify_16_H -#define crypto_verify_16_ref_BYTES 16 +#define crypto_verify_16_BYTES 16 #ifdef __cplusplus extern "C" { #endif @@ -11,11 +11,5 @@ extern int crypto_verify_16_ref(const unsigned char *,const unsigned char *); #endif #define crypto_verify_16 crypto_verify_16_ref -#define crypto_verify_16_BYTES crypto_verify_16_ref_BYTES -#define crypto_verify_16_IMPLEMENTATION "crypto_verify/16/ref" -#ifndef crypto_verify_16_ref_VERSION -#define crypto_verify_16_ref_VERSION "-" -#endif -#define crypto_verify_16_VERSION crypto_verify_16_ref_VERSION #endif diff --git a/src/libsodium/include/sodium/crypto_verify_32.h b/src/libsodium/include/sodium/crypto_verify_32.h index f5f67192..6d1044f6 100644 --- a/src/libsodium/include/sodium/crypto_verify_32.h +++ b/src/libsodium/include/sodium/crypto_verify_32.h @@ -1,7 +1,7 @@ #ifndef crypto_verify_32_H #define crypto_verify_32_H -#define crypto_verify_32_ref_BYTES 32 +#define crypto_verify_32_BYTES 32 #ifdef __cplusplus extern "C" { #endif @@ -11,11 +11,5 @@ extern int crypto_verify_32_ref(const unsigned char *,const unsigned char *); #endif #define crypto_verify_32 crypto_verify_32_ref -#define crypto_verify_32_BYTES crypto_verify_32_ref_BYTES -#define crypto_verify_32_IMPLEMENTATION "crypto_verify/32/ref" -#ifndef crypto_verify_32_ref_VERSION -#define crypto_verify_32_ref_VERSION "-" -#endif -#define crypto_verify_32_VERSION crypto_verify_32_ref_VERSION #endif