]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
global: Replace ssl_iostream_context_init_client() with ssl_iostream_client_context_c...
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Sun, 5 Nov 2017 16:35:57 +0000 (18:35 +0200)
committerTimo Sirainen <tss@dovecot.fi>
Mon, 6 Nov 2017 23:09:00 +0000 (01:09 +0200)
src/doveadm/doveadm-dsync.c
src/lib-http/http-client.c
src/lib-imap-client/imapc-client.c
src/lib-storage/index/pop3c/pop3c-client.c

index 114639d125d139079c00e5924af5272dd3137977..19c5f0b0ede04f4aa9ebc4d2e3d339db1930abb0 100644 (file)
@@ -791,7 +791,7 @@ static int dsync_init_ssl_ctx(struct dsync_cmd_context *ctx,
        ssl_set.ca_file = mail_set->ssl_client_ca_file;
        ssl_set.crypto_device = mail_set->ssl_crypto_device;
 
-       return ssl_iostream_context_init_client(&ssl_set, &ctx->ssl_ctx, error_r);
+       return ssl_iostream_client_context_cache_get(&ssl_set, &ctx->ssl_ctx, error_r);
 }
 
 static int
index 0a78e4e6b785a76826dbe124e2bcce1dede9d32d..5a89a174ccb541583273d766372f3976c6e27674 100644 (file)
@@ -287,7 +287,7 @@ int http_client_init_ssl_ctx(struct http_client *client, const char **error_r)
                *error_r = "Requested https connection, but no SSL settings given";
                return -1;
        }
-       if (ssl_iostream_context_init_client(client->set.ssl, &client->ssl_ctx, &error) < 0) {
+       if (ssl_iostream_client_context_cache_get(client->set.ssl, &client->ssl_ctx, &error) < 0) {
                *error_r = t_strdup_printf("Couldn't initialize SSL context: %s",
                                           error);
                return -1;
index 0b586facbd7c290b243368f7c85767b522131bdf..a57fbab75b72027c875cca062f38e16bff4d2029 100644 (file)
@@ -107,8 +107,9 @@ imapc_client_init(const struct imapc_client_settings *set)
                ssl_set.allow_invalid_cert = !set->ssl_verify;
                ssl_set.crypto_device = set->ssl_crypto_device;
 
-               if (ssl_iostream_context_init_client(&ssl_set, &client->ssl_ctx,
-                                                    &error) < 0) {
+               if (ssl_iostream_client_context_cache_get(&ssl_set,
+                                                         &client->ssl_ctx,
+                                                         &error) < 0) {
                        i_error("imapc(%s:%u): Couldn't initialize SSL context: %s",
                                set->host, set->port, error);
                }
index 51ac34e9121f02ccd3e5a4461b06fcdd21d75875..ce01d8dac07aebd569696847bf907befcdb45389 100644 (file)
@@ -126,8 +126,9 @@ pop3c_client_init(const struct pop3c_client_settings *set)
                ssl_set.allow_invalid_cert = !set->ssl_verify;
                ssl_set.crypto_device = set->ssl_crypto_device;
 
-               if (ssl_iostream_context_init_client(&ssl_set, &client->ssl_ctx,
-                                                    &error) < 0) {
+               if (ssl_iostream_client_context_cache_get(&ssl_set,
+                                                         &client->ssl_ctx,
+                                                         &error) < 0) {
                        i_error("pop3c(%s:%u): Couldn't initialize SSL context: %s",
                                set->host, set->port, error);
                }