X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fetpan%2Fimap-thread.c;h=1073683caddadd9152880c6b373930b26ce96451;hp=ad5e3b3ef1c0158c0a784d3c20cdc5396715f6a3;hb=b0c17cd08e482dbda407dabdc952dfcf5d8fdb6e;hpb=4242394d7e6eaf7628486cf099b92b99efd88571 diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c index ad5e3b3ef..1073683ca 100644 --- a/src/etpan/imap-thread.c +++ b/src/etpan/imap-thread.c @@ -41,6 +41,7 @@ #include #include #include "etpan-thread-manager.h" +#include "etpan-ssl.h" #include "utils.h" #include "mainwindow.h" #include "ssl.h" @@ -506,93 +507,17 @@ int imap_threaded_connect(Folder * folder, const char * server, int port) value.data = imap; value.len = 0; chash_set(session_hash, &key, &value, NULL); - + param.imap = imap; param.server = server; param.port = port; - + refresh_resolvers(); threaded_run(folder, ¶m, &result, connect_run); - + debug_print("connect ok %i with imap %p\n", result.error, imap); - - return result.error; -} -static int etpan_certificate_check(const unsigned char *certificate, int len, void *data) -{ -#ifdef USE_GNUTLS - struct connect_param *param = (struct connect_param *)data; - gnutls_x509_crt_t cert = NULL; - gnutls_datum_t tmp; - - if (certificate == NULL || len < 0) { - g_warning("no cert presented.\n"); - return 0; - } - - tmp.data = malloc(len); - memcpy(tmp.data, certificate, len); - tmp.size = len; - gnutls_x509_crt_init(&cert); - if (gnutls_x509_crt_import(cert, &tmp, GNUTLS_X509_FMT_DER) < 0) { - free(tmp.data); - g_warning("IMAP: can't get cert\n"); - return 0; - } else if (ssl_certificate_check(cert, (guint)-1, (gchar *)param->server, - (gushort)param->port) == TRUE) { - free(tmp.data); - gnutls_x509_crt_deinit(cert); - return 0; - } else { - free(tmp.data); - gnutls_x509_crt_deinit(cert); - return -1; - } -#endif - return 0; -} - -static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data) -{ -#ifdef USE_GNUTLS - PrefsAccount *account = (PrefsAccount *)data; - const gchar *cert_path = NULL; - const gchar *password = NULL; - gnutls_x509_crt_t x509 = NULL; - gnutls_x509_privkey_t pkey = NULL; - - if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file) - cert_path = account->in_ssl_client_cert_file; - if (account->in_ssl_client_cert_pass && *account->in_ssl_client_cert_pass) - password = account->in_ssl_client_cert_pass; - - if (mailstream_ssl_set_client_certificate_data(ssl_context, NULL, 0) < 0 || - mailstream_ssl_set_client_private_key_data(ssl_context, NULL, 0) < 0) - debug_print("Impossible to set the client certificate.\n"); - x509 = ssl_certificate_get_x509_from_pem_file(cert_path); - pkey = ssl_certificate_get_pkey_from_pem_file(cert_path); - if (!(x509 && pkey)) { - /* try pkcs12 format */ - ssl_certificate_get_x509_and_pkey_from_p12_file(cert_path, password, &x509, &pkey); - } - if (x509 && pkey) { - unsigned char *x509_der = NULL, *pkey_der = NULL; - size_t x509_len, pkey_len; - - x509_len = (size_t)gnutls_i2d_X509(x509, &x509_der); - pkey_len = (size_t)gnutls_i2d_PrivateKey(pkey, &pkey_der); - if (x509_len > 0 && pkey_len > 0) { - if (mailstream_ssl_set_client_certificate_data(ssl_context, x509_der, x509_len) < 0 || - mailstream_ssl_set_client_private_key_data(ssl_context, pkey_der, pkey_len) < 0) - log_error(LOG_PROTOCOL, _("Impossible to set the client certificate.\n")); - g_free(x509_der); - g_free(pkey_der); - } - gnutls_x509_crt_deinit(x509); - gnutls_x509_privkey_deinit(pkey); - } -#endif + return result.error; } static void connect_ssl_run(struct etpan_thread_op * op) @@ -608,7 +533,7 @@ static void connect_ssl_run(struct etpan_thread_op * op) r = mailimap_ssl_connect_with_callback(param->imap, param->server, param->port, - connect_ssl_context_cb, param->account); + etpan_connect_ssl_context_cb, param->account); result->error = r; } @@ -619,8 +544,6 @@ int imap_threaded_connect_ssl(Folder * folder, const char * server, int port) chashdatum key; chashdatum value; mailimap * imap, * oldimap; - unsigned char *certificate = NULL; - int cert_len; oldimap = get_imap(folder); @@ -647,11 +570,8 @@ int imap_threaded_connect_ssl(Folder * folder, const char * server, int port) if ((result.error == MAILIMAP_NO_ERROR_AUTHENTICATED || result.error == MAILIMAP_NO_ERROR_NON_AUTHENTICATED) && !etpan_skip_ssl_cert_check) { - cert_len = (int)mailstream_ssl_get_certificate(imap->imap_stream, &certificate); - if (etpan_certificate_check(certificate, cert_len, ¶m) < 0) - return -1; - if (certificate) - free(certificate); + if (etpan_certificate_check(imap->imap_stream, server, port) < 0) + result.error = MAILIMAP_ERROR_SSL; } debug_print("connect %d with imap %p\n", result.error, imap); @@ -1159,7 +1079,7 @@ static void starttls_run(struct etpan_thread_op * op) return; } - tls_low = mailstream_low_tls_open_with_callback(fd, connect_ssl_context_cb, param->account); + tls_low = mailstream_low_tls_open_with_callback(fd, etpan_connect_ssl_context_cb, param->account); if (tls_low == NULL) { debug_print("imap starttls run - can't tls_open\n"); result->error = MAILIMAP_ERROR_STREAM; @@ -1174,8 +1094,6 @@ int imap_threaded_starttls(Folder * folder, const gchar *host, int port) { struct connect_param param; struct starttls_result result; - int cert_len; - unsigned char *certificate = NULL; debug_print("imap starttls - begin\n"); @@ -1189,11 +1107,8 @@ int imap_threaded_starttls(Folder * folder, const gchar *host, int port) debug_print("imap starttls - end\n"); if (result.error == 0 && param.imap && !etpan_skip_ssl_cert_check) { - cert_len = (int)mailstream_ssl_get_certificate(param.imap->imap_stream, &certificate); - if (etpan_certificate_check(certificate, cert_len, ¶m) < 0) - result.error = MAILIMAP_ERROR_STREAM; - if (certificate) - free(certificate); + if (etpan_certificate_check(param.imap->imap_stream, host, port) < 0) + return MAILIMAP_ERROR_SSL; } return result.error; }