From c1c3ecd80a04916f6cb7f6d08ee1bdff3606a7b6 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 19 Apr 2013 14:42:47 +0200 Subject: [PATCH] Avoid duplicate crypto_hash.h --- src/libsodium/Makefile.am | 4 ++-- src/libsodium/crypto_hash/sha256/ref/crypto_hash.h | 12 ------------ src/libsodium/crypto_hash/sha256/ref/hash_sha256.c | 2 +- .../crypto_hash/sha512/ref/{crypto_hash.h => api.h} | 0 src/libsodium/crypto_hash/sha512/ref/hash_sha512.c | 2 +- 5 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 src/libsodium/crypto_hash/sha256/ref/crypto_hash.h rename src/libsodium/crypto_hash/sha512/ref/{crypto_hash.h => api.h} (100%) diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index b679d181..f943e76c 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -24,9 +24,9 @@ libsodium_la_SOURCES = \ crypto_hashblocks/sha256/ref/crypto_hashblocks.h \ crypto_hashblocks/sha512/ref/blocks_sha512.c \ crypto_hashblocks/sha512/ref/crypto_hashblocks.h \ - crypto_hash/sha256/ref/crypto_hash.h \ + crypto_hash/sha256/ref/api.h \ crypto_hash/sha256/ref/hash_sha256.c \ - crypto_hash/sha512/ref/crypto_hash.h \ + crypto_hash/sha512/ref/api.h \ crypto_hash/sha512/ref/hash_sha512.c \ crypto_shorthash/siphash24/ref/crypto_shorthash.h \ crypto_shorthash/siphash24/ref/shorthash_siphash24.c \ diff --git a/src/libsodium/crypto_hash/sha256/ref/crypto_hash.h b/src/libsodium/crypto_hash/sha256/ref/crypto_hash.h deleted file mode 100644 index e89f6e60..00000000 --- a/src/libsodium/crypto_hash/sha256/ref/crypto_hash.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef crypto_hash_H -#define crypto_hash_H - -#include "crypto_hash_sha256.h" - -#define crypto_hash crypto_hash_sha256 -#define crypto_hash_BYTES crypto_hash_sha256_BYTES -#define crypto_hash_PRIMITIVE "sha256" -#define crypto_hash_IMPLEMENTATION crypto_hash_sha256_IMPLEMENTATION -#define crypto_hash_VERSION crypto_hash_sha256_VERSION - -#endif diff --git a/src/libsodium/crypto_hash/sha256/ref/hash_sha256.c b/src/libsodium/crypto_hash/sha256/ref/hash_sha256.c index 21ce68a0..2bd5578d 100644 --- a/src/libsodium/crypto_hash/sha256/ref/hash_sha256.c +++ b/src/libsodium/crypto_hash/sha256/ref/hash_sha256.c @@ -4,8 +4,8 @@ D. J. Bernstein Public domain. */ +#include "api.h" #include "crypto_hashblocks_sha256.h" -#include "crypto_hash.h" #define blocks crypto_hashblocks_sha256 diff --git a/src/libsodium/crypto_hash/sha512/ref/crypto_hash.h b/src/libsodium/crypto_hash/sha512/ref/api.h similarity index 100% rename from src/libsodium/crypto_hash/sha512/ref/crypto_hash.h rename to src/libsodium/crypto_hash/sha512/ref/api.h diff --git a/src/libsodium/crypto_hash/sha512/ref/hash_sha512.c b/src/libsodium/crypto_hash/sha512/ref/hash_sha512.c index fc4347bb..66b9ddc6 100644 --- a/src/libsodium/crypto_hash/sha512/ref/hash_sha512.c +++ b/src/libsodium/crypto_hash/sha512/ref/hash_sha512.c @@ -4,8 +4,8 @@ D. J. Bernstein Public domain. */ +#include "api.h" #include "crypto_hashblocks_sha512.h" -#include "crypto_hash.h" #define blocks crypto_hashblocks_sha512