From bb2af7396e95251d17bac02ca4c7ebd340320593 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 19 Apr 2013 14:44:55 +0200 Subject: [PATCH] Avoid duplicate crypto_hashblocks.h --- src/libsodium/Makefile.am | 4 ++-- .../sha256/ref/{crypto_hashblocks.h => api.h} | 0 src/libsodium/crypto_hashblocks/sha256/ref/blocks_sha256.c | 2 +- .../sha512/ref/{crypto_hashblocks.h => api.h} | 0 src/libsodium/crypto_hashblocks/sha512/ref/blocks_sha512.c | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename src/libsodium/crypto_hashblocks/sha256/ref/{crypto_hashblocks.h => api.h} (100%) rename src/libsodium/crypto_hashblocks/sha512/ref/{crypto_hashblocks.h => api.h} (100%) diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index f943e76c..fb96157d 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -21,9 +21,9 @@ libsodium_la_SOURCES = \ crypto_scalarmult/curve25519/ref/crypto_scalarmult.h \ crypto_scalarmult/curve25519/ref/smult_curve25519_ref.c \ crypto_hashblocks/sha256/ref/blocks_sha256.c \ - crypto_hashblocks/sha256/ref/crypto_hashblocks.h \ + crypto_hashblocks/sha256/ref/api.h \ crypto_hashblocks/sha512/ref/blocks_sha512.c \ - crypto_hashblocks/sha512/ref/crypto_hashblocks.h \ + crypto_hashblocks/sha512/ref/api.h \ crypto_hash/sha256/ref/api.h \ crypto_hash/sha256/ref/hash_sha256.c \ crypto_hash/sha512/ref/api.h \ diff --git a/src/libsodium/crypto_hashblocks/sha256/ref/crypto_hashblocks.h b/src/libsodium/crypto_hashblocks/sha256/ref/api.h similarity index 100% rename from src/libsodium/crypto_hashblocks/sha256/ref/crypto_hashblocks.h rename to src/libsodium/crypto_hashblocks/sha256/ref/api.h diff --git a/src/libsodium/crypto_hashblocks/sha256/ref/blocks_sha256.c b/src/libsodium/crypto_hashblocks/sha256/ref/blocks_sha256.c index 95670754..8d89a886 100644 --- a/src/libsodium/crypto_hashblocks/sha256/ref/blocks_sha256.c +++ b/src/libsodium/crypto_hashblocks/sha256/ref/blocks_sha256.c @@ -1,4 +1,4 @@ -#include "crypto_hashblocks.h" +#include "api.h" typedef unsigned int uint32; diff --git a/src/libsodium/crypto_hashblocks/sha512/ref/crypto_hashblocks.h b/src/libsodium/crypto_hashblocks/sha512/ref/api.h similarity index 100% rename from src/libsodium/crypto_hashblocks/sha512/ref/crypto_hashblocks.h rename to src/libsodium/crypto_hashblocks/sha512/ref/api.h diff --git a/src/libsodium/crypto_hashblocks/sha512/ref/blocks_sha512.c b/src/libsodium/crypto_hashblocks/sha512/ref/blocks_sha512.c index a340afe5..6571ed64 100644 --- a/src/libsodium/crypto_hashblocks/sha512/ref/blocks_sha512.c +++ b/src/libsodium/crypto_hashblocks/sha512/ref/blocks_sha512.c @@ -1,4 +1,4 @@ -#include "crypto_hashblocks.h" +#include "api.h" typedef unsigned long long uint64;