From d6636dbc7ae41bcd639404b8673a7c60bba35785 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 19 Apr 2013 14:47:20 +0200 Subject: [PATCH] Avoid duplicate crypto_secretbox.h --- src/libsodium/Makefile.am | 2 +- .../xsalsa20poly1305/ref/{crypto_secretbox.h => api.h} | 0 .../xsalsa20poly1305/ref/box_xsalsa20poly1305.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/{crypto_secretbox.h => api.h} (100%) diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index 2b613fdc..aa2d2982 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -68,8 +68,8 @@ libsodium_la_SOURCES = \ crypto_sign/edwards25519sha512batch/ref/sc25519.h \ crypto_sign/edwards25519sha512batch/ref/sc25519_edwards25519sha512batch.c \ crypto_sign/edwards25519sha512batch/ref/sign_edwards25519sha512batch.c \ + crypto_secretbox/xsalsa20poly1305/ref/api.h \ 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 \ diff --git a/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/crypto_secretbox.h b/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/api.h similarity index 100% rename from src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/crypto_secretbox.h rename to src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/api.h diff --git a/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c b/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c index f1abb06f..f68334ef 100644 --- a/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c +++ b/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c @@ -1,6 +1,6 @@ +#include "api.h" #include "crypto_onetimeauth_poly1305.h" #include "crypto_stream_xsalsa20.h" -#include "crypto_secretbox.h" int crypto_secretbox( unsigned char *c,