aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2017-04-12 09:05:27 +0200
committerLoic Blot <loic.blot@unix-experience.fr>2017-04-12 09:06:26 +0200
commit1399678ffd6faa2ae1642ada1b1b9dc729d6357a (patch)
tree3e306980853e92ebef4033c2ef913e0c28b8f415
parent4e2479e46a8d19fa0e943f84898b602cf38f6480 (diff)
downloadminetest-1399678ffd6faa2ae1642ada1b1b9dc729d6357a.tar.gz
minetest-1399678ffd6faa2ae1642ada1b1b9dc729d6357a.tar.bz2
minetest-1399678ffd6faa2ae1642ada1b1b9dc729d6357a.zip
Fix fips_cipher_abort warning and other duplicate macros
-rw-r--r--src/util/sha256.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/util/sha256.c b/src/util/sha256.c
index 4c2bb71a8..4241f31f3 100644
--- a/src/util/sha256.c
+++ b/src/util/sha256.c
@@ -30,11 +30,6 @@ static void OPENSSL_cleanse(void *ptr, size_t len)
cleanse_ctr = (unsigned char)ctr;
}
-# define fips_md_init(alg) fips_md_init_ctx(alg, alg)
-# define fips_md_init_ctx(alg, cx) \
- int alg##_Init(cx##_CTX *c)
-# define fips_cipher_abort(alg) while(0)
-
fips_md_init_ctx(SHA224, SHA256)
{
memset(c, 0, sizeof(*c));