X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=ssl.c;h=ca75c7c4f48f03278d102c29c4a082717753bf1e;hp=ce8151682cb077e2c20d0c3a2c6abdc573f36380;hb=1c5e3bad1f2ced4e68933a833fb8fa209f3be3ef;hpb=453c71553cdfdbf0030bfd5198c3a84fb479b2a6 diff --git a/ssl.c b/ssl.c index ce815168..ca75c7c4 100644 --- a/ssl.c +++ b/ssl.c @@ -1,32 +1,32 @@ /********************************************************************* -* -* File : $Source: /cvsroot/ijbswa/current/ssl.c,v $ -* -* Purpose : File with TLS/SSL extension. Contains methods for -* creating, using and closing TLS/SSL connections. -* -* Copyright : Written by and Copyright (c) 2017 Vaclav Svec. FIT CVUT. -* Copyright (C) 2018-2019 by Fabian Keil -* -* This program is free software; you can redistribute it -* and/or modify it under the terms of the GNU General -* Public License as published by the Free Software -* Foundation; either version 2 of the License, or (at -* your option) any later version. -* -* This program is distributed in the hope that it will -* be useful, but WITHOUT ANY WARRANTY; without even the -* implied warranty of MERCHANTABILITY or FITNESS FOR A -* PARTICULAR PURPOSE. See the GNU General Public -* License for more details. -* -* The GNU General Public License should be included with -* this file. If not, you can view it at -* http://www.gnu.org/copyleft/gpl.html -* or write to the Free Software Foundation, Inc., 59 -* Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* -*********************************************************************/ + * + * File : $Source: /cvsroot/ijbswa/current/ssl.c,v $ + * + * Purpose : File with TLS/SSL extension. Contains methods for + * creating, using and closing TLS/SSL connections. + * + * Copyright : Written by and Copyright (c) 2017 Vaclav Svec. FIT CVUT. + * Copyright (C) 2018-2020 by Fabian Keil + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General + * Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * This program is distributed in the hope that it will + * be useful, but WITHOUT ANY WARRANTY; without even the + * implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * The GNU General Public License should be included with + * this file. If not, you can view it at + * http://www.gnu.org/copyleft/gpl.html + * or write to the Free Software Foundation, Inc., 59 + * Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + *********************************************************************/ #include #include @@ -42,11 +42,11 @@ #include "mbedtls/base64.h" #include "mbedtls/error.h" +#include "config.h" #include "project.h" #include "miscutil.h" #include "errlog.h" #include "jcc.h" -#include "config.h" #include "ssl.h" @@ -107,13 +107,12 @@ typedef struct { char *key_file_path; /* filename of the key file */ } key_options; -extern int generate_webpage_certificate(struct client_state * csp); -static char * make_certs_path(const char * conf_dir, const char * file_name, const char * suffix); -static int file_exists(const char * path); +static int generate_webpage_certificate(struct client_state *csp); +static char *make_certs_path(const char *conf_dir, const char *file_name, const char *suffix); +static int file_exists(const char *path); static int host_to_hash(struct client_state *csp); static int ssl_verify_callback(void *data, mbedtls_x509_crt *crt, int depth, uint32_t *flags); static void free_certificate_chain(struct client_state *csp); -static unsigned int get_certificate_mutex_id(struct client_state *csp); static unsigned long get_certificate_serial(struct client_state *csp); static void free_client_ssl_structures(struct client_state *csp); static void free_server_ssl_structures(struct client_state *csp); @@ -160,18 +159,18 @@ extern int server_use_ssl(const struct client_state *csp) /********************************************************************* -* -* Function : is_ssl_pending -* -* Description : Tests if there are some waiting data on ssl connection -* -* Parameters : -* 1 : ssl = SSL context to test -* -* Returns : 0 => No data are pending -* >0 => Pending data length -* -*********************************************************************/ + * + * Function : is_ssl_pending + * + * Description : Tests if there are some waiting data on ssl connection + * + * Parameters : + * 1 : ssl = SSL context to test + * + * Returns : 0 => No data are pending + * >0 => Pending data length + * + *********************************************************************/ extern size_t is_ssl_pending(mbedtls_ssl_context *ssl) { if (ssl == NULL) @@ -229,6 +228,8 @@ extern int ssl_send_data(mbedtls_ssl_context *ssl, const unsigned char *buf, siz send_len = (int)max_fragment_size; } + log_error(LOG_LEVEL_WRITING, "TLS: %N", send_len, buf+pos); + /* * Sending one part of the buffer */ @@ -241,7 +242,6 @@ extern int ssl_send_data(mbedtls_ssl_context *ssl, const unsigned char *buf, siz { char err_buf[ERROR_BUF_SIZE]; - memset(err_buf, 0, sizeof(err_buf)); mbedtls_strerror(ret, err_buf, sizeof(err_buf)); log_error(LOG_LEVEL_ERROR, "Sending data over TLS/SSL failed: %s", err_buf); @@ -268,8 +268,8 @@ extern int ssl_send_data(mbedtls_ssl_context *ssl, const unsigned char *buf, siz * 2 : buf = Pointer to buffer where data will be written * 3 : max_length = Maximum number of bytes to read * - * Returns : Number of bytes read, 0 for EOF, or negative - * value on error. + * Returns : Number of bytes read, 0 for EOF, or -1 + * on error. * *********************************************************************/ extern int ssl_recv_data(mbedtls_ssl_context *ssl, unsigned char *buf, size_t max_length) @@ -290,12 +290,21 @@ extern int ssl_recv_data(mbedtls_ssl_context *ssl, unsigned char *buf, size_t ma { char err_buf[ERROR_BUF_SIZE]; - memset(err_buf, 0, sizeof(err_buf)); + if (ret == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) + { + log_error(LOG_LEVEL_CONNECT, + "The peer notified us that the connection is going to be closed"); + return 0; + } mbedtls_strerror(ret, err_buf, sizeof(err_buf)); log_error(LOG_LEVEL_ERROR, "Receiving data over TLS/SSL failed: %s", err_buf); + + return -1; } + log_error(LOG_LEVEL_RECEIVED, "TLS: %N", ret, buf); + return ret; } @@ -385,8 +394,6 @@ extern int create_client_ssl_connection(struct client_state *csp) int ret = 0; char err_buf[ERROR_BUF_SIZE]; - memset(err_buf, 0, sizeof(err_buf)); - /* * Initializing mbedtls structures for TLS/SSL connection */ @@ -429,19 +436,18 @@ extern int create_client_ssl_connection(struct client_state *csp) * Generating certificate for requested host. Mutex to prevent * certificate and key inconsistence must be locked. */ - unsigned int cert_mutex_id = get_certificate_mutex_id(csp); - privoxy_mutex_lock(&(certificates_mutexes[cert_mutex_id])); + privoxy_mutex_lock(&certificate_mutex); ret = generate_webpage_certificate(csp); if (ret < 0) { log_error(LOG_LEVEL_ERROR, "Generate_webpage_certificate failed: %d", ret); - privoxy_mutex_unlock(&(certificates_mutexes[cert_mutex_id])); + privoxy_mutex_unlock(&certificate_mutex); ret = -1; goto exit; } - privoxy_mutex_unlock(&(certificates_mutexes[cert_mutex_id])); + privoxy_mutex_unlock(&certificate_mutex); /* * Seed the RNG @@ -679,8 +685,6 @@ extern int create_server_ssl_connection(struct client_state *csp) char *trusted_cas_file = NULL; int auth_mode = MBEDTLS_SSL_VERIFY_REQUIRED; - memset(err_buf, 0, sizeof(err_buf)); - csp->server_cert_verification_result = SSL_CERT_NOT_VERIFIED; csp->server_certs_chain.next = NULL; @@ -693,7 +697,7 @@ extern int create_server_ssl_connection(struct client_state *csp) mbedtls_net_init(&(csp->mbedtls_server_attr.socket_fd)); mbedtls_ssl_init(&(csp->mbedtls_server_attr.ssl)); mbedtls_ssl_config_init(&(csp->mbedtls_server_attr.conf)); - mbedtls_x509_crt_init( &(csp->mbedtls_server_attr.ca_cert)); + mbedtls_x509_crt_init(&(csp->mbedtls_server_attr.ca_cert)); /* * Setting socket fd in mbedtls_net_context structure. This structure @@ -796,7 +800,7 @@ extern int create_server_ssl_connection(struct client_state *csp) * Handshake with server */ log_error(LOG_LEVEL_CONNECT, - "Performing the TLS/SSL handshake with server"); + "Performing the TLS/SSL handshake with the server"); while ((ret = mbedtls_ssl_handshake(&(csp->mbedtls_server_attr.ssl))) != 0) { @@ -807,11 +811,17 @@ extern int create_server_ssl_connection(struct client_state *csp) if (ret == MBEDTLS_ERR_X509_CERT_VERIFY_FAILED) { - log_error(LOG_LEVEL_ERROR, - "Server certificate verification failed: %s", err_buf); + char reason[INVALID_CERT_INFO_BUF_SIZE]; + csp->server_cert_verification_result = mbedtls_ssl_get_verify_result(&(csp->mbedtls_server_attr.ssl)); + mbedtls_x509_crt_verify_info(reason, sizeof(reason), "", + csp->server_cert_verification_result); + /* Log the reason without the trailing new line */ + log_error(LOG_LEVEL_ERROR, + "X509 certificate verification for %s failed: %N", + csp->http->hostport, strlen(reason)-1, reason); ret = -1; } else @@ -901,7 +911,7 @@ static void free_server_ssl_structures(struct client_state *csp) * function, we change fd to -1, which is the same what does * rest of mbedtls_net_free function. */ - csp->mbedtls_client_attr.socket_fd.fd = -1; + csp->mbedtls_server_attr.socket_fd.fd = -1; mbedtls_x509_crt_free(&(csp->mbedtls_server_attr.ca_cert)); mbedtls_ssl_free(&(csp->mbedtls_server_attr.ssl)); @@ -961,7 +971,6 @@ static int write_certificate(mbedtls_x509write_cert *crt, const char *output_fil int ret = 0; char err_buf[ERROR_BUF_SIZE]; - memset(err_buf, 0, sizeof(err_buf)); memset(cert_buf, 0, sizeof(cert_buf)); /* @@ -1029,18 +1038,8 @@ static int write_private_key(mbedtls_pk_context *key, unsigned char **ret_buf, int ret = 0; char err_buf[ERROR_BUF_SIZE]; - memset(err_buf, 0, sizeof(err_buf)); - /* Initializing buffer for key file content */ - *ret_buf = (unsigned char *)malloc(PRIVATE_KEY_BUF_SIZE + 1); - if (*ret_buf == NULL) - { - log_error(LOG_LEVEL_ERROR, - "Creating buffer for private key failed: malloc fail"); - ret = -1; - goto exit; - } - memset(*ret_buf, 0, PRIVATE_KEY_BUF_SIZE + 1); + *ret_buf = zalloc_or_die(PRIVATE_KEY_BUF_SIZE + 1); /* * Writing private key into PEM string @@ -1102,15 +1101,15 @@ exit: * contain NULL and no private key is generated. * * Parameters : - * 1 : key_buf = buffer to save new generated key - * 2 : csp = Current client state (buffers, headers, etc...) + * 1 : csp = Current client state (buffers, headers, etc...) + * 2 : key_buf = buffer to save new generated key * * Returns : -1 => Error while generating private key * 0 => Key already exists * >0 => Length of generated private key * *********************************************************************/ -static int generate_key(unsigned char **key_buf, struct client_state *csp) +static int generate_key(struct client_state *csp, unsigned char **key_buf) { mbedtls_pk_context key; key_options key_opt; @@ -1118,7 +1117,6 @@ static int generate_key(unsigned char **key_buf, struct client_state *csp) char err_buf[ERROR_BUF_SIZE]; key_opt.key_file_path = NULL; - memset(err_buf, 0, sizeof(err_buf)); /* * Initializing structures for key generating @@ -1203,6 +1201,55 @@ exit: } +/********************************************************************* + * + * Function : ssl_certificate_is_invalid + * + * Description : Checks whether or not a certificate is valid. + * Currently only checks that the certificate can be + * parsed and that the "valid to" date is in the future. + * + * Parameters : + * 1 : cert_file = The certificate to check + * + * Returns : 0 => The certificate is valid. + * 1 => The certificate is invalid + * + *********************************************************************/ +static int ssl_certificate_is_invalid(const char *cert_file) +{ + mbedtls_x509_crt cert; + int ret; + + mbedtls_x509_crt_init(&cert); + + ret = mbedtls_x509_crt_parse_file(&cert, cert_file); + if (ret != 0) + { + char err_buf[ERROR_BUF_SIZE]; + + mbedtls_strerror(ret, err_buf, sizeof(err_buf)); + log_error(LOG_LEVEL_ERROR, + "Loading certificate %s to check validity failed: %s", + cert_file, err_buf); + mbedtls_x509_crt_free(&cert); + + return 1; + } + if (mbedtls_x509_time_is_past(&cert.valid_to)) + { + mbedtls_x509_crt_free(&cert); + + return 1; + } + + mbedtls_x509_crt_free(&cert); + + return 0; + +} + + /********************************************************************* * * Function : generate_webpage_certificate @@ -1217,11 +1264,11 @@ exit: * 1 : csp = Current client state (buffers, headers, etc...) * * Returns : -1 => Error while creating certificate. - * 0 => Certificate alreaday exist. + * 0 => Certificate already exists. * >0 => Length of created certificate. * *********************************************************************/ -extern int generate_webpage_certificate(struct client_state * csp) +static int generate_webpage_certificate(struct client_state *csp) { mbedtls_x509_crt issuer_cert; mbedtls_pk_context loaded_issuer_key, loaded_subject_key; @@ -1236,8 +1283,6 @@ extern int generate_webpage_certificate(struct client_state * csp) char err_buf[ERROR_BUF_SIZE]; cert_options cert_opt; - memset(err_buf, 0, sizeof(err_buf)); - /* Paths to keys and certificates needed to create certificate */ cert_opt.issuer_key = NULL; cert_opt.subject_key = NULL; @@ -1247,7 +1292,7 @@ extern int generate_webpage_certificate(struct client_state * csp) /* * Create key for requested host */ - int subject_key_len = generate_key(&key_buf, csp); + int subject_key_len = generate_key(csp, &key_buf); if (subject_key_len < 0) { log_error(LOG_LEVEL_ERROR, "Key generating failed"); @@ -1258,7 +1303,7 @@ extern int generate_webpage_certificate(struct client_state * csp) * Initializing structures for certificate generating */ mbedtls_x509write_crt_init(&cert); - mbedtls_x509write_crt_set_md_alg( &cert, CERT_SIGNATURE_ALGORITHM); + mbedtls_x509write_crt_set_md_alg(&cert, CERT_SIGNATURE_ALGORITHM); mbedtls_pk_init(&loaded_issuer_key); mbedtls_pk_init(&loaded_subject_key); mbedtls_mpi_init(&serial); @@ -1334,8 +1379,25 @@ extern int generate_webpage_certificate(struct client_state * csp) */ if (file_exists(cert_opt.output_file) == 1 && subject_key_len == 0) { - ret = 0; - goto exit; + /* The file exists, but is it valid */ + if (ssl_certificate_is_invalid(cert_opt.output_file)) + { + log_error(LOG_LEVEL_CONNECT, + "Certificate %s is no longer valid. Removing.", + cert_opt.output_file); + if (unlink(cert_opt.output_file)) + { + log_error(LOG_LEVEL_ERROR, "Failed to unlink %s: %E", + cert_opt.output_file); + ret = -1; + goto exit; + } + } + else + { + ret = 0; + goto exit; + } } /* @@ -1427,8 +1489,8 @@ extern int generate_webpage_certificate(struct client_state * csp) if (!mbedtls_pk_can_do(&issuer_cert.pk, MBEDTLS_PK_RSA) || mbedtls_mpi_cmp_mpi(&mbedtls_pk_rsa(issuer_cert.pk)->N, &mbedtls_pk_rsa(*issuer_key)->N) != 0 || - mbedtls_mpi_cmp_mpi( &mbedtls_pk_rsa(issuer_cert.pk)->E, - &mbedtls_pk_rsa(*issuer_key )->E) != 0) + mbedtls_mpi_cmp_mpi(&mbedtls_pk_rsa(issuer_cert.pk)->E, + &mbedtls_pk_rsa(*issuer_key)->E) != 0) { log_error(LOG_LEVEL_ERROR, "Issuer key doesn't match issuer certificate"); @@ -1554,7 +1616,7 @@ exit: * * Function : make_certs_path * - * Description : Creates path to file from three pieces. This fuction + * Description : Creates path to file from three pieces. This function * takes parameters and puts them in one new mallocated * char * in correct order. Returned variable must be freed * by caller. This function is mainly used for creating @@ -1605,13 +1667,7 @@ static char *make_certs_path(const char *conf_dir, const char *file_name, * absolute path to cwd. */ path_size += strlen(basedir) + 2; - path = (char *)malloc(path_size); - if (path == NULL) - { - log_error(LOG_LEVEL_ERROR, "make_certs_path failed: malloc fail"); - return NULL; - } - memset(path, 0, path_size); + path = zalloc_or_die(path_size); strlcpy(path, basedir, path_size); strlcat(path, delim, path_size); @@ -1623,13 +1679,7 @@ static char *make_certs_path(const char *conf_dir, const char *file_name, else #endif /* defined unix */ { - path = (char *)malloc(path_size); - if (path == NULL) - { - log_error(LOG_LEVEL_ERROR, "make_certs_path failed: malloc fail"); - return NULL; - } - memset(path, 0, path_size); + path = zalloc_or_die(path_size); strlcpy(path, conf_dir, path_size); strlcat(path, delim, path_size); @@ -1641,29 +1691,6 @@ static char *make_certs_path(const char *conf_dir, const char *file_name, } -/********************************************************************* - * - * Function : get_certificate_mutex_id - * - * Description : Computes mutex id from host name hash. This hash must - * be already saved in csp structure - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : Mutex id for given host name - * - *********************************************************************/ -static unsigned int get_certificate_mutex_id(struct client_state *csp) { -#ifdef LIMIT_MUTEX_NUMBER - return (unsigned int)(csp->http->hash_of_host[0] % 32); -#else - return (unsigned int)(csp->http->hash_of_host[1] - + 256 * (int)csp->http->hash_of_host[0]); -#endif /* LIMIT_MUTEX_NUMBER */ -} - - /********************************************************************* * * Function : get_certificate_serial @@ -1678,7 +1705,8 @@ static unsigned int get_certificate_mutex_id(struct client_state *csp) { * Returns : Serial number for new certificate * *********************************************************************/ -static unsigned long get_certificate_serial(struct client_state *csp) { +static unsigned long get_certificate_serial(struct client_state *csp) +{ unsigned long exp = 1; unsigned long serial = 0; @@ -1727,7 +1755,7 @@ extern void ssl_send_certificate_error(struct client_state *csp) "HTTP/1.1 200 OK\r\n" "Content-Type: text/html\r\n" "Connection: close\r\n\r\n" - "

Invalid server certificate

Reason: "; + "

Server certificate verification failed

Reason: "; const char message_end[] = "\r\n\r\n"; char reason[INVALID_CERT_INFO_BUF_SIZE]; memset(reason, 0, sizeof(reason)); @@ -1802,11 +1830,6 @@ extern void ssl_send_certificate_error(struct client_state *csp) */ ssl_send_data(&(csp->mbedtls_client_attr.ssl), (const unsigned char *)message, strlen(message)); - /* - * Waiting before closing connection. Some browsers don't show received - * message if there isn't this delay. - */ - sleep(1); free_certificate_chain(csp); } @@ -1849,38 +1872,28 @@ static int ssl_verify_callback(void *csp_void, mbedtls_x509_crt *crt, /* * Preparing next item in linked list for next certificate - * If malloc fails, we are continuing without this certificate */ - last->next = (struct certs_chain *)malloc(sizeof(struct certs_chain)); - if (last->next != NULL) - { - last->next->next = NULL; - memset(last->next->text_buf, 0, sizeof(last->next->text_buf)); - memset(last->next->file_buf, 0, sizeof(last->next->file_buf)); - - /* - * Saving certificate file into buffer - */ - if ((ret = mbedtls_pem_write_buffer(PEM_BEGIN_CRT, PEM_END_CRT, - crt->raw.p, crt->raw.len, (unsigned char *)last->file_buf, - sizeof(last->file_buf)-1, &olen)) != 0) - { - return(ret); - } + last->next = malloc_or_die(sizeof(struct certs_chain)); + last->next->next = NULL; + memset(last->next->text_buf, 0, sizeof(last->next->text_buf)); + memset(last->next->file_buf, 0, sizeof(last->next->file_buf)); - /* - * Saving certificate information into buffer - */ - mbedtls_x509_crt_info(last->text_buf, sizeof(last->text_buf) - 1, - CERT_INFO_PREFIX, crt); - } - else + /* + * Saving certificate file into buffer + */ + if ((ret = mbedtls_pem_write_buffer(PEM_BEGIN_CRT, PEM_END_CRT, + crt->raw.p, crt->raw.len, (unsigned char *)last->file_buf, + sizeof(last->file_buf)-1, &olen)) != 0) { - log_error(LOG_LEVEL_ERROR, - "Malloc memory for server certificate informations failed"); - return -1; + return(ret); } + /* + * Saving certificate information into buffer + */ + mbedtls_x509_crt_info(last->text_buf, sizeof(last->text_buf) - 1, + CERT_INFO_PREFIX, crt); + return 0; } @@ -1906,7 +1919,7 @@ static void free_certificate_chain(struct client_state *csp) /* Cleaning buffers */ memset(csp->server_certs_chain.text_buf, 0, sizeof(csp->server_certs_chain.text_buf)); - memset(csp->server_certs_chain.text_buf, 0, + memset(csp->server_certs_chain.file_buf, 0, sizeof(csp->server_certs_chain.file_buf)); csp->server_certs_chain.next = NULL; @@ -1924,18 +1937,18 @@ static void free_certificate_chain(struct client_state *csp) /********************************************************************* -* -* Function : file_exists -* -* Description : Tests if file exists and is readable. -* -* Parameters : -* 1 : path = Path to tested file. -* -* Returns : 1 => File exists and is readable. -* 0 => File doesn't exist or is not readable. -* -*********************************************************************/ + * + * Function : file_exists + * + * Description : Tests if file exists and is readable. + * + * Parameters : + * 1 : path = Path to tested file. + * + * Returns : 1 => File exists and is readable. + * 0 => File doesn't exist or is not readable. + * + *********************************************************************/ static int file_exists(const char *path) { FILE *f; @@ -1963,14 +1976,12 @@ static int file_exists(const char *path) * 0 => Hash created successfully * *********************************************************************/ -static int host_to_hash(struct client_state * csp) +static int host_to_hash(struct client_state *csp) { int ret = 0; #if !defined(MBEDTLS_MD5_C) - log_error(LOG_LEVEL_ERROR, "MBEDTLS_MD5_C is not defined. Can't create" - "MD5 hash for certificate and key name."); - return -1; +#error mbedTLS needs to be compiled with md5 support #else memset(csp->http->hash_of_host, 0, sizeof(csp->http->hash_of_host)); mbedtls_md5((unsigned char *)csp->http->host, strlen(csp->http->host), @@ -2072,8 +2083,6 @@ static int seed_rng(struct client_state *csp) int ret = 0; char err_buf[ERROR_BUF_SIZE]; - memset(err_buf, 0, sizeof(err_buf)); - if (rng_seeded == 0) { privoxy_mutex_lock(&rng_mutex);