Drop the _api suffixes

src/libsodium/Makefile.am

@@ -4,13 +4,13 @@ lib_LTLIBRARIES = \
 libsodium_la_SOURCES = \
 	crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c \
 	crypto_auth/crypto_auth.c \
-	crypto_auth/hmacsha256/auth_hmacsha256_api.c \
+	crypto_auth/hmacsha256/auth_hmacsha256.c \
 	crypto_auth/hmacsha256/cp/hmac_hmacsha256.c \
 	crypto_auth/hmacsha256/cp/verify_hmacsha256.c \
-	crypto_auth/hmacsha512/auth_hmacsha512_api.c \
+	crypto_auth/hmacsha512/auth_hmacsha512.c \
 	crypto_auth/hmacsha512/cp/hmac_hmacsha512.c \
 	crypto_auth/hmacsha512/cp/verify_hmacsha512.c \
-	crypto_auth/hmacsha512256/auth_hmacsha512256_api.c \
+	crypto_auth/hmacsha512256/auth_hmacsha512256.c \
 	crypto_auth/hmacsha512256/cp/hmac_hmacsha512256.c \
 	crypto_auth/hmacsha512256/cp/verify_hmacsha512256.c \
 	crypto_box/crypto_box.c \
@@ -20,12 +20,12 @@ libsodium_la_SOURCES = \
 	crypto_core/curve25519/ref10/base.h \
 	crypto_core/curve25519/ref10/base2.h \
 	crypto_core/curve25519/ref10/curve25519_ref10.c \
-	crypto_core/hsalsa20/ref2/core_hsalsa20.c \
-	crypto_core/hsalsa20/core_hsalsa20_api.c \
-	crypto_core/salsa20/ref/core_salsa20.c \
-	crypto_core/salsa20/core_salsa20_api.c \
+	crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c \
+	crypto_core/hsalsa20/core_hsalsa20.c \
+	crypto_core/salsa20/ref/core_salsa20_ref.c \
+	crypto_core/salsa20/core_salsa20.c \
 	crypto_generichash/crypto_generichash.c \
-	crypto_generichash/blake2b/generichash_blake2_api.c \
+	crypto_generichash/blake2b/generichash_blake2.c \
 	crypto_generichash/blake2b/ref/blake2-impl.h \
 	crypto_generichash/blake2b/ref/blake2.h \
 	crypto_generichash/blake2b/ref/blake2b-compress-ref.c \
@@ -35,12 +35,12 @@ libsodium_la_SOURCES = \
 	crypto_generichash/blake2b/ref/blake2b-ref.c \
 	crypto_generichash/blake2b/ref/generichash_blake2b.c \
 	crypto_hash/crypto_hash.c \
-	crypto_hash/sha256/hash_sha256_api.c \
-	crypto_hash/sha256/cp/hash_sha256.c \
-	crypto_hash/sha512/hash_sha512_api.c \
-	crypto_hash/sha512/cp/hash_sha512.c \
-	crypto_kdf/crypto_kdf.c \
+	crypto_hash/sha256/hash_sha256.c \
+	crypto_hash/sha256/cp/hash_sha256_cp.c \
+	crypto_hash/sha512/hash_sha512.c \
+	crypto_hash/sha512/cp/hash_sha512_cp.c \
 	crypto_kdf/blake2b/kdf_blake2b.c \
+	crypto_kdf/crypto_kdf.c \
 	crypto_onetimeauth/crypto_onetimeauth.c \
 	crypto_onetimeauth/poly1305/onetimeauth_poly1305.c \
 	crypto_onetimeauth/poly1305/onetimeauth_poly1305.h \
@@ -75,10 +75,10 @@ libsodium_la_SOURCES = \
 	crypto_secretbox/crypto_secretbox_easy.c \
 	crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305.c \
 	crypto_shorthash/crypto_shorthash.c \
-	crypto_shorthash/siphash24/shorthash_siphash24_api.c \
-	crypto_shorthash/siphash24/ref/shorthash_siphash24.c \
+	crypto_shorthash/siphash24/shorthash_siphash24.c \
+	crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c \
 	crypto_sign/crypto_sign.c \
-	crypto_sign/ed25519/sign_ed25519_api.c \
+	crypto_sign/ed25519/sign_ed25519.c \
 	crypto_sign/ed25519/ref10/keypair.c \
 	crypto_sign/ed25519/ref10/open.c \
 	crypto_sign/ed25519/ref10/sign.c \
@@ -87,7 +87,7 @@ libsodium_la_SOURCES = \
 	crypto_stream/chacha20/ref/stream_chacha20_ref.h \
 	crypto_stream/chacha20/ref/stream_chacha20_ref.c \
 	crypto_stream/crypto_stream.c \
-	crypto_stream/salsa20/stream_salsa20_api.c \
+	crypto_stream/salsa20/stream_salsa20.c \
 	crypto_stream/xsalsa20/stream_xsalsa20.c \
 	crypto_verify/sodium/verify.c \
 	include/sodium/private/common.h \
@@ -163,29 +163,29 @@ libsodium_la_SOURCES += \
 	crypto_box/curve25519xchacha20poly1305/box_curve25519xchacha20poly1305.c \
 	crypto_core/hchacha20/core_hchacha20.c \
 	crypto_core/hchacha20/core_hchacha20.h \
-	crypto_core/salsa2012/ref/core_salsa2012.c \
-	crypto_core/salsa2012/core_salsa2012_api.c \
-	crypto_core/salsa208/ref/core_salsa208.c \
-	crypto_core/salsa208/core_salsa208_api.c \
+	crypto_core/salsa2012/core_salsa2012.c \
+	crypto_core/salsa2012/ref/core_salsa2012_ref.c \
+	crypto_core/salsa208/core_salsa208.c \
+	crypto_core/salsa208/ref/core_salsa208_ref.c \
 	crypto_secretbox/xchacha20poly1305/secretbox_xchacha20poly1305.c \
 	crypto_sign/ed25519/ref10/obsolete.c \
-	crypto_stream/aes128ctr/portable/afternm_aes128ctr.c \
-	crypto_stream/aes128ctr/stream_aes128ctr_api.c \
-	crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c \
-	crypto_stream/aes128ctr/portable/common.h \
-	crypto_stream/aes128ctr/portable/consts.h \
-	crypto_stream/aes128ctr/portable/consts_aes128ctr.c \
-	crypto_stream/aes128ctr/portable/int128.h \
-	crypto_stream/aes128ctr/portable/int128_aes128ctr.c \
-	crypto_stream/aes128ctr/portable/stream_aes128ctr.c \
-	crypto_stream/aes128ctr/portable/types.h \
-	crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c \
-	crypto_stream/salsa2012/stream_salsa2012_api.c \
-	crypto_stream/salsa2012/ref/stream_salsa2012.c \
+	crypto_stream/aes128ctr/nacl/afternm_aes128ctr.c \
+	crypto_stream/aes128ctr/nacl/beforenm_aes128ctr.c \
+	crypto_stream/aes128ctr/nacl/common.h \
+	crypto_stream/aes128ctr/nacl/consts.h \
+	crypto_stream/aes128ctr/nacl/consts_aes128ctr.c \
+	crypto_stream/aes128ctr/nacl/int128.h \
+	crypto_stream/aes128ctr/nacl/int128_aes128ctr.c \
+	crypto_stream/aes128ctr/nacl/stream_aes128ctr_nacl.c \
+	crypto_stream/aes128ctr/nacl/types.h \
+	crypto_stream/aes128ctr/nacl/xor_afternm_aes128ctr.c \
+	crypto_stream/aes128ctr/stream_aes128ctr.c \
+	crypto_stream/salsa2012/ref/stream_salsa2012_ref.c \
 	crypto_stream/salsa2012/ref/xor_salsa2012.c \
-	crypto_stream/salsa208/stream_salsa208_api.c \
-	crypto_stream/salsa208/ref/stream_salsa208.c \
+	crypto_stream/salsa2012/stream_salsa2012.c \
+	crypto_stream/salsa208/ref/stream_salsa208_ref.c \
 	crypto_stream/salsa208/ref/xor_salsa208.c \
+	crypto_stream/salsa208/stream_salsa208.c \
 	crypto_stream/xchacha20/stream_xchacha20.c
 endif