projects
/
oweals
/
minetest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4e2479e
)
Fix fips_cipher_abort warning and other duplicate macros
author
Loic Blot
<loic.blot@unix-experience.fr>
Wed, 12 Apr 2017 07:05:27 +0000
(09:05 +0200)
committer
Loic Blot
<loic.blot@unix-experience.fr>
Wed, 12 Apr 2017 07:06:26 +0000
(09:06 +0200)
src/util/sha256.c
patch
|
blob
|
history
diff --git
a/src/util/sha256.c
b/src/util/sha256.c
index 4c2bb71a8229b0cb9e1620e44280e07d23e2a437..4241f31f382cc57ea49c30d5a504d333d123da17 100644
(file)
--- 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));