imapc: Pass ssl_crypto_device setting to lib-ssl-iostream.

diff --git a/src/lib-imap-client/imapc-client.c b/src/lib-imap-client/imapc-client.c
index c6f3dd93425a73c051f9908fc3f701c6b69280ae..f397c81de1917fe0390c2cd2cbd91cfe83e01434 100644 (file)
--- a/src/lib-imap-client/imapc-client.c
+++ b/src/lib-imap-client/imapc-client.c
@@ -64,6 +64,7 @@ imapc_client_init(const struct imapc_client_settings *set)
                memset(&ssl_set, 0, sizeof(ssl_set));
                ssl_set.ca_dir = set->ssl_ca_dir;
                ssl_set.verify_remote_cert = set->ssl_verify;
+               ssl_set.crypto_device = set->ssl_crypto_device;
 
                source = t_strdup_printf("%s:%u", set->host, set->port);
                if (ssl_iostream_context_init_client(source, &ssl_set,

diff --git a/src/lib-imap-client/imapc-client.h b/src/lib-imap-client/imapc-client.h
index 765b1d628ceac53c873f7589eebfd391fdfbb7f2..be25b944818662bc062e408dcf963adf11c92b52 100644 (file)
--- a/src/lib-imap-client/imapc-client.h
+++ b/src/lib-imap-client/imapc-client.h
@@ -59,6 +59,7 @@ struct imapc_client_settings {
        bool ssl_verify;
 
        const char *rawlog_dir;
+       const char *ssl_crypto_device;
        bool debug;
 };
 

diff --git a/src/lib-storage/index/imapc/imapc-settings.c b/src/lib-storage/index/imapc/imapc-settings.c
index 0d4136f1a16c9fc8108996360de51672e7ebf7cf..a502aea523fc8badcfb23bc31c8f05bbb9f427bc 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-settings.c
+++ b/src/lib-storage/index/imapc/imapc-settings.c
@@ -25,6 +25,7 @@ static const struct setting_define imapc_setting_defines[] = {
        DEF(SET_BOOL, imapc_ssl_verify),
 
        DEF(SET_STR, imapc_rawlog_dir),
+       DEF(SET_STR, ssl_crypto_device),
 
        SETTING_DEFINE_LIST_END
 };
@@ -40,7 +41,8 @@ static const struct imapc_settings imapc_default_settings = {
        .imapc_ssl_ca_dir = "",
        .imapc_ssl_verify = TRUE,
 
-       .imapc_rawlog_dir = ""
+       .imapc_rawlog_dir = "",
+       .ssl_crypto_device = ""
 };
 
 static const struct setting_parser_info imapc_setting_parser_info = {

diff --git a/src/lib-storage/index/imapc/imapc-settings.h b/src/lib-storage/index/imapc/imapc-settings.h
index d5a012a38128e2c7373e3276b691da7612cdc599..4a800ce60f84e9d45c9c97f74665fea1a8fec1f0 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-settings.h
+++ b/src/lib-storage/index/imapc/imapc-settings.h
@@ -13,6 +13,7 @@ struct imapc_settings {
        bool imapc_ssl_verify;
 
        const char *imapc_rawlog_dir;
+       const char *ssl_crypto_device;
 };
 
 const struct setting_parser_info *imapc_get_setting_parser_info(void);

diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c
index 70d201de4ce342952a209be76605fd78cbd9ae93..94ebe3a17d33319445b0614a59f39c32e077e8cd 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-storage.c
+++ b/src/lib-storage/index/imapc/imapc-storage.c
@@ -246,6 +246,7 @@ imapc_storage_create(struct mail_storage *_storage,
                set.ssl_mode = IMAPC_CLIENT_SSL_MODE_STARTTLS;
        else
                set.ssl_mode = IMAPC_CLIENT_SSL_MODE_NONE;
+       set.ssl_crypto_device = storage->set->ssl_crypto_device;
 
        storage->list = (struct imapc_mailbox_list *)ns->list;
        storage->list->storage = storage;