lib-ssl-iostream: Use ENGINE_set_default()

dovecot · Jun 23, 2016 · 123d1cb · 123d1cb
1 parent b7e2919
commit 123d1cb
Showing 1 changed file with 6 additions and 6 deletions.
diff --git 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;
 }