From ebcf7d6c9222f2c96053516e0c90994bff62dd55 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 5 Nov 2017 18:35:57 +0200 Subject: [PATCH] global: Replace ssl_iostream_context_init_client() with ssl_iostream_client_context_cache_get() --- src/doveadm/doveadm-dsync.c | 2 +- src/lib-http/http-client.c | 2 +- src/lib-imap-client/imapc-client.c | 5 +++-- src/lib-storage/index/pop3c/pop3c-client.c | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c index 114639d125..19c5f0b0ed 100644 --- a/src/doveadm/doveadm-dsync.c +++ b/src/doveadm/doveadm-dsync.c @@ -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 diff --git a/src/lib-http/http-client.c b/src/lib-http/http-client.c index 0a78e4e6b7..5a89a174cc 100644 --- a/src/lib-http/http-client.c +++ b/src/lib-http/http-client.c @@ -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; diff --git a/src/lib-imap-client/imapc-client.c b/src/lib-imap-client/imapc-client.c index 0b586facbd..a57fbab75b 100644 --- a/src/lib-imap-client/imapc-client.c +++ b/src/lib-imap-client/imapc-client.c @@ -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); } diff --git a/src/lib-storage/index/pop3c/pop3c-client.c b/src/lib-storage/index/pop3c/pop3c-client.c index 51ac34e912..ce01d8dac0 100644 --- a/src/lib-storage/index/pop3c/pop3c-client.c +++ b/src/lib-storage/index/pop3c/pop3c-client.c @@ -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); } -- 2.47.3