From 6e3e997faa55da95715033c613b20731f672345f Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 22 Apr 2013 17:18:19 -0700 Subject: [PATCH] Export the primitive themselves, not the implementations. --- .../include/sodium/crypto_auth_hmacsha256.h | 8 +++---- .../sodium/crypto_auth_hmacsha512256.h | 8 +++---- .../crypto_box_curve25519xsalsa20poly1305.h | 24 +++++++++---------- .../include/sodium/crypto_core_hsalsa20.h | 4 ++-- .../include/sodium/crypto_core_salsa20.h | 4 ++-- .../include/sodium/crypto_core_salsa2012.h | 4 ++-- .../include/sodium/crypto_core_salsa208.h | 4 ++-- .../sodium/crypto_generichash_blake2b.h | 13 ++++++---- .../include/sodium/crypto_hashblocks_sha256.h | 4 ++-- .../include/sodium/crypto_hashblocks_sha512.h | 4 ++-- .../crypto_secretbox_xsalsa20poly1305.h | 8 +++---- .../sodium/crypto_shorthash_siphash24.h | 4 ++-- .../include/sodium/crypto_sign_ed25519.h | 16 ++++++------- .../crypto_sign_edwards25519sha512batch.h | 12 +++++----- .../include/sodium/crypto_stream_aes128ctr.h | 20 ++++++++-------- .../include/sodium/crypto_stream_salsa20.h | 20 ++++++++-------- .../include/sodium/crypto_stream_salsa2012.h | 20 ++++++++-------- .../include/sodium/crypto_stream_salsa208.h | 20 ++++++++-------- .../include/sodium/crypto_stream_xsalsa20.h | 20 ++++++++-------- 19 files changed, 110 insertions(+), 107 deletions(-) diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h index c0271e86..a442da17 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha256.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h @@ -11,16 +11,16 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_auth_hmacsha256_ref(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); +int crypto_auth_hmacsha256(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); SODIUM_EXPORT -int crypto_auth_hmacsha256_ref_verify(const unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); +int crypto_auth_hmacsha256_verify(const unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_auth_hmacsha256 crypto_auth_hmacsha256_ref -#define crypto_auth_hmacsha256_verify crypto_auth_hmacsha256_ref_verify +#define crypto_auth_hmacsha256_ref crypto_auth_hmacsha256 +#define crypto_auth_hmacsha256_ref_verify crypto_auth_hmacsha256_verify #endif diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h index d12c9f8b..01222db7 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h @@ -11,16 +11,16 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_auth_hmacsha512256_ref(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); +int crypto_auth_hmacsha512256(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); SODIUM_EXPORT -int crypto_auth_hmacsha512256_ref_verify(const unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); +int crypto_auth_hmacsha512256_verify(const unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_auth_hmacsha512256 crypto_auth_hmacsha512256_ref -#define crypto_auth_hmacsha512256_verify crypto_auth_hmacsha512256_ref_verify +#define crypto_auth_hmacsha512256_ref crypto_auth_hmacsha512256 +#define crypto_auth_hmacsha512256_ref_verify crypto_auth_hmacsha512256_verify #endif diff --git a/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h index c60078d8..db2d90aa 100644 --- a/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h +++ b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h @@ -16,32 +16,32 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_box_curve25519xsalsa20poly1305_ref(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *,const unsigned char *); +int crypto_box_curve25519xsalsa20poly1305(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_box_curve25519xsalsa20poly1305_ref_open(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *,const unsigned char *); +int crypto_box_curve25519xsalsa20poly1305_open(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_box_curve25519xsalsa20poly1305_ref_keypair(unsigned char *,unsigned char *); +int crypto_box_curve25519xsalsa20poly1305_keypair(unsigned char *,unsigned char *); SODIUM_EXPORT -int crypto_box_curve25519xsalsa20poly1305_ref_beforenm(unsigned char *,const unsigned char *,const unsigned char *); +int crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_box_curve25519xsalsa20poly1305_ref_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_box_curve25519xsalsa20poly1305_ref_open_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_box_curve25519xsalsa20poly1305_open_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_box_curve25519xsalsa20poly1305 crypto_box_curve25519xsalsa20poly1305_ref -#define crypto_box_curve25519xsalsa20poly1305_open crypto_box_curve25519xsalsa20poly1305_ref_open -#define crypto_box_curve25519xsalsa20poly1305_keypair crypto_box_curve25519xsalsa20poly1305_ref_keypair -#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_ref crypto_box_curve25519xsalsa20poly1305 +#define crypto_box_curve25519xsalsa20poly1305_ref_open crypto_box_curve25519xsalsa20poly1305_open +#define crypto_box_curve25519xsalsa20poly1305_ref_keypair crypto_box_curve25519xsalsa20poly1305_keypair +#define crypto_box_curve25519xsalsa20poly1305_ref_beforenm crypto_box_curve25519xsalsa20poly1305_beforenm +#define crypto_box_curve25519xsalsa20poly1305_ref_afternm crypto_box_curve25519xsalsa20poly1305_afternm +#define crypto_box_curve25519xsalsa20poly1305_ref_open_afternm crypto_box_curve25519xsalsa20poly1305_open_afternm #endif diff --git a/src/libsodium/include/sodium/crypto_core_hsalsa20.h b/src/libsodium/include/sodium/crypto_core_hsalsa20.h index b4465e2c..c1063418 100644 --- a/src/libsodium/include/sodium/crypto_core_hsalsa20.h +++ b/src/libsodium/include/sodium/crypto_core_hsalsa20.h @@ -13,12 +13,12 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_core_hsalsa20_ref2(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *); +int crypto_core_hsalsa20(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_core_hsalsa20 crypto_core_hsalsa20_ref2 +#define crypto_core_hsalsa20_ref2 crypto_core_hsalsa20 #endif diff --git a/src/libsodium/include/sodium/crypto_core_salsa20.h b/src/libsodium/include/sodium/crypto_core_salsa20.h index 7bdfb2d8..84eebf2d 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa20.h +++ b/src/libsodium/include/sodium/crypto_core_salsa20.h @@ -13,12 +13,12 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_core_salsa20_ref(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *); +int crypto_core_salsa20(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_core_salsa20 crypto_core_salsa20_ref +#define crypto_core_salsa20_ref crypto_core_salsa20 #endif diff --git a/src/libsodium/include/sodium/crypto_core_salsa2012.h b/src/libsodium/include/sodium/crypto_core_salsa2012.h index b1083462..54526fa6 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa2012.h +++ b/src/libsodium/include/sodium/crypto_core_salsa2012.h @@ -13,12 +13,12 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_core_salsa2012_ref(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *); +int crypto_core_salsa2012(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_core_salsa2012 crypto_core_salsa2012_ref +#define crypto_core_salsa2012_ref crypto_core_salsa2012 #endif diff --git a/src/libsodium/include/sodium/crypto_core_salsa208.h b/src/libsodium/include/sodium/crypto_core_salsa208.h index 22ebd268..5a6183ca 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa208.h +++ b/src/libsodium/include/sodium/crypto_core_salsa208.h @@ -13,12 +13,12 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_core_salsa208_ref(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *); +int crypto_core_salsa208(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_core_salsa208 crypto_core_salsa208_ref +#define crypto_core_salsa208_ref crypto_core_salsa208 #endif diff --git a/src/libsodium/include/sodium/crypto_generichash_blake2b.h b/src/libsodium/include/sodium/crypto_generichash_blake2b.h index 02fccc03..5c7f9417 100644 --- a/src/libsodium/include/sodium/crypto_generichash_blake2b.h +++ b/src/libsodium/include/sodium/crypto_generichash_blake2b.h @@ -34,10 +34,10 @@ CRYPTO_ALIGN(64) typedef struct { #pragma pack(pop) SODIUM_EXPORT -int crypto_generichash_blake2b_ref(unsigned char *out, size_t outlen, - const unsigned char *in, - unsigned long long inlen, - const unsigned char *key, size_t keylen); +int crypto_generichash_blake2b(unsigned char *out, size_t outlen, + const unsigned char *in, + unsigned long long inlen, + const unsigned char *key, size_t keylen); SODIUM_EXPORT int crypto_generichash_blake2b_init(crypto_generichash_blake2b_state *state, @@ -58,6 +58,9 @@ int crypto_generichash_blake2b_final(crypto_generichash_blake2b_state *state, } #endif -#define crypto_generichash_blake2b crypto_generichash_blake2b_ref +#define crypto_generichash_blake2b_ref crypto_generichash_blake2b +#define crypto_generichash_blake2b_ref_init crypto_generichash_blake2b_init +#define crypto_generichash_blake2b_ref_update crypto_generichash_blake2b_update +#define crypto_generichash_blake2b_ref_final crypto_generichash_blake2b_final #endif diff --git a/src/libsodium/include/sodium/crypto_hashblocks_sha256.h b/src/libsodium/include/sodium/crypto_hashblocks_sha256.h index 2143ad02..8cb5514d 100644 --- a/src/libsodium/include/sodium/crypto_hashblocks_sha256.h +++ b/src/libsodium/include/sodium/crypto_hashblocks_sha256.h @@ -11,12 +11,12 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_hashblocks_sha256_ref(unsigned char *,const unsigned char *,unsigned long long); +int crypto_hashblocks_sha256(unsigned char *,const unsigned char *,unsigned long long); #ifdef __cplusplus } #endif -#define crypto_hashblocks_sha256 crypto_hashblocks_sha256_ref +#define crypto_hashblocks_sha256_ref crypto_hashblocks_sha256 #endif diff --git a/src/libsodium/include/sodium/crypto_hashblocks_sha512.h b/src/libsodium/include/sodium/crypto_hashblocks_sha512.h index 91fb21a0..4daf51ee 100644 --- a/src/libsodium/include/sodium/crypto_hashblocks_sha512.h +++ b/src/libsodium/include/sodium/crypto_hashblocks_sha512.h @@ -11,12 +11,12 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_hashblocks_sha512_ref(unsigned char *,const unsigned char *,unsigned long long); +int crypto_hashblocks_sha512(unsigned char *,const unsigned char *,unsigned long long); #ifdef __cplusplus } #endif -#define crypto_hashblocks_sha512 crypto_hashblocks_sha512_ref +#define crypto_hashblocks_sha512_ref crypto_hashblocks_sha512 #endif diff --git a/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h index 8d2a4733..eeca356b 100644 --- a/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h +++ b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h @@ -13,16 +13,16 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_secretbox_xsalsa20poly1305_ref(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_secretbox_xsalsa20poly1305(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_secretbox_xsalsa20poly1305_ref_open(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_secretbox_xsalsa20poly1305_open(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_secretbox_xsalsa20poly1305 crypto_secretbox_xsalsa20poly1305_ref -#define crypto_secretbox_xsalsa20poly1305_open crypto_secretbox_xsalsa20poly1305_ref_open +#define crypto_secretbox_xsalsa20poly1305_ref crypto_secretbox_xsalsa20poly1305 +#define crypto_secretbox_xsalsa20poly1305_ref_open crypto_secretbox_xsalsa20poly1305_open #endif diff --git a/src/libsodium/include/sodium/crypto_shorthash_siphash24.h b/src/libsodium/include/sodium/crypto_shorthash_siphash24.h index b419c835..322ef50b 100644 --- a/src/libsodium/include/sodium/crypto_shorthash_siphash24.h +++ b/src/libsodium/include/sodium/crypto_shorthash_siphash24.h @@ -11,12 +11,12 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_shorthash_siphash24_ref(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); +int crypto_shorthash_siphash24(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_shorthash_siphash24 crypto_shorthash_siphash24_ref +#define crypto_shorthash_siphash24_ref crypto_shorthash_siphash24 #endif diff --git a/src/libsodium/include/sodium/crypto_sign_ed25519.h b/src/libsodium/include/sodium/crypto_sign_ed25519.h index 6b74fafc..50b3de8f 100644 --- a/src/libsodium/include/sodium/crypto_sign_ed25519.h +++ b/src/libsodium/include/sodium/crypto_sign_ed25519.h @@ -13,24 +13,24 @@ extern "C" { SODIUM_EXPORT -int crypto_sign_ed25519_ref10(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *); +int crypto_sign_ed25519(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *); SODIUM_EXPORT -int crypto_sign_ed25519_ref10_open(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *); +int crypto_sign_ed25519_open(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *); SODIUM_EXPORT -int crypto_sign_ed25519_ref10_keypair(unsigned char *,unsigned char *); +int crypto_sign_ed25519_keypair(unsigned char *,unsigned char *); SODIUM_EXPORT -int crypto_sign_ed25519_ref10_seed_keypair(unsigned char *,unsigned char *,const unsigned char *); +int crypto_sign_ed25519_seed_keypair(unsigned char *,unsigned char *,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_sign_ed25519 crypto_sign_ed25519_ref10 -#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_ref10 crypto_sign_ed25519 +#define crypto_sign_ed25519_ref10_open crypto_sign_ed25519_open +#define crypto_sign_ed25519_ref10_keypair crypto_sign_ed25519_keypair +#define crypto_sign_ed25519_ref10_seed_keypair crypto_sign_ed25519_seed_keypair #endif diff --git a/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h b/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h index ad20ce9d..318d6174 100644 --- a/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h +++ b/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h @@ -12,20 +12,20 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_sign_edwards25519sha512batch_ref(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *); +int crypto_sign_edwards25519sha512batch(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *); SODIUM_EXPORT -int crypto_sign_edwards25519sha512batch_ref_open(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *); +int crypto_sign_edwards25519sha512batch_open(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *); SODIUM_EXPORT -int crypto_sign_edwards25519sha512batch_ref_keypair(unsigned char *,unsigned char *); +int crypto_sign_edwards25519sha512batch_keypair(unsigned char *,unsigned char *); #ifdef __cplusplus } #endif -#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_ref crypto_sign_edwards25519sha512batch +#define crypto_sign_edwards25519sha512batch_ref_open crypto_sign_edwards25519sha512batch_open +#define crypto_sign_edwards25519sha512batch_ref_keypair crypto_sign_edwards25519sha512batch_keypair #endif diff --git a/src/libsodium/include/sodium/crypto_stream_aes128ctr.h b/src/libsodium/include/sodium/crypto_stream_aes128ctr.h index 6a721225..dccf6a0f 100644 --- a/src/libsodium/include/sodium/crypto_stream_aes128ctr.h +++ b/src/libsodium/include/sodium/crypto_stream_aes128ctr.h @@ -13,28 +13,28 @@ extern "C" { SODIUM_EXPORT -int crypto_stream_aes128ctr_portable(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_aes128ctr(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_aes128ctr_portable_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_aes128ctr_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_aes128ctr_portable_beforenm(unsigned char *,const unsigned char *); +int crypto_stream_aes128ctr_beforenm(unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_aes128ctr_portable_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_aes128ctr_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_aes128ctr_portable_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_aes128ctr_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_stream_aes128ctr crypto_stream_aes128ctr_portable -#define crypto_stream_aes128ctr_xor crypto_stream_aes128ctr_portable_xor -#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_portable crypto_stream_aes128ctr +#define crypto_stream_aes128ctr_portable_xor crypto_stream_aes128ctr_xor +#define crypto_stream_aes128ctr_portable_beforenm crypto_stream_aes128ctr_beforenm +#define crypto_stream_aes128ctr_portable_afternm crypto_stream_aes128ctr_afternm +#define crypto_stream_aes128ctr_portable_xor_afternm crypto_stream_aes128ctr_xor_afternm #endif diff --git a/src/libsodium/include/sodium/crypto_stream_salsa20.h b/src/libsodium/include/sodium/crypto_stream_salsa20.h index 4669ee48..c97f6ba6 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa20.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa20.h @@ -11,28 +11,28 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_stream_salsa20_ref(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_salsa20(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_salsa20_ref_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_salsa20_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_salsa20_ref_beforenm(unsigned char *,const unsigned char *); +int crypto_stream_salsa20_beforenm(unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_salsa20_ref_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_salsa20_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_salsa20_ref_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_salsa20_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_stream_salsa20 crypto_stream_salsa20_ref -#define crypto_stream_salsa20_xor crypto_stream_salsa20_ref_xor -#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_ref crypto_stream_salsa20 +#define crypto_stream_salsa20_ref_xor crypto_stream_salsa20_xor +#define crypto_stream_salsa20_ref_beforenm crypto_stream_salsa20_beforenm +#define crypto_stream_salsa20_ref_afternm crypto_stream_salsa20_afternm +#define crypto_stream_salsa20_ref_xor_afternm crypto_stream_salsa20_xor_afternm #endif diff --git a/src/libsodium/include/sodium/crypto_stream_salsa2012.h b/src/libsodium/include/sodium/crypto_stream_salsa2012.h index 313aa8cd..007ca34c 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa2012.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa2012.h @@ -11,28 +11,28 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_stream_salsa2012_ref(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_salsa2012(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_salsa2012_ref_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_salsa2012_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_salsa2012_ref_beforenm(unsigned char *,const unsigned char *); +int crypto_stream_salsa2012_beforenm(unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_salsa2012_ref_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_salsa2012_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_salsa2012_ref_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_salsa2012_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_stream_salsa2012 crypto_stream_salsa2012_ref -#define crypto_stream_salsa2012_xor crypto_stream_salsa2012_ref_xor -#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_ref crypto_stream_salsa2012 +#define crypto_stream_salsa2012_ref_xor crypto_stream_salsa2012_xor +#define crypto_stream_salsa2012_ref_beforenm crypto_stream_salsa2012_beforenm +#define crypto_stream_salsa2012_ref_afternm crypto_stream_salsa2012_afternm +#define crypto_stream_salsa2012_ref_xor_afternm crypto_stream_salsa2012_xor_afternm #endif diff --git a/src/libsodium/include/sodium/crypto_stream_salsa208.h b/src/libsodium/include/sodium/crypto_stream_salsa208.h index 9ccbc7dd..06689385 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa208.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa208.h @@ -11,28 +11,28 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_stream_salsa208_ref(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_salsa208(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_salsa208_ref_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_salsa208_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_salsa208_ref_beforenm(unsigned char *,const unsigned char *); +int crypto_stream_salsa208_beforenm(unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_salsa208_ref_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_salsa208_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_salsa208_ref_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_salsa208_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_stream_salsa208 crypto_stream_salsa208_ref -#define crypto_stream_salsa208_xor crypto_stream_salsa208_ref_xor -#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_ref crypto_stream_salsa208 +#define crypto_stream_salsa208_ref_xor crypto_stream_salsa208_xor +#define crypto_stream_salsa208_ref_beforenm crypto_stream_salsa208_beforenm +#define crypto_stream_salsa208_ref_afternm crypto_stream_salsa208_afternm +#define crypto_stream_salsa208_ref_xor_afternm crypto_stream_salsa208_xor_afternm #endif diff --git a/src/libsodium/include/sodium/crypto_stream_xsalsa20.h b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h index 3ecbbf2c..f792abca 100644 --- a/src/libsodium/include/sodium/crypto_stream_xsalsa20.h +++ b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h @@ -11,28 +11,28 @@ extern "C" { #endif SODIUM_EXPORT -int crypto_stream_xsalsa20_ref(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_xsalsa20(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_xsalsa20_ref_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_xsalsa20_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_xsalsa20_ref_beforenm(unsigned char *,const unsigned char *); +int crypto_stream_xsalsa20_beforenm(unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_xsalsa20_ref_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_xsalsa20_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); SODIUM_EXPORT -int crypto_stream_xsalsa20_ref_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +int crypto_stream_xsalsa20_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); #ifdef __cplusplus } #endif -#define crypto_stream_xsalsa20 crypto_stream_xsalsa20_ref -#define crypto_stream_xsalsa20_xor crypto_stream_xsalsa20_ref_xor -#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_ref crypto_stream_xsalsa20 +#define crypto_stream_xsalsa20_ref_xor crypto_stream_xsalsa20_xor +#define crypto_stream_xsalsa20_ref_beforenm crypto_stream_xsalsa20_beforenm +#define crypto_stream_xsalsa20_ref_afternm crypto_stream_xsalsa20_afternm +#define crypto_stream_xsalsa20_ref_xor_afternm crypto_stream_xsalsa20_xor_afternm #endif