lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

actually use STARTTLS if only TLSv1.1 or TLSv1.2 is enabled

Browse Source
This commit is contained in:
Oswald Buddenhagen 2014-07-05 23:10:09 +02:00
parent 95db373e54
commit 06c731cbf8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/drv_imap.c
View File

@ -45,6 +45,7 @@ typedef struct imap_server_conf {
char *pass_cmd; char *pass_cmd;
int max_in_progress; int max_in_progress;
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
char use_ssl;
char require_ssl; char require_ssl;
char require_cram; char require_cram;
#endif #endif
@ -1578,8 +1579,7 @@ imap_open_store_authenticate( imap_store_t *ctx )
if (ctx->greeting != GreetingPreauth) { if (ctx->greeting != GreetingPreauth) {
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
if (!srvc->sconf.use_imaps && if (!srvc->sconf.use_imaps && srvc->use_ssl) {
(srvc->sconf.use_sslv2 || srvc->sconf.use_sslv3 || srvc->sconf.use_tlsv1)) {
/* always try to select SSL support if available */ /* always try to select SSL support if available */
if (CAP(STARTTLS)) { if (CAP(STARTTLS)) {
imap_exec( ctx, 0, imap_open_store_authenticate_p2, "STARTTLS" ); imap_exec( ctx, 0, imap_open_store_authenticate_p2, "STARTTLS" );
@ -2360,6 +2360,11 @@ imap_parse_store( conffile_t *cfg, store_conf_t **storep )
cfg->err = 1; cfg->err = 1;
return 1; return 1;
} }
#ifdef HAVE_LIBSSL
server->use_ssl =
server->sconf.use_sslv2 | server->sconf.use_sslv3 |
server->sconf.use_tlsv1 | server->sconf.use_tlsv11 | server->sconf.use_tlsv12;
#endif
} }
if (store) { if (store) {
if (!store->server) { if (!store->server) {