From 82180bf08b4a07e41e341ada18b22d4dc58d403a Mon Sep 17 00:00:00 2001 From: Michael Ortmann <41313082+michaelortmann@users.noreply.github.com> Date: Sun, 7 Jul 2024 22:42:35 +0200 Subject: [PATCH 1/3] Fix --disable-tls --- src/mod/pbkdf2.mod/pbkdf2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mod/pbkdf2.mod/pbkdf2.c b/src/mod/pbkdf2.mod/pbkdf2.c index 2eda85038..bcf0c61c6 100644 --- a/src/mod/pbkdf2.mod/pbkdf2.c +++ b/src/mod/pbkdf2.mod/pbkdf2.c @@ -8,9 +8,10 @@ */ #include "src/mod/module.h" -#include "src/mod/pbkdf2.mod/tclpbkdf2.c" #if OPENSSL_VERSION_NUMBER >= 0x1000000fL /* 1.0.0 */ +#include "src/mod/pbkdf2.mod/tclpbkdf2.c" + #define MODULE_NAME "encryption2" #include /* base64 encode b64_ntop() and base64 decode b64_pton() */ From 5648630b77b3521d24eb8d44284e6a27993c9648 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sun, 7 Jul 2024 22:56:12 +0200 Subject: [PATCH 2/3] Update pbkdf2.c --- src/mod/pbkdf2.mod/pbkdf2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/pbkdf2.mod/pbkdf2.c b/src/mod/pbkdf2.mod/pbkdf2.c index bcf0c61c6..faf7313d2 100644 --- a/src/mod/pbkdf2.mod/pbkdf2.c +++ b/src/mod/pbkdf2.mod/pbkdf2.c @@ -10,7 +10,7 @@ #include "src/mod/module.h" #if OPENSSL_VERSION_NUMBER >= 0x1000000fL /* 1.0.0 */ -#include "src/mod/pbkdf2.mod/tclpbkdf2.c" +#include "tclpbkdf2.c" #define MODULE_NAME "encryption2" From 309f34a6ef7245e5e1462e2fb60902392ae14839 Mon Sep 17 00:00:00 2001 From: Michael Ortmann <41313082+michaelortmann@users.noreply.github.com> Date: Sun, 7 Jul 2024 23:03:16 +0200 Subject: [PATCH 3/3] makedepend --- src/mod/pbkdf2.mod/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mod/pbkdf2.mod/Makefile b/src/mod/pbkdf2.mod/Makefile index 6cf40c584..38e70d0fe 100644 --- a/src/mod/pbkdf2.mod/Makefile +++ b/src/mod/pbkdf2.mod/Makefile @@ -36,4 +36,5 @@ distclean: clean ../../../src/compat/compat.h ../../../src/compat/base64.h \ ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \ ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \ - ../../../src/mod/modvals.h ../../../src/tandem.h + ../../../src/mod/modvals.h ../../../src/tandem.h \ + .././pbkdf2.mod/tclpbkdf2.c