From 8da4cb057cb306aae763fe62c9e51df00ef84137 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 19 Apr 2013 14:48:19 +0200 Subject: [PATCH] Avoid duplicate crypto_shorthash.h --- src/libsodium/Makefile.am | 2 +- .../siphash24/ref/{crypto_shorthash.h => api.h} | 0 .../crypto_shorthash/siphash24/ref/shorthash_siphash24.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/libsodium/crypto_shorthash/siphash24/ref/{crypto_shorthash.h => api.h} (100%) diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index aa2d2982..f3589cc9 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -28,7 +28,7 @@ libsodium_la_SOURCES = \ crypto_hash/sha256/ref/hash_sha256.c \ crypto_hash/sha512/ref/api.h \ crypto_hash/sha512/ref/hash_sha512.c \ - crypto_shorthash/siphash24/ref/crypto_shorthash.h \ + crypto_shorthash/siphash24/ref/api.h \ crypto_shorthash/siphash24/ref/shorthash_siphash24.c \ crypto_verify/16/ref/crypto_verify.h \ crypto_verify/16/ref/verify_16.c \ diff --git a/src/libsodium/crypto_shorthash/siphash24/ref/crypto_shorthash.h b/src/libsodium/crypto_shorthash/siphash24/ref/api.h similarity index 100% rename from src/libsodium/crypto_shorthash/siphash24/ref/crypto_shorthash.h rename to src/libsodium/crypto_shorthash/siphash24/ref/api.h diff --git a/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c b/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c index e06ea5e5..36763820 100644 --- a/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c +++ b/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c @@ -1,4 +1,4 @@ -#include "crypto_shorthash.h" +#include "api.h" #include "crypto_uint64.h" #include "crypto_uint32.h" #include "crypto_uint8.h"