From fade3b640ce66dfa2f27d560218715cde8e2b111 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Fri, 19 Apr 2013 18:09:19 +0200
Subject: [PATCH] crypto_scalarmult wrappers

---
 src/libsodium/Makefile.am                        |  1 +
 .../crypto_scalarmult/crypto_scalarmult.c        | 16 ++++++++++++++++
 src/libsodium/include/sodium/crypto_scalarmult.h |  9 +++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 src/libsodium/crypto_scalarmult/crypto_scalarmult.c

diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index 01160669..97470413 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -47,6 +47,7 @@ libsodium_la_SOURCES = \
 	crypto_onetimeauth/poly1305/ref/api.h \
 	crypto_onetimeauth/poly1305/ref/auth_poly1305_ref.c \
 	crypto_onetimeauth/poly1305/ref/verify_poly1305_ref.c \
+	crypto_scalarmult/crypto_scalarmult.c \
 	crypto_secretbox/xsalsa20poly1305/ref/api.h \
 	crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c \
 	crypto_shorthash/siphash24/ref/api.h \
diff --git a/src/libsodium/crypto_scalarmult/crypto_scalarmult.c b/src/libsodium/crypto_scalarmult/crypto_scalarmult.c
new file mode 100644
index 00000000..eac58f3d
--- /dev/null
+++ b/src/libsodium/crypto_scalarmult/crypto_scalarmult.c
@@ -0,0 +1,16 @@
+
+#include "crypto_scalarmult.h"
+
+int
+crypto_scalarmult_base(unsigned char *q, const unsigned char *n)
+{
+    return crypto_scalarmult_curve25519_base(q, n);
+}
+
+int
+crypto_scalarmult(unsigned char *q, const unsigned char *n,
+                  const unsigned char *p)
+{
+    return crypto_scalarmult_curve25519(q, n, p);
+}
+
diff --git a/src/libsodium/include/sodium/crypto_scalarmult.h b/src/libsodium/include/sodium/crypto_scalarmult.h
index 2ce18c56..0c4c87a2 100644
--- a/src/libsodium/include/sodium/crypto_scalarmult.h
+++ b/src/libsodium/include/sodium/crypto_scalarmult.h
@@ -1,10 +1,15 @@
 #ifndef crypto_scalarmult_H
 #define crypto_scalarmult_H
 
+#include "crypto_scalarmult_curve25519.h"
+
 #define crypto_scalarmult_BYTES crypto_scalarmult_curve25519_BYTES
 #define crypto_scalarmult_SCALARBYTES crypto_scalarmult_curve25519_SCALARBYTES
-#define crypto_scalarmult crypto_scalarmult_curve25519
-#define crypto_scalarmult_base crypto_scalarmult_curve25519_base
 #define crypto_scalarmult_PRIMITIVE "curve25519"
 
+int crypto_scalarmult_base(unsigned char *q, const unsigned char *n);
+
+int crypto_scalarmult(unsigned char *q, const unsigned char *n,
+                      const unsigned char *p);
+
 #endif