diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index daef094e..cf0da06f 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -42,10 +42,8 @@ libsodium_la_SOURCES = \ crypto_generichash/blake2/ref/generichash_blake2b.c \ crypto_hash/crypto_hash.c \ crypto_hash/sha256/hash_sha256_api.c \ - crypto_hash/sha256/cp/api.h \ crypto_hash/sha256/cp/hash_sha256.c \ crypto_hash/sha512/hash_sha512_api.c \ - crypto_hash/sha512/cp/api.h \ crypto_hash/sha512/cp/hash_sha512.c \ crypto_onetimeauth/crypto_onetimeauth.c \ crypto_onetimeauth/poly1305/onetimeauth_poly1305.c \ diff --git a/src/libsodium/crypto_hash/sha256/cp/api.h b/src/libsodium/crypto_hash/sha256/cp/api.h deleted file mode 100644 index b38a563a..00000000 --- a/src/libsodium/crypto_hash/sha256/cp/api.h +++ /dev/null @@ -1,10 +0,0 @@ - -#include "crypto_hash_sha256.h" - -#define crypto_hash crypto_hash_sha256 -#define crypto_hash_init crypto_hash_sha256_init -#define crypto_hash_update crypto_hash_sha256_update -#define crypto_hash_final crypto_hash_sha256_final -#define crypto_hash_BYTES crypto_hash_sha256_BYTES -#define crypto_hash_IMPLEMENTATION crypto_hash_sha256_IMPLEMENTATION -#define crypto_hash_VERSION crypto_hash_sha256_VERSION diff --git a/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c b/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c index c98f1bee..6dc89343 100644 --- a/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c +++ b/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c @@ -26,7 +26,6 @@ * */ -#include "api.h" #include "crypto_hash_sha256.h" #include "utils.h" @@ -289,8 +288,8 @@ crypto_hash_sha256_final(crypto_hash_sha256_state *state, } int -crypto_hash(unsigned char *out, const unsigned char *in, - unsigned long long inlen) +crypto_hash_sha256(unsigned char *out, const unsigned char *in, + unsigned long long inlen) { crypto_hash_sha256_state state; diff --git a/src/libsodium/crypto_hash/sha512/cp/api.h b/src/libsodium/crypto_hash/sha512/cp/api.h deleted file mode 100644 index c3a31883..00000000 --- a/src/libsodium/crypto_hash/sha512/cp/api.h +++ /dev/null @@ -1,10 +0,0 @@ - -#include "crypto_hash_sha512.h" - -#define crypto_hash crypto_hash_sha512 -#define crypto_hash_init crypto_hash_sha512_init -#define crypto_hash_update crypto_hash_sha512_update -#define crypto_hash_final crypto_hash_sha512_final -#define crypto_hash_BYTES crypto_hash_sha512_BYTES -#define crypto_hash_IMPLEMENTATION crypto_hash_sha512_IMPLEMENTATION -#define crypto_hash_VERSION crypto_hash_sha512_VERSION diff --git a/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c b/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c index 9eecff7c..f1a15171 100644 --- a/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c +++ b/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c @@ -309,8 +309,8 @@ crypto_hash_sha512_final(crypto_hash_sha512_state *state, } int -crypto_hash(unsigned char *out, const unsigned char *in, - unsigned long long inlen) +crypto_hash_sha512(unsigned char *out, const unsigned char *in, + unsigned long long inlen) { crypto_hash_sha512_state state;