From 18910cf43ad85b91be96387d7980c65b269e17fb Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Wed, 4 Nov 2015 16:56:47 +0100
Subject: [PATCH] Let sodium_init() pick the fastest curve25519 implementation

---
 src/libsodium/include/sodium/crypto_scalarmult_curve25519.h | 4 ++++
 src/libsodium/sodium/core.c                                 | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h b/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h
index c75d2242..4cd622e3 100644
--- a/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h
+++ b/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h
@@ -24,6 +24,10 @@ 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/sodium/core.c b/src/libsodium/sodium/core.c
index d29a0839..aaca4733 100644
--- a/src/libsodium/sodium/core.c
+++ b/src/libsodium/sodium/core.c
@@ -2,6 +2,7 @@
 #include "core.h"
 #include "crypto_generichash.h"
 #include "crypto_onetimeauth.h"
+#include "crypto_scalarmult.h"
 #include "randombytes.h"
 #include "runtime.h"
 #include "utils.h"
@@ -19,6 +20,7 @@ sodium_init(void)
     _sodium_alloc_init();
     _crypto_generichash_blake2b_pick_best_implementation();
     _crypto_onetimeauth_poly1305_pick_best_implementation();
+    _crypto_scalarmult_curve25519_pick_best_implementation();
     initialized = 1;
 
     return 0;