1 files changed, 27 insertions, 21 deletions

diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index 84d7d5d37..2ff800b5f 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -53,6 +53,12 @@
 #endif
 
 #include <openssl/evp.h>
+
+#if OPENSSL_VERSION_NUMBER < 0x10100005L
+#define EVP_MD_CTX_new EVP_MD_CTX_create
+#define EVP_MD_CTX_free EVP_MD_CTX_destroy
+#endif
+
 #else
 // The fallback we can always use, but with very limited set of
 // functionality.
@@ -707,20 +713,20 @@ static bool file_kvs_fnc_ps(KviKvsModuleFunctionCall * c)
 		The <directory> should be given as a UNIX style path and is adjusted according to the system that KVIrc is running on.[br][br]
 		<flags> may be a combination of the following characters:[br]
 		[pre]
-			[b]d:[/b] list directories[br]
-			[b]f:[/b] list files[br]
-			[b]l:[/b] list symbolic links[br]
-			[b]r:[/b] list readable files[br]
-			[b]w:[/b] list writable files[br]
-			[b]x:[/b] list executable files[br]
-			[b]h:[/b] list hidden files[br]
-			[b]s:[/b] list system files[br]
-			[b]n:[/b] sort files by name[br]
-			[b]t:[/b] sort files by file time[br]
-			[b]b:[/b] sort files by file size[br]
-			[b]z:[/b] put the directories first, then the files[br]
-			[b]k:[/b] invert sort order[br]
-			[b]i:[/b] case insensitive sort[br]
+			[b]d:[/b] list directories
+			[b]f:[/b] list files
+			[b]l:[/b] list symbolic links
+			[b]r:[/b] list readable files
+			[b]w:[/b] list writable files
+			[b]x:[/b] list executable files
+			[b]h:[/b] list hidden files
+			[b]s:[/b] list system files
+			[b]n:[/b] sort files by name
+			[b]t:[/b] sort files by file time
+			[b]b:[/b] sort files by file size
+			[b]z:[/b] put the directories first, then the files
+			[b]k:[/b] invert sort order
+			[b]i:[/b] case insensitive sort
 		[/pre]
 		If <flags> is empty, then a default of [b]dfrwxhs[/b] is set. If none of the [b]r[/b],[b]w[/b],[b]x[/b] flags are set then KVIrc sets all of them by default.[br][br]
 		If <namefilter> is passed then it is interpreted as a wildcard string
@@ -1483,7 +1489,7 @@ static bool file_kvs_fnc_diskSpace(KviKvsModuleFunctionCall * c)
 // this for win
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	ULARGE_INTEGER free, total;
-	if (GetDiskFreeSpaceEx(szPath.toStdWString().c_str(), NULL, &total, &free) == 0) {
+	if (GetDiskFreeSpaceEx(szPath.toStdWString().c_str(), nullptr, &total, &free) == 0) {
 		c->warning(__tr2qs("An error occurred retrieving the amount of free space in '%Q'"), &szPath);
 		return true;
 	}
@@ -1553,7 +1559,7 @@ static bool file_kvs_fnc_digest(KviKvsModuleFunctionCall * c)
 	if(szAlgo.isEmpty())
 		szAlgo = "md5";
 
-	EVP_MD_CTX mdctx;
+	EVP_MD_CTX *mdctx;
 	const EVP_MD * pMD;
 	unsigned char ucMDValue[EVP_MAX_MD_SIZE];
 	unsigned int uMDLen, u;
@@ -1567,11 +1573,11 @@ static bool file_kvs_fnc_digest(KviKvsModuleFunctionCall * c)
 		return true;
 	}
 
-	EVP_MD_CTX_init(&mdctx);
-	EVP_DigestInit_ex(&mdctx, pMD, nullptr);
-	EVP_DigestUpdate(&mdctx, content.constData(), content.size());
-	EVP_DigestFinal_ex(&mdctx, ucMDValue, &uMDLen);
-	EVP_MD_CTX_cleanup(&mdctx);
+	mdctx = EVP_MD_CTX_new();
+	EVP_DigestInit_ex(mdctx, pMD, nullptr);
+	EVP_DigestUpdate(mdctx, content.constData(), content.size());
+	EVP_DigestFinal_ex(mdctx, ucMDValue, &uMDLen);
+	EVP_MD_CTX_free(mdctx);
 
 	for(u = 0; u < uMDLen; u++)
 	{