From 03196c95501d7f7b79bd44fcf6597ff5e1d02044 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Fri, 19 Apr 2013 14:37:12 +0200
Subject: [PATCH] Avoid duplicate crypto_box.h files

---
 src/libsodium/Makefile.am                     |  2 +-
 .../ref/after_curve25519xsalsa20poly1305.c    |  2 +-
 .../ref/before_curve25519xsalsa20poly1305.c   |  2 +-
 .../ref/box_curve25519xsalsa20poly1305.c      |  2 +-
 .../ref/crypto_box.h                          | 23 -------------------
 .../ref/keypair_curve25519xsalsa20poly1305.c  |  2 +-
 6 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/crypto_box.h

diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index f15605b7..aaac6d1a 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -70,10 +70,10 @@ libsodium_la_SOURCES = \
 	crypto_sign/edwards25519sha512batch/ref/sign_edwards25519sha512batch.c \
 	crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c \
 	crypto_secretbox/xsalsa20poly1305/ref/crypto_secretbox.h \
+	crypto_box/curve25519xsalsa20poly1305/ref/api.h \
 	crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c \
 	crypto_box/curve25519xsalsa20poly1305/ref/before_curve25519xsalsa20poly1305.c \
 	crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c \
-	crypto_box/curve25519xsalsa20poly1305/ref/crypto_box.h \
 	crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c \
 	crypto_sign/ed25519/ref10/base.h \
 	crypto_sign/ed25519/ref10/base2.h \
diff --git a/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c
index eb243e22..a830936b 100644
--- a/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c
+++ b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c
@@ -1,5 +1,5 @@
+#include "api.h"
 #include "crypto_secretbox_xsalsa20poly1305.h"
-#include "crypto_box.h"
 
 int crypto_box_afternm(
   unsigned char *c,
diff --git a/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/before_curve25519xsalsa20poly1305.c b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/before_curve25519xsalsa20poly1305.c
index 279bb12a..5bf8bb88 100644
--- a/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/before_curve25519xsalsa20poly1305.c
+++ b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/before_curve25519xsalsa20poly1305.c
@@ -1,6 +1,6 @@
+#include "api.h"
 #include "crypto_core_hsalsa20.h"
 #include "crypto_scalarmult_curve25519.h"
-#include "crypto_box.h"
 
 static const unsigned char sigma[16] = "expand 32-byte k";
 static const unsigned char n[16] = {0};
diff --git a/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c
index 81ff72e2..4b75ece8 100644
--- a/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c
+++ b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c
@@ -1,4 +1,4 @@
-#include "crypto_box.h"
+#include "api.h"
 
 int crypto_box(
   unsigned char *c,
diff --git a/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/crypto_box.h b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/crypto_box.h
deleted file mode 100644
index 40273020..00000000
--- a/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/crypto_box.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef crypto_box_H
-#define crypto_box_H
-
-#include "crypto_box_curve25519xsalsa20poly1305.h"
-
-#define crypto_box crypto_box_curve25519xsalsa20poly1305
-#define crypto_box_open crypto_box_curve25519xsalsa20poly1305_open
-#define crypto_box_keypair crypto_box_curve25519xsalsa20poly1305_keypair
-#define crypto_box_beforenm crypto_box_curve25519xsalsa20poly1305_beforenm
-#define crypto_box_afternm crypto_box_curve25519xsalsa20poly1305_afternm
-#define crypto_box_open_afternm crypto_box_curve25519xsalsa20poly1305_open_afternm
-#define crypto_box_PUBLICKEYBYTES crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES
-#define crypto_box_SECRETKEYBYTES crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES
-#define crypto_box_BEFORENMBYTES crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES
-#define crypto_box_NONCEBYTES crypto_box_curve25519xsalsa20poly1305_NONCEBYTES
-#define crypto_box_ZEROBYTES crypto_box_curve25519xsalsa20poly1305_ZEROBYTES
-#define crypto_box_BOXZEROBYTES crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES
-#define crypto_box_MACBYTES (crypto_box_ZEROBYTES - crypto_box_BOXZEROBYTES)
-#define crypto_box_PRIMITIVE "curve25519xsalsa20poly1305"
-#define crypto_box_IMPLEMENTATION crypto_box_curve25519xsalsa20poly1305_IMPLEMENTATION
-#define crypto_box_VERSION crypto_box_curve25519xsalsa20poly1305_VERSION
-
-#endif
diff --git a/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c
index 233bc950..69fb1cfc 100644
--- a/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c
+++ b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c
@@ -1,5 +1,5 @@
 #include "crypto_scalarmult_curve25519.h"
-#include "crypto_box.h"
+#include "api.h"
 #include "randombytes.h"
 
 int crypto_box_keypair(