]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-ssl-iostream: Use ENGINE_set_default()
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Thu, 23 Jun 2016 15:04:40 +0000 (18:04 +0300)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Thu, 23 Jun 2016 15:04:40 +0000 (18:04 +0300)
src/lib-ssl-iostream/dovecot-openssl-common.c

index b76c3ab6e56aeff820cc171fcdac80bc680363a9..2e1b8a03c3305edeadfc6eb7a4ddacaa3e1e053b 100644 (file)
@@ -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;
 }