From 4a9a9ffeb879b5f135f88c4daf938316af391716 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sun, 21 Apr 2013 16:34:50 +0200
Subject: [PATCH] Wrap crypto_scalarmult macros.

---
 .../crypto_scalarmult/crypto_scalarmult.c      | 18 ++++++++++++++++++
 .../include/sodium/crypto_scalarmult.h         | 15 +++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/libsodium/crypto_scalarmult/crypto_scalarmult.c b/src/libsodium/crypto_scalarmult/crypto_scalarmult.c
index eac58f3d..1f69316a 100644
--- a/src/libsodium/crypto_scalarmult/crypto_scalarmult.c
+++ b/src/libsodium/crypto_scalarmult/crypto_scalarmult.c
@@ -1,6 +1,24 @@
 
 #include "crypto_scalarmult.h"
 
+size_t
+crypto_scalarmult_bytes(void)
+{
+    return crypto_scalarmult_BYTES;
+}
+    
+size_t
+crypto_scalarmult_scalarbytes(void)
+{
+    return crypto_scalarmult_SCALARBYTES;
+}
+
+const char *
+crypto_scalarmult_primitive(void)
+{
+    return crypto_scalarmult_PRIMITIVE;
+}
+
 int
 crypto_scalarmult_base(unsigned char *q, const unsigned char *n)
 {
diff --git a/src/libsodium/include/sodium/crypto_scalarmult.h b/src/libsodium/include/sodium/crypto_scalarmult.h
index 3df0b27f..9e3b4596 100644
--- a/src/libsodium/include/sodium/crypto_scalarmult.h
+++ b/src/libsodium/include/sodium/crypto_scalarmult.h
@@ -1,16 +1,23 @@
 #ifndef crypto_scalarmult_H
 #define crypto_scalarmult_H
 
-#include "crypto_scalarmult_curve25519.h"
+#include <stdlib.h>
 
-#define crypto_scalarmult_BYTES crypto_scalarmult_curve25519_BYTES
-#define crypto_scalarmult_SCALARBYTES crypto_scalarmult_curve25519_SCALARBYTES
-#define crypto_scalarmult_PRIMITIVE "curve25519"
+#include "crypto_scalarmult_curve25519.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define crypto_scalarmult_BYTES crypto_scalarmult_curve25519_BYTES
+size_t  crypto_scalarmult_bytes(void);
+    
+#define crypto_scalarmult_SCALARBYTES crypto_scalarmult_curve25519_SCALARBYTES
+size_t  crypto_scalarmult_scalarbytes(void);
+
+#define crypto_scalarmult_PRIMITIVE "curve25519"
+const char *crypto_scalarmult_primitive(void);
+
 int crypto_scalarmult_base(unsigned char *q, const unsigned char *n);
 
 int crypto_scalarmult(unsigned char *q, const unsigned char *n,