From: Loic Blot <loic.blot@unix-experience.fr>
Date: Wed, 12 Apr 2017 07:05:27 +0000 (+0200)
Subject: Fix fips_cipher_abort warning and other duplicate macros
X-Git-Tag: 0.4.16~255
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1399678ffd6faa2ae1642ada1b1b9dc729d6357a;p=oweals%2Fminetest.git

Fix fips_cipher_abort warning and other duplicate macros
---

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));