From 6dd19c1665dbd710844d3263911534ff4027f0e3 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sun, 21 Apr 2013 17:34:14 +0200
Subject: [PATCH] Wrap crypto_secretbox macros

---
 .../crypto_scalarmult/crypto_scalarmult.c     |  2 +-
 .../crypto_secretbox/crypto_secretbox.c       | 30 +++++++++++++++++++
 .../include/sodium/crypto_scalarmult.h        |  2 +-
 .../include/sodium/crypto_secretbox.h         | 23 ++++++++++----
 4 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/src/libsodium/crypto_scalarmult/crypto_scalarmult.c b/src/libsodium/crypto_scalarmult/crypto_scalarmult.c
index 1f69316a..25d7397f 100644
--- a/src/libsodium/crypto_scalarmult/crypto_scalarmult.c
+++ b/src/libsodium/crypto_scalarmult/crypto_scalarmult.c
@@ -6,7 +6,7 @@ crypto_scalarmult_bytes(void)
 {
     return crypto_scalarmult_BYTES;
 }
-    
+
 size_t
 crypto_scalarmult_scalarbytes(void)
 {
diff --git a/src/libsodium/crypto_secretbox/crypto_secretbox.c b/src/libsodium/crypto_secretbox/crypto_secretbox.c
index c020da3f..06801ee1 100644
--- a/src/libsodium/crypto_secretbox/crypto_secretbox.c
+++ b/src/libsodium/crypto_secretbox/crypto_secretbox.c
@@ -1,6 +1,36 @@
 
 #include "crypto_secretbox.h"
 
+size_t
+crypto_secretbox_keybytes(void)
+{
+    return crypto_secretbox_KEYBYTES;
+}
+
+size_t
+crypto_secretbox_noncebytes(void)
+{
+    return crypto_secretbox_NONCEBYTES;
+}
+
+size_t
+crypto_secretbox_zerobytes(void)
+{
+    return crypto_secretbox_ZEROBYTES;
+}
+
+size_t
+crypto_secretbox_boxzerobytes(void)
+{
+    return crypto_secretbox_BOXZEROBYTES;
+}
+
+const char *
+crypto_secretbox_primitive(void)
+{
+    return crypto_secretbox_PRIMITIVE;
+}
+
 int
 crypto_secretbox(unsigned char *c, const unsigned char *m,
                  unsigned long long mlen, const unsigned char *n,
diff --git a/src/libsodium/include/sodium/crypto_scalarmult.h b/src/libsodium/include/sodium/crypto_scalarmult.h
index 9e3b4596..c101a2fd 100644
--- a/src/libsodium/include/sodium/crypto_scalarmult.h
+++ b/src/libsodium/include/sodium/crypto_scalarmult.h
@@ -11,7 +11,7 @@ extern "C" {
 
 #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);
 
diff --git a/src/libsodium/include/sodium/crypto_secretbox.h b/src/libsodium/include/sodium/crypto_secretbox.h
index 23ba411c..08e871c4 100644
--- a/src/libsodium/include/sodium/crypto_secretbox.h
+++ b/src/libsodium/include/sodium/crypto_secretbox.h
@@ -1,18 +1,29 @@
 #ifndef crypto_secretbox_H
 #define crypto_secretbox_H
 
-#include "crypto_secretbox_xsalsa20poly1305.h"
+#include <stdlib.h>
 
-#define crypto_secretbox_KEYBYTES crypto_secretbox_xsalsa20poly1305_KEYBYTES
-#define crypto_secretbox_NONCEBYTES crypto_secretbox_xsalsa20poly1305_NONCEBYTES
-#define crypto_secretbox_ZEROBYTES crypto_secretbox_xsalsa20poly1305_ZEROBYTES
-#define crypto_secretbox_BOXZEROBYTES crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES
-#define crypto_secretbox_PRIMITIVE "xsalsa20poly1305"
+#include "crypto_secretbox_xsalsa20poly1305.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define crypto_secretbox_KEYBYTES crypto_secretbox_xsalsa20poly1305_KEYBYTES
+size_t  crypto_secretbox_keybytes(void);
+
+#define crypto_secretbox_NONCEBYTES crypto_secretbox_xsalsa20poly1305_NONCEBYTES
+size_t  crypto_secretbox_noncebytes(void);
+
+#define crypto_secretbox_ZEROBYTES crypto_secretbox_xsalsa20poly1305_ZEROBYTES
+size_t  crypto_secretbox_zerobytes(void);
+
+#define crypto_secretbox_BOXZEROBYTES crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES
+size_t  crypto_secretbox_boxzerobytes(void);
+
+#define crypto_secretbox_PRIMITIVE "xsalsa20poly1305"
+const char *crypto_secretbox_primitive(void);
+
 int crypto_secretbox(unsigned char *c, const unsigned char *m,
                      unsigned long long mlen, const unsigned char *n,
                      const unsigned char *k);