From 313225f68af4c6cfb6a9742d486ca368c9e16c77 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 27 Jun 2017 16:23:12 +0200
Subject: [PATCH] Group pick_best_implementation_*() prototypes in a private
 header

---
 src/libsodium/include/sodium/crypto_generichash_blake2b.h   | 4 ----
 src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h  | 4 ----
 src/libsodium/include/sodium/crypto_scalarmult_curve25519.h | 4 ----
 src/libsodium/include/sodium/crypto_stream_chacha20.h       | 4 ----
 src/libsodium/include/sodium/crypto_stream_salsa20.h        | 4 ----
 src/libsodium/include/sodium/private/implementations.h      | 5 +++++
 6 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/libsodium/include/sodium/crypto_generichash_blake2b.h b/src/libsodium/include/sodium/crypto_generichash_blake2b.h
index 5443c483..9326a04a 100644
--- a/src/libsodium/include/sodium/crypto_generichash_blake2b.h
+++ b/src/libsodium/include/sodium/crypto_generichash_blake2b.h
@@ -110,10 +110,6 @@ int crypto_generichash_blake2b_final(crypto_generichash_blake2b_state *state,
 SODIUM_EXPORT
 void crypto_generichash_blake2b_keygen(unsigned char k[crypto_generichash_blake2b_KEYBYTES]);
 
-/* ------------------------------------------------------------------------- */
-
-int _crypto_generichash_blake2b_pick_best_implementation(void);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h
index 1615c905..4b89c4f0 100644
--- a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h
+++ b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h
@@ -60,10 +60,6 @@ int crypto_onetimeauth_poly1305_final(crypto_onetimeauth_poly1305_state *state,
 SODIUM_EXPORT
 void crypto_onetimeauth_poly1305_keygen(unsigned char k[crypto_onetimeauth_poly1305_KEYBYTES]);
 
-/* ------------------------------------------------------------------------- */
-
-int _crypto_onetimeauth_poly1305_pick_best_implementation(void);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h b/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h
index 953f8923..d96840c7 100644
--- a/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h
+++ b/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h
@@ -25,10 +25,6 @@ int crypto_scalarmult_curve25519(unsigned char *q, const unsigned char *n,
 SODIUM_EXPORT
 int crypto_scalarmult_curve25519_base(unsigned char *q, const unsigned char *n);
 
-/* ------------------------------------------------------------------------- */
-
-int _crypto_scalarmult_curve25519_pick_best_implementation(void);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/libsodium/include/sodium/crypto_stream_chacha20.h b/src/libsodium/include/sodium/crypto_stream_chacha20.h
index cf3ffe89..352b9290 100644
--- a/src/libsodium/include/sodium/crypto_stream_chacha20.h
+++ b/src/libsodium/include/sodium/crypto_stream_chacha20.h
@@ -76,10 +76,6 @@ int crypto_stream_chacha20_ietf_xor_ic(unsigned char *c, const unsigned char *m,
 SODIUM_EXPORT
 void crypto_stream_chacha20_ietf_keygen(unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES]);
 
-/* ------------------------------------------------------------------------- */
-
-int _crypto_stream_chacha20_pick_best_implementation(void);
-
 /* Aliases */
 
 #define crypto_stream_chacha20_IETF_KEYBYTES crypto_stream_chacha20_ietf_KEYBYTES
diff --git a/src/libsodium/include/sodium/crypto_stream_salsa20.h b/src/libsodium/include/sodium/crypto_stream_salsa20.h
index 741140eb..961e5c1c 100644
--- a/src/libsodium/include/sodium/crypto_stream_salsa20.h
+++ b/src/libsodium/include/sodium/crypto_stream_salsa20.h
@@ -46,10 +46,6 @@ int crypto_stream_salsa20_xor_ic(unsigned char *c, const unsigned char *m,
 SODIUM_EXPORT
 void crypto_stream_salsa20_keygen(unsigned char k[crypto_stream_salsa20_KEYBYTES]);
 
-/* ------------------------------------------------------------------------- */
-
-int _crypto_stream_salsa20_pick_best_implementation(void);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/libsodium/include/sodium/private/implementations.h b/src/libsodium/include/sodium/private/implementations.h
index 7790e932..c7237f85 100644
--- a/src/libsodium/include/sodium/private/implementations.h
+++ b/src/libsodium/include/sodium/private/implementations.h
@@ -1,6 +1,11 @@
 #ifndef implementations_H
 #define implementations_H
 
+int _crypto_generichash_blake2b_pick_best_implementation(void);
+int _crypto_onetimeauth_poly1305_pick_best_implementation(void);
 int _crypto_pwhash_argon2_pick_best_implementation(void);
+int _crypto_scalarmult_curve25519_pick_best_implementation(void);
+int _crypto_stream_chacha20_pick_best_implementation(void);
+int _crypto_stream_salsa20_pick_best_implementation(void);
 
 #endif