From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 22 Aug 2019 11:28:17 +0000 (+0300)
Subject: doveadm: Do not call dcrypt_deinitialize
X-Git-Tag: 2.3.9~255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06f759ea340c16691f8c12e4cc20451a2b036cac;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: Do not call dcrypt_deinitialize

It can break openssl
---

diff --git a/src/doveadm/doveadm-dump-dcrypt-file.c b/src/doveadm/doveadm-dump-dcrypt-file.c
index 7f5cd033ce..539919beab 100644
--- a/src/doveadm/doveadm-dump-dcrypt-file.c
+++ b/src/doveadm/doveadm-dump-dcrypt-file.c
@@ -74,7 +74,6 @@ static bool test_dump_dcrypt_file(const char *path)
 	if (!dcrypt_initialize("openssl", NULL, NULL))
 		return FALSE;
 	bool ret = dcrypt_file_dump_metadata(path, FALSE);
-	dcrypt_deinitialize();
 	return ret;
 }
 
@@ -84,7 +83,6 @@ static void cmd_dump_dcrypt_file(int argc ATTR_UNUSED, char *argv[])
 	if (!dcrypt_initialize("openssl", NULL, &error))
 		i_fatal("dcrypt_initialize failed: %s", error);
 	(void)dcrypt_file_dump_metadata(argv[1], TRUE);
-	dcrypt_deinitialize();
 }
 
 struct doveadm_cmd_dump doveadm_cmd_dump_dcrypt_file = {
diff --git a/src/doveadm/doveadm-dump-dcrypt-key.c b/src/doveadm/doveadm-dump-dcrypt-key.c
index 4a3dfbec60..4413c823c6 100644
--- a/src/doveadm/doveadm-dump-dcrypt-key.c
+++ b/src/doveadm/doveadm-dump-dcrypt-key.c
@@ -194,7 +194,6 @@ static bool test_dump_dcrypt_key(const char *path)
 	if (!dcrypt_initialize("openssl", NULL, NULL))
 		return FALSE;
 	bool ret = dcrypt_key_dump_metadata(path, FALSE);
-	dcrypt_deinitialize();
 	return ret;
 }
 
@@ -204,7 +203,6 @@ static void cmd_dump_dcrypt_key(int argc ATTR_UNUSED, char *argv[])
 	if (!dcrypt_initialize("openssl", NULL, &error))
 		i_fatal("dcrypt_initialize: %s", error);
 	(void)dcrypt_key_dump_metadata(argv[1], TRUE);
-	dcrypt_deinitialize();
 }
 
 struct doveadm_cmd_dump doveadm_cmd_dump_dcrypt_key = {