From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 23 Jun 2016 15:04:40 +0000 (+0300)
Subject: lib-ssl-iostream: Use ENGINE_set_default()
X-Git-Tag: 2.3.0.rc1~3426
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=123d1cb83e666b485df755467df64edc456d56db;p=thirdparty%2Fdovecot%2Fcore.git

lib-ssl-iostream: Use ENGINE_set_default()
---

diff --git a/src/lib-ssl-iostream/dovecot-openssl-common.c b/src/lib-ssl-iostream/dovecot-openssl-common.c
index b76c3ab6e5..2e1b8a03c3 100644
--- a/src/lib-ssl-iostream/dovecot-openssl-common.c
+++ b/src/lib-ssl-iostream/dovecot-openssl-common.c
@@ -100,11 +100,11 @@ int dovecot_openssl_common_global_set_engine(const char *engine,
 		dovecot_openssl_engine = NULL;
 		return -1;
 	}
-	if (ENGINE_set_default_RSA(dovecot_openssl_engine) == 0)
-		i_unreached();
-	if (ENGINE_set_default_DSA(dovecot_openssl_engine) == 0)
-		i_unreached();
-	if (ENGINE_set_default_ciphers(dovecot_openssl_engine) == 0)
-		i_unreached();
+	if (ENGINE_set_default(dovecot_openssl_engine, ENGINE_METHOD_ALL) == 0) {
+		*error_r = t_strdup_printf("ENGINE_set_default(%s) failed", engine);
+		ENGINE_free(dovecot_openssl_engine);
+		dovecot_openssl_engine = NULL;
+		return -1;
+	}
 	return 1;
 }