Skip to content

Commit

Permalink
Don't check IMAP PREAUTH encryption if $tunnel is in use
Browse files Browse the repository at this point in the history
$tunnel is used to create an external encrypted connection.  The
default of $ssl_starttls is yes, meaning those kinds of connections
will be broken by the CVE-2020-14093 fix.

Upstream-commit: https://gitlab.com/muttmua/mutt/commit/dc909119b3433a84290f0095c0f43a23b98b3748
Co-authored-by: Pietro Cerutti <gahr@gahr.ch>
  • Loading branch information
2 people authored and flatcap committed Jun 24, 2020
1 parent 5b00291 commit 37c98ed
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions imap/imap.c
Expand Up @@ -773,8 +773,8 @@ int imap_open_connection(struct ImapAccountData *adata)
{
#ifdef USE_SSL
/* An unencrypted PREAUTH response is most likely a MITM attack.
* Require a confirmation. */
if (adata->conn->ssf == 0)
* Require a confirmation unless using $tunnel. */
if ((adata->conn->ssf == 0) && !C_Tunnel)
{
bool proceed = true;
if (C_SslForceTls)
Expand Down

0 comments on commit 37c98ed

Please sign in to comment.