Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.1
mutt
mutt-1.5.17-bnc537141.dif
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File mutt-1.5.17-bnc537141.dif of Package mutt
--- globals.h +++ globals.h 2009-09-07 13:02:06.000000000 +0000 @@ -130,7 +130,6 @@ WHERE char *SslCertFile INITVAL (NULL); #endif #ifdef USE_SSL_OPENSSL WHERE char *SslClientCert INITVAL (NULL); -WHERE LIST *SslSessionCerts INITVAL (NULL); #endif #if defined(USE_SSL) WHERE char *SslEntropyFile INITVAL (NULL); --- init.h +++ init.h 2009-09-07 13:07:16.000000000 +0000 @@ -2071,6 +2071,22 @@ struct option_t MuttVars[] = { ** Example: set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt */ # endif /* USE_SSL_GNUTLS */ + { "ssl_verify_dates", DT_BOOL, R_NONE, OPTSSLVERIFYDATES, 1 }, + /* + ** .pp + ** If \fIset\fP (the default), mutt will not automatically accept a server + ** certificate that is either not yet valid or already expired. You should + ** only unset this for particular known hosts, using the + ** \fC$<account-hook>\fP function. + */ + { "ssl_verify_host", DT_BOOL, R_NONE, OPTSSLVERIFYHOST, 1 }, + /* + ** .pp + ** If \fIset\fP (the default), mutt will not automatically accept a server + ** certificate whose host name does not match the host used in your folder + ** URL. You should only unset this for particular known hosts, using + ** the \fC$<account-hook>\fP function. + */ #endif /* defined(USE_SSL) */ { "pipe_split", DT_BOOL, R_NONE, OPTPIPESPLIT, 0 }, --- mutt.h +++ mutt.h 2009-09-07 13:08:41.000000000 +0000 @@ -395,6 +395,8 @@ enum OPTSSLV3, OPTTLSV1, OPTSSLFORCETLS, + OPTSSLVERIFYDATES, + OPTSSLVERIFYHOST, #endif /* defined(USE_SSL) */ OPTIMPLICITAUTOVIEW, OPTINCLUDEONLYFIRST, --- mutt_ssl.c +++ mutt_ssl.c 2009-11-25 12:48:35.195929718 +0000 @@ -22,6 +22,7 @@ #include <openssl/ssl.h> #include <openssl/x509.h> +#include <openssl/x509v3.h> #include <openssl/err.h> #include <openssl/rand.h> @@ -34,6 +35,7 @@ #include "mutt_menu.h" #include "mutt_curses.h" #include "mutt_ssl.h" +#include "mutt_idna.h" #if OPENSSL_VERSION_NUMBER >= 0x00904000L #define READ_X509_KEY(fp, key) PEM_read_X509(fp, key, NULL, NULL) @@ -58,6 +60,10 @@ static int entropy_byte_count = 0; #define HAVE_ENTROPY() (!access(DEVRANDOM, R_OK) || entropy_byte_count >= 16) #endif +/* keep a handle on accepted certificates in case we want to + * open up another connection to the same server in this session */ +static STACK_OF(X509) *SslSessionCerts = NULL; + typedef struct _sslsockdata { SSL_CTX *ctx; @@ -67,17 +73,19 @@ typedef struct _sslsockdata sslsockdata; /* local prototypes */ -int ssl_init (void); +static int ssl_init (void); static int add_entropy (const char *file); static int ssl_socket_read (CONNECTION* conn, char* buf, size_t len); static int ssl_socket_write (CONNECTION* conn, const char* buf, size_t len); static int ssl_socket_open (CONNECTION * conn); static int ssl_socket_close (CONNECTION * conn); static int tls_close (CONNECTION* conn); -static int ssl_check_certificate (sslsockdata * data); +static int ssl_cache_trusted_cert (X509 *cert); +static int ssl_check_certificate (CONNECTION *conn, sslsockdata * data); +static int interactive_check_cert (X509 *cert, int idx, int len); static void ssl_get_client_cert(sslsockdata *ssldata, CONNECTION *conn); static int ssl_passwd_cb(char *buf, int size, int rwflag, void *userdata); -static int ssl_negotiate (sslsockdata*); +static int ssl_negotiate (CONNECTION *conn, sslsockdata*); /* mutt_ssl_starttls: Negotiate TLS over an already opened connection. * TODO: Merge this code better with ssl_socket_open. */ @@ -111,7 +119,7 @@ int mutt_ssl_starttls (CONNECTION* conn) goto bail_ssl; } - if (ssl_negotiate (ssldata)) + if (ssl_negotiate (conn, ssldata)) goto bail_ssl; /* hmm. watch out if we're starting TLS over any method other than raw. */ @@ -145,7 +153,7 @@ int mutt_ssl_starttls (CONNECTION* conn) * versions also. (That's the reason for the ugly #ifdefs and macros, * otherwise I could have simply #ifdef'd the whole ssl_init funcion) */ -int ssl_init (void) +static int ssl_init (void) { char path[_POSIX_PATH_MAX]; static unsigned char init_complete = 0; @@ -290,7 +298,7 @@ static int ssl_socket_open (CONNECTION * data->ssl = SSL_new (data->ctx); SSL_set_fd (data->ssl, conn->fd); - if (ssl_negotiate(data)) + if (ssl_negotiate(conn, data)) { mutt_socket_close (conn); return -1; @@ -304,7 +312,7 @@ static int ssl_socket_open (CONNECTION * /* ssl_negotiate: After SSL state has been initialised, attempt to negotiate * SSL over the wire, including certificate checks. */ -static int ssl_negotiate (sslsockdata* ssldata) +static int ssl_negotiate (CONNECTION *conn, sslsockdata* ssldata) { int err; const char* errmsg; @@ -343,7 +351,7 @@ static int ssl_negotiate (sslsockdata* s return -1; } - if (!ssl_check_certificate (ssldata)) + if (!ssl_check_certificate (conn, ssldata)) return -1; mutt_message (_("SSL connection using %s (%s)"), @@ -450,7 +458,7 @@ static int check_certificate_by_signer ( { X509_STORE_CTX xsc; X509_STORE *ctx; - int pass = 0; + int pass = 0, i; ctx = X509_STORE_new (); if (ctx == NULL) return 0; @@ -468,6 +476,9 @@ static int check_certificate_by_signer ( else dprint (2, (debugfile, "X509_STORE_load_locations_failed\n")); + for (i = 0; i < sk_X509_num (SslSessionCerts); i++) + pass += (X509_STORE_add_cert (ctx, sk_X509_value (SslSessionCerts, i)) != 0); + if (pass == 0) { /* nothing to do */ @@ -475,7 +486,7 @@ static int check_certificate_by_signer ( return 0; } - X509_STORE_CTX_init (&xsc, ctx, peercert, NULL); + X509_STORE_CTX_init (&xsc, ctx, peercert, SslSessionCerts); pass = (X509_verify_cert (&xsc) > 0); #ifdef DEBUG @@ -488,6 +499,7 @@ static int check_certificate_by_signer ( snprintf (buf, sizeof (buf), "%s (%d)", X509_verify_cert_error_string(err), err); dprint (2, (debugfile, "X509_verify_cert: %s\n", buf)); + dprint (2, (debugfile, " [%s]\n", peercert->name)); } #endif X509_STORE_CTX_cleanup (&xsc); @@ -523,16 +535,17 @@ static int check_certificate_cache (X509 unsigned char peermd[EVP_MAX_MD_SIZE]; unsigned int peermdlen; X509 *cert; - LIST *scert; + int i; - if (!X509_digest (peercert, EVP_sha1(), peermd, &peermdlen)) + if (!X509_digest (peercert, EVP_sha1(), peermd, &peermdlen) + || !SslSessionCerts) { return 0; } - - for (scert = SslSessionCerts; scert; scert = scert->next) + + for (i = sk_X509_num (SslSessionCerts); i-- > 0;) { - cert = *(X509**)scert->data; + cert = sk_X509_value (SslSessionCerts, i); if (!compare_certificates (cert, peercert, peermd, peermdlen)) { return 1; @@ -551,19 +564,22 @@ static int check_certificate_by_digest ( FILE *fp; /* expiration check */ - if (X509_cmp_current_time (X509_get_notBefore (peercert)) >= 0) - { - dprint (2, (debugfile, "Server certificate is not yet valid\n")); - mutt_error (_("Server certificate is not yet valid")); - mutt_sleep (2); - return 0; - } - if (X509_cmp_current_time (X509_get_notAfter (peercert)) <= 0) + if (option (OPTSSLVERIFYDATES) != M_NO) { - dprint (2, (debugfile, "Server certificate has expired")); - mutt_error (_("Server certificate has expired")); - mutt_sleep (2); - return 0; + if (X509_cmp_current_time (X509_get_notBefore (peercert)) >= 0) + { + dprint (2, (debugfile, "Server certificate is not yet valid\n")); + mutt_error (_("Server certificate is not yet valid")); + mutt_sleep (2); + return 0; + } + if (X509_cmp_current_time (X509_get_notAfter (peercert)) <= 0) + { + dprint (2, (debugfile, "Server certificate has expired")); + mutt_error (_("Server certificate has expired")); + mutt_sleep (2); + return 0; + } } if ((fp = fopen (SslCertFile, "rt")) == NULL) @@ -571,56 +587,256 @@ static int check_certificate_by_digest ( if (!X509_digest (peercert, EVP_sha1(), peermd, &peermdlen)) { - fclose (fp); + safe_fclose (&fp); return 0; } - + while ((cert = READ_X509_KEY (fp, &cert)) != NULL) { pass = compare_certificates (cert, peercert, peermd, peermdlen) ? 0 : 1; - + if (pass) break; } X509_free (cert); - fclose (fp); + safe_fclose (&fp); return pass; } -static int ssl_check_certificate (sslsockdata * data) +/* port to mutt from msmtp's tls.c */ +static int hostname_match (const char *hostname, const char *certname) +{ + const char *cmp1, *cmp2; + + if (strncmp(certname, "*.", 2) == 0) + { + cmp1 = certname + 2; + cmp2 = strchr(hostname, '.'); + if (!cmp2) + { + return 0; + } + else + { + cmp2++; + } + } + else + { + cmp1 = certname; + cmp2 = hostname; + } + + if (*cmp1 == '\0' || *cmp2 == '\0') + { + return 0; + } + + if (strcasecmp(cmp1, cmp2) != 0) + { + return 0; + } + + return 1; +} + +/* port to mutt from msmtp's tls.c */ +static int check_host (X509 *x509cert, const char *hostname, char *err, size_t errlen) +{ + int i, rc = 0; + /* hostname in ASCII format: */ + char *hostname_ascii = NULL; + /* needed to get the common name: */ + X509_NAME *x509_subject; + char *buf = NULL; + int bufsize; + /* needed to get the DNS subjectAltNames: */ + STACK *subj_alt_names; + int subj_alt_names_count; + GENERAL_NAME *subj_alt_name; + /* did we find a name matching hostname? */ + int match_found; + + /* Check if 'hostname' matches the one of the subjectAltName extensions of + * type DNS or the Common Name (CN). */ + +#ifdef HAVE_LIBIDN + if (idna_to_ascii_lz(hostname, &hostname_ascii, 0) != IDNA_SUCCESS) + { + hostname_ascii = safe_strdup(hostname); + } +#else + hostname_ascii = safe_strdup(hostname); +#endif + + /* Try the DNS subjectAltNames. */ + match_found = 0; + if ((subj_alt_names = X509_get_ext_d2i(x509cert, NID_subject_alt_name, + NULL, NULL))) + { + subj_alt_names_count = sk_GENERAL_NAME_num(subj_alt_names); + for (i = 0; i < subj_alt_names_count; i++) + { + subj_alt_name = sk_GENERAL_NAME_value(subj_alt_names, i); + if (subj_alt_name->type == GEN_DNS && subj_alt_name->d.ia5 && subj_alt_name->d.ia5->data) + { + if (mutt_strlen(subj_alt_name->d.ia5->data) == subj_alt_name->d.ia5->length && + (match_found = hostname_match(hostname_ascii, + (char *)(subj_alt_name->d.ia5->data)))) + { + break; + } + } + } + } + + if (!match_found) + { + /* Try the common name */ + if (!(x509_subject = X509_get_subject_name(x509cert))) + { + if (err && errlen) + strfcpy (err, _("cannot get certificate subject"), errlen); + goto out; + } + + bufsize = X509_NAME_get_text_by_NID(x509_subject, NID_commonName, + NULL, 0); + bufsize++; + buf = safe_malloc((size_t)bufsize); + if (X509_NAME_get_text_by_NID(x509_subject, NID_commonName, + buf, bufsize) == -1) + { + if (err && errlen) + strfcpy (err, _("cannot get certificate common name"), errlen); + goto out; + } + if (mutt_strlen(buf) == bufsize - 1) { + match_found = hostname_match(hostname_ascii, buf); + } + } + + if (!match_found) + { + if (err && errlen) + snprintf (err, errlen, _("certificate owner does not match hostname %s"), + hostname); + goto out; + } + + rc = 1; + +out: + FREE(&buf); + FREE(&hostname_ascii); + + return rc; +} + +static int ssl_cache_trusted_cert (X509 *c) +{ + dprint (1, (debugfile, "trusted: %s\n", c->name)); + if (!SslSessionCerts) + SslSessionCerts = sk_new_null(); + return (sk_X509_push (SslSessionCerts, X509_dup(c))); +} + +/* check whether cert is preauthorized. If host is not null, verify that + * it matches the certificate. + * Return > 0: authorized, < 0: problems, 0: unknown validity */ +static int ssl_check_preauth (X509 *cert, const char* host) { - char *part[] = - {"/CN=", "/Email=", "/O=", "/OU=", "/L=", "/ST=", "/C="}; - char helpstr[LONG_STRING]; char buf[SHORT_STRING]; - MUTTMENU *menu; - int done, row, i; - FILE *fp; - char *name = NULL, *c; + int trusted = 0; /* check session cache first */ - if (check_certificate_cache (data->cert)) + if (check_certificate_cache (cert)) { - dprint (1, (debugfile, "ssl_check_certificate: using cached certificate\n")); + dprint (2, (debugfile, "ssl_check_preauth: using cached certificate\n")); return 1; } - if (check_certificate_by_signer (data->cert)) + /* automatic check from user's database */ + if (SslCertFile && check_certificate_by_digest (cert)) { - dprint (1, (debugfile, "ssl_check_certificate: signer check passed\n")); - return 1; + dprint (2, (debugfile, "ssl_check_preauth: digest check passed\n")); + trusted++; } - /* automatic check from user's database */ - if (SslCertFile && check_certificate_by_digest (data->cert)) + buf[0] = 0; + if (host && option (OPTSSLVERIFYHOST) != M_NO) { - dprint (1, (debugfile, "ssl_check_certificate: digest check passed\n")); + if (!check_host (cert, host, buf, sizeof (buf))) + { + mutt_error (_("Certificate host check failed: %s"), buf); + mutt_sleep (2); + if (!trusted) /* don't fail if cert is manually trusted */ + return -1; + } + dprint (2, (debugfile, "ssl_check_preauth: hostname check passed\n")); + } + + if (trusted) return 1; + + if (check_certificate_by_signer (cert)) + { + dprint (2, (debugfile, "ssl_check_preauth: signer check passed\n")); return 1; } - /* interactive check from user */ - menu = mutt_new_menu (); + return 0; +} + +static int ssl_check_certificate (CONNECTION *conn, sslsockdata *data) +{ + int i, preauthrc, chain_len; + STACK_OF(X509) *chain; + X509 *cert; + + if ((preauthrc = ssl_check_preauth (data->cert, conn->account.host)) > 0) + return preauthrc; + + chain = SSL_get_peer_cert_chain (data->ssl); + chain_len = sk_X509_num (chain); + /* negative preauthrc means the certificate won't be accepted without + * manual override. */ + if (preauthrc < 0 || !chain || (chain_len <= 1)) + return interactive_check_cert (data->cert, 0, 0); + + /* check the chain from root to peer. */ + for (i = chain_len-1; i >= 0; i--) + { + cert = sk_X509_value (chain, i); + + /* if the certificate validates or is manually accepted, then add it to + * the trusted set and recheck the peer certificate */ + if (ssl_check_preauth (cert, NULL) + || interactive_check_cert (cert, i, chain_len)) + { + ssl_cache_trusted_cert (cert); + if (ssl_check_preauth (data->cert, conn->account.host)) + return 1; + } + } + + return 0; +} + +static int interactive_check_cert (X509 *cert, int idx, int len) +{ + char *part[] = + {"/CN=", "/Email=", "/O=", "/OU=", "/L=", "/ST=", "/C="}; + char helpstr[LONG_STRING]; + char buf[STRING]; + char title[STRING]; + MUTTMENU *menu = mutt_new_menu (); + int done, row, i; + FILE *fp; + char *name = NULL, *c; + + dprint (2, (debugfile, "interactive_check_cert: %s\n", cert->name)); + menu->max = 19; menu->dialog = (char **) safe_calloc (1, menu->max * sizeof (char *)); for (i = 0; i < menu->max; i++) @@ -629,8 +845,10 @@ static int ssl_check_certificate (sslsoc row = 0; strfcpy (menu->dialog[row], _("This certificate belongs to:"), SHORT_STRING); row++; - name = X509_NAME_oneline (X509_get_subject_name (data->cert), + name = X509_NAME_oneline (X509_get_subject_name (cert), buf, sizeof (buf)); + dprint (2, (debugfile, "oneline: %s\n", name)); + for (i = 0; i < 5; i++) { c = x509_get_part (name, part[i]); @@ -640,7 +858,7 @@ static int ssl_check_certificate (sslsoc row++; strfcpy (menu->dialog[row], _("This certificate was issued by:"), SHORT_STRING); row++; - name = X509_NAME_oneline (X509_get_issuer_name (data->cert), + name = X509_NAME_oneline (X509_get_issuer_name (cert), buf, sizeof (buf)); for (i = 0; i < 5; i++) { @@ -650,19 +868,24 @@ static int ssl_check_certificate (sslsoc row++; snprintf (menu->dialog[row++], SHORT_STRING, _("This certificate is valid")); - snprintf (menu->dialog[row++], SHORT_STRING, _(" from %s"), - asn1time_to_string (X509_get_notBefore (data->cert))); - snprintf (menu->dialog[row++], SHORT_STRING, _(" to %s"), - asn1time_to_string (X509_get_notAfter (data->cert))); + snprintf (menu->dialog[row++], SHORT_STRING, _(" from %s"), + asn1time_to_string (X509_get_notBefore (cert))); + snprintf (menu->dialog[row++], SHORT_STRING, _(" to %s"), + asn1time_to_string (X509_get_notAfter (cert))); row++; buf[0] = '\0'; - x509_fingerprint (buf, sizeof (buf), data->cert); + x509_fingerprint (buf, sizeof (buf), cert); snprintf (menu->dialog[row++], SHORT_STRING, _("Fingerprint: %s"), buf); - menu->title = _("SSL Certificate check"); - if (SslCertFile && X509_cmp_current_time (X509_get_notAfter (data->cert)) >= 0 - && X509_cmp_current_time (X509_get_notBefore (data->cert)) < 0) + snprintf (title, sizeof (title), + _("SSL Certificate check (certificate %d of %d in chain)"), + len - idx, len); + menu->title = title; + if (SslCertFile + && (option (OPTSSLVERIFYDATES) == M_NO + || (X509_cmp_current_time (X509_get_notAfter (cert)) >= 0 + && X509_cmp_current_time (X509_get_notBefore (cert)) < 0))) { menu->prompt = _("(r)eject, accept (o)nce, (a)ccept always"); menu->keys = _("roa"); @@ -672,7 +895,7 @@ static int ssl_check_certificate (sslsoc menu->prompt = _("(r)eject, accept (o)nce"); menu->keys = _("ro"); } - + helpstr[0] = '\0'; mutt_make_help (buf, sizeof (buf), _("Exit "), MENU_GENERIC, OP_EXIT); safe_strcat (helpstr, sizeof (helpstr), buf); @@ -695,9 +918,9 @@ static int ssl_check_certificate (sslsoc done = 0; if ((fp = fopen (SslCertFile, "a"))) { - if (PEM_write_X509 (fp, data->cert)) + if (PEM_write_X509 (fp, cert)) done = 1; - fclose (fp); + safe_fclose (&fp); } if (!done) { @@ -712,15 +935,13 @@ static int ssl_check_certificate (sslsoc /* fall through */ case OP_MAX + 2: /* accept once */ done = 2; - /* keep a handle on accepted certificates in case we want to - * open up another connection to the same server in this session */ - SslSessionCerts = mutt_add_list_n (SslSessionCerts, &data->cert, - sizeof (X509 **)); + ssl_cache_trusted_cert (cert); break; } } unset_option(OPTUNBUFFEREDINPUT); mutt_menuDestroy (&menu); + dprint (2, (debugfile, "ssl interactive_check_cert: done=%d\n", done)); return (done == 2); } @@ -733,6 +954,9 @@ static void ssl_get_client_cert(sslsockd SSL_CTX_set_default_passwd_cb(ssldata->ctx, ssl_passwd_cb); SSL_CTX_use_certificate_file(ssldata->ctx, SslClientCert, SSL_FILETYPE_PEM); SSL_CTX_use_PrivateKey_file(ssldata->ctx, SslClientCert, SSL_FILETYPE_PEM); + + /* if we are using a client cert, SASL may expect an external auth name */ + mutt_account_getuser (&conn->account); } } @@ -745,7 +969,7 @@ static int ssl_passwd_cb(char *buf, int dprint (2, (debugfile, "ssl_passwd_cb: getting password for %s@%s:%u\n", account->user, account->host, account->port)); - + if (mutt_account_getpass (account)) return 0;
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
