Mercurial > dovecot > core-2.2

changeset 20410:afe857728c0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-ssl-iostream: Use ENGINE_set_default()
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Thu, 23 Jun 2016 18:04:40 +0300
parents 87a581ec8f18
children 339842104272
files src/lib-ssl-iostream/dovecot-openssl-common.c
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-ssl-iostream/dovecot-openssl-common.c	Thu Jun 23 17:21:09 2016 +0300
+++ b/src/lib-ssl-iostream/dovecot-openssl-common.c	Thu Jun 23 18:04:40 2016 +0300
@@ -100,11 +100,11 @@
 		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;
 }