From 94437ae121eda5e0ffd33101299c2777d82f2353 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Wed, 4 Nov 2015 16:45:14 +0100
Subject: [PATCH] Enable the sandy2x implementation on CPUs with AVX support

---
 .../curve25519/scalarmult_curve25519.c          | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c b/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c
index ab381bf2..21420723 100644
--- a/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c
+++ b/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c
@@ -1,6 +1,7 @@
 
 #include "crypto_scalarmult_curve25519.h"
 #include "scalarmult_curve25519.h"
+#include "runtime.h"
 
 #ifdef HAVE_AMD64_ASM
 # include "sandy2x/curve25519_sandy2x.h"
@@ -39,3 +40,19 @@ crypto_scalarmult_curve25519_scalarbytes(void)
 {
     return crypto_scalarmult_curve25519_SCALARBYTES;
 }
+
+int
+_crypto_scalarmult_curve25519_pick_best_implementation(void)
+{
+#ifdef HAVE_TI_MODE
+    implementation = &crypto_scalarmult_curve25519_donna_c64_implementation;
+#else
+    implementation = &crypto_scalarmult_curve25519_ref10_implementation;
+#endif
+#ifdef HAVE_AMD64_ASM
+    if (sodium_runtime_has_avx()) {
+        implementation = &crypto_scalarmult_curve25519_sandy2x_implementation;
+    }
+#endif
+    return 0;
+}