From 24bd4137e9c861ae9c74e88b13247ff10a2b4aca Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 19 Apr 2013 14:39:38 +0200 Subject: [PATCH] Avoid duplicate crypto_core.h definitions --- src/libsodium/Makefile.am | 8 ++++---- .../crypto_core/hsalsa20/ref2/{crypto_core.h => api.h} | 0 src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c | 2 +- .../crypto_core/salsa20/ref/{crypto_core.h => api.h} | 0 src/libsodium/crypto_core/salsa20/ref/core_salsa20.c | 2 +- .../crypto_core/salsa2012/ref/{crypto_core.h => api.h} | 0 src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c | 2 +- .../crypto_core/salsa208/ref/{crypto_core.h => api.h} | 0 src/libsodium/crypto_core/salsa208/ref/core_salsa208.c | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename src/libsodium/crypto_core/hsalsa20/ref2/{crypto_core.h => api.h} (100%) rename src/libsodium/crypto_core/salsa20/ref/{crypto_core.h => api.h} (100%) rename src/libsodium/crypto_core/salsa2012/ref/{crypto_core.h => api.h} (100%) rename src/libsodium/crypto_core/salsa208/ref/{crypto_core.h => api.h} (100%) diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index aaac6d1a..1e5b4a14 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -4,13 +4,13 @@ lib_LTLIBRARIES = \ libsodium_la_SOURCES = \ crypto_core/hsalsa20/ref2/core_hsalsa20.c \ - crypto_core/hsalsa20/ref2/crypto_core.h \ + crypto_core/hsalsa20/ref2/api.h \ crypto_core/salsa20/ref/core_salsa20.c \ - crypto_core/salsa20/ref/crypto_core.h \ + crypto_core/salsa20/ref/api.h \ crypto_core/salsa2012/ref/core_salsa2012.c \ - crypto_core/salsa2012/ref/crypto_core.h \ + crypto_core/salsa2012/ref/api.h \ crypto_core/salsa208/ref/core_salsa208.c \ - crypto_core/salsa208/ref/crypto_core.h \ + crypto_core/salsa208/ref/api.h \ crypto_generichash/blake2/ref/blake2-impl.h \ crypto_generichash/blake2/ref/blake2.h \ crypto_generichash/blake2/ref/blake2b-ref.c \ diff --git a/src/libsodium/crypto_core/hsalsa20/ref2/crypto_core.h b/src/libsodium/crypto_core/hsalsa20/ref2/api.h similarity index 100% rename from src/libsodium/crypto_core/hsalsa20/ref2/crypto_core.h rename to src/libsodium/crypto_core/hsalsa20/ref2/api.h diff --git a/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c b/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c index 9a9a8c7c..c9bd359e 100644 --- a/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c +++ b/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c @@ -4,7 +4,7 @@ D. J. Bernstein Public domain. */ -#include "crypto_core.h" +#include "api.h" #define ROUNDS 20 diff --git a/src/libsodium/crypto_core/salsa20/ref/crypto_core.h b/src/libsodium/crypto_core/salsa20/ref/api.h similarity index 100% rename from src/libsodium/crypto_core/salsa20/ref/crypto_core.h rename to src/libsodium/crypto_core/salsa20/ref/api.h diff --git a/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c b/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c index 910a0056..b2f6f5c7 100644 --- a/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c +++ b/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c @@ -4,7 +4,7 @@ D. J. Bernstein Public domain. */ -#include "crypto_core.h" +#include "api.h" #define ROUNDS 20 diff --git a/src/libsodium/crypto_core/salsa2012/ref/crypto_core.h b/src/libsodium/crypto_core/salsa2012/ref/api.h similarity index 100% rename from src/libsodium/crypto_core/salsa2012/ref/crypto_core.h rename to src/libsodium/crypto_core/salsa2012/ref/api.h diff --git a/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c b/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c index d4b59e48..07a72e71 100644 --- a/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c +++ b/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c @@ -4,7 +4,7 @@ D. J. Bernstein Public domain. */ -#include "crypto_core.h" +#include "api.h" #define ROUNDS 12 diff --git a/src/libsodium/crypto_core/salsa208/ref/crypto_core.h b/src/libsodium/crypto_core/salsa208/ref/api.h similarity index 100% rename from src/libsodium/crypto_core/salsa208/ref/crypto_core.h rename to src/libsodium/crypto_core/salsa208/ref/api.h diff --git a/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c b/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c index 921e7a86..be26f82a 100644 --- a/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c +++ b/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c @@ -4,7 +4,7 @@ D. J. Bernstein Public domain. */ -#include "crypto_core.h" +#include "api.h" #define ROUNDS 8