X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=ssl.c;h=85701ce03a47fe6b1b88b8d0700fa18b4365e230;hp=0a45564d3465ba0f2b409a83677754f781211ca3;hb=d119cac814d19b58c0a299ebaeed7f58edf887d5;hpb=2ce0e12445718fed0b44598b70dd18525fb6620b diff --git a/ssl.c b/ssl.c index 0a45564d..85701ce0 100644 --- a/ssl.c +++ b/ssl.c @@ -1,33 +1,34 @@ /********************************************************************* -* -* 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 #include @@ -41,13 +42,16 @@ #include "mbedtls/pem.h" #include "mbedtls/base64.h" #include "mbedtls/error.h" +#include "mbedtls/oid.h" +#include "mbedtls/asn1write.h" +#include "config.h" #include "project.h" #include "miscutil.h" #include "errlog.h" #include "jcc.h" -#include "config.h" #include "ssl.h" +#include "encode.h" /* @@ -65,11 +69,8 @@ #define PRIVATE_KEY_BUF_SIZE 16000 /* Size of buffer to save private key. Value 16000 is taken from mbed TLS library examples. */ #define RSA_KEY_PUBLIC_EXPONENT 65537 /* Public exponent for RSA private key generating */ #define RSA_KEYSIZE 2048 /* Size of generated RSA keys */ -#define GENERATED_CERT_VALID_FROM "20100101000000" /* Date and time, which will be set in generated certificates as parameter valid from */ -#define GENERATED_CERT_VALID_TO "20401231235959" /* Date and time, which will be setted in generated certificates as parameter valid to */ #define CERT_SIGNATURE_ALGORITHM MBEDTLS_MD_SHA256 /* The MD algorithm to use for the signature */ #define CERT_SERIAL_NUM_LENGTH 4 /* Bytes of hash to be used for creating serial number of certificate. Min=2 and max=16 */ -#define LIMIT_MUTEX_NUMBER /* If this macro is defined, mutexes count for generating private keys is changed from 65536 to 32 */ #define INVALID_CERT_INFO_BUF_SIZE 2048 /* Size of buffer for message with information about reason of certificate invalidity. Data after the end of buffer will not be saved */ #define CERT_PARAM_COMMON_NAME "CN=" #define CERT_PARAM_ORGANIZATION ",O=" @@ -80,14 +81,40 @@ #define CERT_SUBJECT_PASSWORD "" #define CERT_INFO_PREFIX "" +/* + * Properties of cert for generating + */ +typedef struct { + char *issuer_crt; /* filename of the issuer certificate */ + char *subject_key; /* filename of the subject key file */ + char *issuer_key; /* filename of the issuer key file */ + const char *subject_pwd; /* password for the subject key file */ + const char *issuer_pwd; /* password for the issuer key file */ + char *output_file; /* where to store the constructed key file */ + const char *subject_name; /* subject name for certificate */ + char issuer_name[ISSUER_NAME_BUF_SIZE]; /* issuer name for certificate */ + const char *not_before; /* validity period not before */ + const char *not_after; /* validity period not after */ + const char *serial; /* serial number string */ + int is_ca; /* is a CA certificate */ + int max_pathlen; /* maximum CA path length */ +} cert_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); +/* + * Properties of key for generating + */ +typedef struct { + mbedtls_pk_type_t type; /* type of key to generate */ + int rsa_keysize; /* length of key in bits */ + char *key_file_path; /* filename of the key file */ +} key_options; + +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); @@ -134,18 +161,21 @@ extern int server_use_ssl(const struct client_state *csp) /********************************************************************* -* -* Function : is_ssl_pending -* -* Description : Tests if there are some waitting 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. + * Only considers data that has actually been received + * locally and ignores data that is still on the fly + * or has not yet been sent by the remote end. + * + * 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) @@ -203,6 +233,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 */ @@ -215,7 +247,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); @@ -230,6 +261,69 @@ extern int ssl_send_data(mbedtls_ssl_context *ssl, const unsigned char *buf, siz } +/********************************************************************* + * + * Function : ssl_send_data_delayed + * + * Description : Sends the contents of buf (for n bytes) to given SSL + * connection, optionally delaying the operation. + * + * Parameters : + * 1 : ssl = SSL context to send data to + * 2 : buf = Pointer to data to be sent + * 3 : len = Length of data to be sent to the SSL context + * 4 : delay = Delay in milliseconds. + * + * Returns : 0 on success (entire buffer sent). + * nonzero on error. + * + *********************************************************************/ +extern int ssl_send_data_delayed(mbedtls_ssl_context *ssl, + const unsigned char *buf, size_t len, + unsigned int delay) +{ + size_t i = 0; + + if (delay == 0) + { + if (ssl_send_data(ssl, buf, len) < 0) + { + return -1; + } + else + { + return 0; + } + } + + while (i < len) + { + size_t write_length; + enum { MAX_WRITE_LENGTH = 10 }; + + if ((i + MAX_WRITE_LENGTH) > len) + { + write_length = len - i; + } + else + { + write_length = MAX_WRITE_LENGTH; + } + + privoxy_millisleep(delay); + + if (ssl_send_data(ssl, buf + i, write_length) < 0) + { + return -1; + } + i += write_length; + } + + return 0; + +} + + /********************************************************************* * * Function : ssl_recv_data @@ -242,8 +336,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) @@ -264,12 +358,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; } @@ -359,8 +462,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 */ @@ -403,19 +504,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 @@ -616,7 +716,7 @@ static void free_client_ssl_structures(struct client_state *csp) { /* * We can't use function mbedtls_net_free, because this function - * inter alia close TCP connection on setted fd. Instead of this + * inter alia close TCP connection on set fd. Instead of this * function, we change fd to -1, which is the same what does * rest of mbedtls_net_free function. */ @@ -653,8 +753,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; @@ -667,7 +765,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 @@ -770,7 +868,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) { @@ -781,17 +879,24 @@ 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 { log_error(LOG_LEVEL_ERROR, "mbedtls_ssl_handshake with server failed: %s", err_buf); + free_certificate_chain(csp); ret = -1; } goto exit; @@ -871,11 +976,11 @@ static void free_server_ssl_structures(struct client_state *csp) { /* * We can't use function mbedtls_net_free, because this function - * inter alia close TCP connection on setted fd. Instead of this + * inter alia close TCP connection on set fd. Instead of this * 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)); @@ -884,6 +989,7 @@ static void free_server_ssl_structures(struct client_state *csp) /********************************************************************* + * * Function : close_client_and_server_ssl_connections * * Description : Checks if client or server should use secured @@ -910,6 +1016,7 @@ extern void close_client_and_server_ssl_connections(struct client_state *csp) /*====================== Certificates ======================*/ /********************************************************************* + * * Function : write_certificate * * Description : Writes certificate into file. @@ -933,11 +1040,10 @@ 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)); /* - * Writing certificate into PEM string. If buffer is too small, fuction + * Writing certificate into PEM string. If buffer is too small, function * returns specific error and no buffer overflow can happen. */ if ((ret = mbedtls_x509write_crt_pem(crt, cert_buf, @@ -976,6 +1082,7 @@ static int write_certificate(mbedtls_x509write_cert *crt, const char *output_fil /********************************************************************* + * * Function : write_private_key * * Description : Writes private key into file and copies saved @@ -1000,18 +1107,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 @@ -1062,6 +1159,7 @@ exit: /********************************************************************* + * * Function : generate_key * * Description : Tests if private key for host saved in csp already @@ -1072,15 +1170,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; @@ -1088,7 +1186,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 @@ -1173,6 +1270,300 @@ 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_certificate_valid_date + * + * Description : Turns a time_t into the format expected by mbedTLS. + * + * Parameters : + * 1 : time_spec = The timestamp to convert + * 2 : buffer = The buffer to write the date to + * 3 : buffer_size = The size of the buffer + * + * Returns : 0 => The conversion worked + * 1 => The conversion failed + * + *********************************************************************/ +static int generate_certificate_valid_date(time_t time_spec, char *buffer, + size_t buffer_size) +{ + struct tm valid_date; + struct tm *timeptr; + size_t ret; + + timeptr = privoxy_gmtime_r(&time_spec, &valid_date); + if (NULL == timeptr) + { + return 1; + } + + ret = strftime(buffer, buffer_size, "%Y%m%d%H%M%S", timeptr); + if (ret != 14) + { + return 1; + } + + return 0; + +} + + +/********************************************************************* + * + * Function : get_certificate_valid_from_date + * + * Description : Generates a "valid from" date in the format + * expected by mbedTLS. + * + * Parameters : + * 1 : buffer = The buffer to write the date to + * 2 : buffer_size = The size of the buffer + * + * Returns : 0 => The generation worked + * 1 => The generation failed + * + *********************************************************************/ +static int get_certificate_valid_from_date(char *buffer, size_t buffer_size) +{ + time_t time_spec; + + time_spec = time(NULL); + /* 1 month in the past */ + time_spec -= 30 * 24 * 60 * 60; + + return generate_certificate_valid_date(time_spec, buffer, buffer_size); + +} + + +/********************************************************************* + * + * Function : get_certificate_valid_to_date + * + * Description : Generates a "valid to" date in the format + * expected by mbedTLS. + * + * Parameters : + * 1 : buffer = The buffer to write the date to + * 2 : buffer_size = The size of the buffer + * + * Returns : 0 => The generation worked + * 1 => The generation failed + * + *********************************************************************/ +static int get_certificate_valid_to_date(char *buffer, size_t buffer_size) +{ + time_t time_spec; + + time_spec = time(NULL); + /* Three months in the future */ + time_spec += 90 * 24 * 60 * 60; + + return generate_certificate_valid_date(time_spec, buffer, buffer_size); + +} + + +/********************************************************************* + * + * Function : set_subject_alternative_name + * + * Description : Sets the Subject Alternative Name extension to a cert + * + * Parameters : + * 1 : cert = The certificate to modify + * 2 : hostname = The hostname to add + * + * Returns : <0 => Error while creating certificate. + * 0 => It worked + * + *********************************************************************/ +static int set_subject_alternative_name(mbedtls_x509write_cert *cert, const char *hostname) +{ + char err_buf[ERROR_BUF_SIZE]; + int ret; + char *subject_alternative_name; + size_t subject_alternative_name_len; +#define MBEDTLS_SUBJECT_ALTERNATIVE_NAME_MAX_LEN 255 + unsigned char san_buf[MBEDTLS_SUBJECT_ALTERNATIVE_NAME_MAX_LEN + 1]; + unsigned char *c; + int len; + + subject_alternative_name_len = strlen(hostname) + 1; + subject_alternative_name = zalloc_or_die(subject_alternative_name_len); + + strlcpy(subject_alternative_name, hostname, subject_alternative_name_len); + + memset(san_buf, 0, sizeof(san_buf)); + + c = san_buf + sizeof(san_buf); + len = 0; + + ret = mbedtls_asn1_write_raw_buffer(&c, san_buf, + (const unsigned char *)subject_alternative_name, + strlen(subject_alternative_name)); + if (ret < 0) + { + mbedtls_strerror(ret, err_buf, sizeof(err_buf)); + log_error(LOG_LEVEL_ERROR, + "mbedtls_asn1_write_raw_buffer() failed: %s", err_buf); + goto exit; + } + len += ret; + + ret = mbedtls_asn1_write_len(&c, san_buf, strlen(subject_alternative_name)); + if (ret < 0) + { + mbedtls_strerror(ret, err_buf, sizeof(err_buf)); + log_error(LOG_LEVEL_ERROR, + "mbedtls_asn1_write_len() failed: %s", err_buf); + goto exit; + } + len += ret; + + ret = mbedtls_asn1_write_tag(&c, san_buf, MBEDTLS_ASN1_CONTEXT_SPECIFIC | 2); + if (ret < 0) + { + mbedtls_strerror(ret, err_buf, sizeof(err_buf)); + log_error(LOG_LEVEL_ERROR, + "mbedtls_asn1_write_tag() failed: %s", err_buf); + goto exit; + } + len += ret; + + ret = mbedtls_asn1_write_len(&c, san_buf, (size_t)len); + if (ret < 0) + { + mbedtls_strerror(ret, err_buf, sizeof(err_buf)); + log_error(LOG_LEVEL_ERROR, + "mbedtls_asn1_write_len() failed: %s", err_buf); + goto exit; + } + len += ret; + + ret = mbedtls_asn1_write_tag(&c, san_buf, + MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE); + if (ret < 0) + { + mbedtls_strerror(ret, err_buf, sizeof(err_buf)); + log_error(LOG_LEVEL_ERROR, + "mbedtls_asn1_write_tag() failed: %s", err_buf); + goto exit; + } + len += ret; + + ret = mbedtls_x509write_crt_set_extension(cert, + MBEDTLS_OID_SUBJECT_ALT_NAME, + MBEDTLS_OID_SIZE(MBEDTLS_OID_SUBJECT_ALT_NAME), + 0, san_buf + sizeof(san_buf) - len, (size_t)len); + if (ret < 0) + { + mbedtls_strerror(ret, err_buf, sizeof(err_buf)); + log_error(LOG_LEVEL_ERROR, + "mbedtls_x509write_crt_set_extension() failed: %s", err_buf); + } + +exit: + freez(subject_alternative_name); + + return ret; + +} + + +/********************************************************************* + * + * Function : host_is_ip_address + * + * Description : Checks whether or not a host is specified by + * IP address. Does not actually validate the + * address. + * + * Parameters : + * 1 : host = The host name to check + * + * Returns : 1 => Yes + * 0 => No + * + *********************************************************************/ +static int host_is_ip_address(const char *host) +{ + const char *p; + + if (NULL != strstr(host, ":")) + { + /* Assume an IPv6 address. */ + return 1; + } + + for (p = host; *p; p++) + { + if ((*p != '.') && !privoxy_isdigit(*p)) + { + /* Not a dot or digit so it can't be an IPv4 address. */ + return 0; + } + } + + /* + * Host only consists of dots and digits so + * assume that is an IPv4 address. + */ + return 1; + +} + + /********************************************************************* * * Function : generate_webpage_certificate @@ -1187,11 +1578,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; @@ -1205,21 +1596,75 @@ extern int generate_webpage_certificate(struct client_state * csp) int ret = 0; char err_buf[ERROR_BUF_SIZE]; cert_options cert_opt; - - memset(err_buf, 0, sizeof(err_buf)); + char cert_valid_from[15]; + char cert_valid_to[15]; /* Paths to keys and certificates needed to create certificate */ cert_opt.issuer_key = NULL; cert_opt.subject_key = NULL; cert_opt.issuer_crt = NULL; - cert_opt.output_file = NULL; + + cert_opt.output_file = make_certs_path(csp->config->certificate_directory, + (const char *)csp->http->hash_of_host_hex, CERT_FILE_TYPE); + if (cert_opt.output_file == NULL) + { + return -1; + } + + cert_opt.subject_key = make_certs_path(csp->config->certificate_directory, + (const char *)csp->http->hash_of_host_hex, KEY_FILE_TYPE); + if (cert_opt.subject_key == NULL) + { + freez(cert_opt.output_file); + return -1; + } + + if (file_exists(cert_opt.output_file) == 1) + { + /* 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 it.", + cert_opt.output_file); + if (unlink(cert_opt.output_file)) + { + log_error(LOG_LEVEL_ERROR, "Failed to unlink %s: %E", + cert_opt.output_file); + + freez(cert_opt.output_file); + freez(cert_opt.subject_key); + + return -1; + } + if (unlink(cert_opt.subject_key)) + { + log_error(LOG_LEVEL_ERROR, "Failed to unlink %s: %E", + cert_opt.subject_key); + + freez(cert_opt.output_file); + freez(cert_opt.subject_key); + + return -1; + } + } + else + { + freez(cert_opt.output_file); + freez(cert_opt.subject_key); + + return 0; + } + } /* * 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) { + freez(cert_opt.output_file); + freez(cert_opt.subject_key); log_error(LOG_LEVEL_ERROR, "Key generating failed"); return -1; } @@ -1228,7 +1673,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); @@ -1250,14 +1695,17 @@ extern int generate_webpage_certificate(struct client_state * csp) * We must compute length of serial number in string + terminating null. */ unsigned long certificate_serial = get_certificate_serial(csp); - int serial_num_size = snprintf(NULL, 0, "%lu", certificate_serial) + 1; + unsigned long certificate_serial_time = (unsigned long)time(NULL); + int serial_num_size = snprintf(NULL, 0, "%lu%lu", + certificate_serial_time, certificate_serial) + 1; if (serial_num_size <= 0) { serial_num_size = 1; } char serial_num_text[serial_num_size]; /* Buffer for serial number */ - ret = snprintf(serial_num_text, (size_t)serial_num_size, "%lu", certificate_serial); + ret = snprintf(serial_num_text, (size_t)serial_num_size, "%lu%lu", + certificate_serial_time, certificate_serial); if (ret < 0 || ret >= serial_num_size) { log_error(LOG_LEVEL_ERROR, @@ -1279,13 +1727,11 @@ extern int generate_webpage_certificate(struct client_state * csp) cert_opt.issuer_crt = csp->config->ca_cert_file; cert_opt.issuer_key = csp->config->ca_key_file; - cert_opt.subject_key = make_certs_path(csp->config->certificate_directory, - (const char *)csp->http->hash_of_host_hex, KEY_FILE_TYPE); - cert_opt.output_file = make_certs_path(csp->config->certificate_directory, - (const char *)csp->http->hash_of_host_hex, CERT_FILE_TYPE); - if (cert_opt.subject_key == NULL || cert_opt.output_file == NULL) + if (get_certificate_valid_from_date(cert_valid_from, sizeof(cert_valid_from)) + || get_certificate_valid_to_date(cert_valid_to, sizeof(cert_valid_to))) { + log_error(LOG_LEVEL_ERROR, "Generating one of the validity dates failed"); ret = -1; goto exit; } @@ -1293,17 +1739,19 @@ extern int generate_webpage_certificate(struct client_state * csp) cert_opt.subject_pwd = CERT_SUBJECT_PASSWORD; cert_opt.issuer_pwd = csp->config->ca_password; cert_opt.subject_name = cert_params; - cert_opt.not_before = GENERATED_CERT_VALID_FROM; - cert_opt.not_after = GENERATED_CERT_VALID_TO; + cert_opt.not_before = cert_valid_from; + cert_opt.not_after = cert_valid_to; cert_opt.serial = serial_num_text; cert_opt.is_ca = 0; cert_opt.max_pathlen = -1; /* - * Test if certificate exists and private key was already created + * Test if the private key was already created. + * XXX: Can this still happen? */ - if (file_exists(cert_opt.output_file) == 1 && subject_key_len == 0) + if (subject_key_len == 0) { + log_error(LOG_LEVEL_ERROR, "Subject key was already created"); ret = 0; goto exit; } @@ -1348,7 +1796,7 @@ extern int generate_webpage_certificate(struct client_state * csp) sizeof(cert_opt.issuer_name), &issuer_cert.subject); if (ret < 0) { - mbedtls_strerror( ret, err_buf, sizeof(err_buf)); + mbedtls_strerror(ret, err_buf, sizeof(err_buf)); log_error(LOG_LEVEL_ERROR, "mbedtls_x509_dn_gets failed: %s", err_buf); ret = -1; goto exit; @@ -1397,8 +1845,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"); @@ -1415,7 +1863,7 @@ extern int generate_webpage_certificate(struct client_state * csp) ret = mbedtls_x509write_crt_set_subject_name(&cert, cert_opt.subject_name); if (ret != 0) { - mbedtls_strerror( ret, err_buf, sizeof(err_buf)); + mbedtls_strerror(ret, err_buf, sizeof(err_buf)); log_error(LOG_LEVEL_ERROR, "Setting subject name in signed certificate failed: %s", err_buf); ret = -1; @@ -1425,7 +1873,7 @@ extern int generate_webpage_certificate(struct client_state * csp) ret = mbedtls_x509write_crt_set_issuer_name(&cert, cert_opt.issuer_name); if (ret != 0) { - mbedtls_strerror( ret, err_buf, sizeof(err_buf)); + mbedtls_strerror(ret, err_buf, sizeof(err_buf)); log_error(LOG_LEVEL_ERROR, "Setting issuer name in signed certificate failed: %s", err_buf); ret = -1; @@ -1446,7 +1894,7 @@ extern int generate_webpage_certificate(struct client_state * csp) cert_opt.not_after); if (ret != 0) { - mbedtls_strerror( ret, err_buf, sizeof(err_buf)); + mbedtls_strerror(ret, err_buf, sizeof(err_buf)); log_error(LOG_LEVEL_ERROR, "Setting validity in signed certificate failed: %s", err_buf); ret = -1; @@ -1460,7 +1908,7 @@ extern int generate_webpage_certificate(struct client_state * csp) cert_opt.max_pathlen); if (ret != 0) { - mbedtls_strerror( ret, err_buf, sizeof(err_buf)); + mbedtls_strerror(ret, err_buf, sizeof(err_buf)); log_error(LOG_LEVEL_ERROR, "Setting the basicConstraints extension " "in signed certificate failed: %s", err_buf); ret = -1; @@ -1472,7 +1920,7 @@ extern int generate_webpage_certificate(struct client_state * csp) ret = mbedtls_x509write_crt_set_subject_key_identifier(&cert); if (ret != 0) { - mbedtls_strerror( ret, err_buf, sizeof(err_buf)); + mbedtls_strerror(ret, err_buf, sizeof(err_buf)); log_error(LOG_LEVEL_ERROR, "mbedtls_x509write_crt_set_subject_key_" "identifier failed: %s", err_buf); ret = -1; @@ -1483,7 +1931,7 @@ extern int generate_webpage_certificate(struct client_state * csp) ret = mbedtls_x509write_crt_set_authority_key_identifier(&cert); if (ret != 0) { - mbedtls_strerror( ret, err_buf, sizeof(err_buf)); + mbedtls_strerror(ret, err_buf, sizeof(err_buf)); log_error(LOG_LEVEL_ERROR, "mbedtls_x509write_crt_set_authority_key_" "identifier failed: %s", err_buf); ret = -1; @@ -1491,6 +1939,14 @@ extern int generate_webpage_certificate(struct client_state * csp) } #endif /* MBEDTLS_SHA1_C */ + if (!host_is_ip_address(csp->http->host) && + set_subject_alternative_name(&cert, csp->http->host)) + { + /* Errors are already logged by set_subject_alternative_name() */ + ret = -1; + goto exit; + } + /* * Writing certificate into file */ @@ -1524,7 +1980,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 @@ -1575,13 +2031,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); @@ -1593,13 +2043,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); @@ -1611,29 +2055,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 @@ -1648,20 +2069,12 @@ 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; int i = CERT_SERIAL_NUM_LENGTH; - /* Length of hash is 16 bytes, we must avoid to read next chars */ - if (i > 16) - { - i = 16; - } - if (i < 2) - { - i = 2; - } for (; i >= 0; i--) { @@ -1692,12 +2105,17 @@ extern void ssl_send_certificate_error(struct client_state *csp) int ret = 0; struct certs_chain *cert = NULL; - /* Header of message with certificate informations */ + /* Header of message with certificate information */ const char message_begin[] = "HTTP/1.1 200 OK\r\n" "Content-Type: text/html\r\n" "Connection: close\r\n\r\n" - "

Invalid server certificate

Reason: "; + "\n" + "Server certificate verification failed\n" + "

Server certificate verification failed

\n" + "

Privoxy was unable " + "to securely connnect to the destination server.

" + "

Reason: "; const char message_end[] = "\r\n\r\n"; char reason[INVALID_CERT_INFO_BUF_SIZE]; memset(reason, 0, sizeof(reason)); @@ -1717,7 +2135,7 @@ extern void ssl_send_certificate_error(struct client_state *csp) { size_t base64_len = 4 * ((strlen(cert->file_buf) + 2) / 3) + 1; - message_len += strlen(cert->text_buf) + strlen("

\n")
+      message_len += strlen(cert->info_buf) + strlen("
\n")
                      +  base64_len + strlen("Download certificate");
       cert = cert->next;
@@ -1752,7 +2170,7 @@ extern void ssl_send_certificate_error(struct client_state *csp)
       }
 
       strlcat(message, "
",        message_len);
-      strlcat(message, cert->text_buf, message_len);
+      strlcat(message, cert->info_buf, message_len);
       strlcat(message, "
\n",     message_len);
 
       if (ret == 0)
@@ -1772,11 +2190,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 doesn't show received
-    * message if there isn't this delay.
-    */
-   sleep(1);
 
    free_certificate_chain(csp);
 }
@@ -1787,10 +2200,10 @@ extern void ssl_send_certificate_error(struct client_state *csp)
  * Function    :  ssl_verify_callback
  *
  * Description :  This is a callback function for certificate verification.
- *                It's called for all certificates in server certificate
- *                trusted chain and it's preparing information about this
- *                certificates. Prepared informations can be used to inform
- *                user about invalid certificates.
+ *                It's called once for each certificate in the server's
+ *                certificate trusted chain and prepares information about
+ *                the certificate. The information can be used to inform
+ *                the user about invalid certificates.
  *
  * Parameters  :
  *          1  :  csp_void = Current client state (buffers, headers, etc...)
@@ -1819,36 +2232,39 @@ 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 = malloc_or_die(sizeof(struct certs_chain));
+   last->next->next = NULL;
+   memset(last->next->info_buf, 0, sizeof(last->next->info_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)
    {
-      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));
+      char err_buf[ERROR_BUF_SIZE];
 
-      /*
-       * 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);
-      }
+      mbedtls_strerror(ret, err_buf, sizeof(err_buf));
+      log_error(LOG_LEVEL_ERROR, "mbedtls_pem_write_buffer() failed: %s",
+         err_buf);
 
-      /*
-       * Saving certificate information into buffer
-       */
-      mbedtls_x509_crt_info(last->text_buf, sizeof(last->text_buf) - 1,
-         CERT_INFO_PREFIX, crt);
+      return(ret);
    }
-   else
+
+   /*
+    * Saving certificate information into buffer
+    */
    {
-      log_error(LOG_LEVEL_ERROR,
-         "Malloc memory for server certificate informations failed");
-      return -1;
+      char buf[CERT_INFO_BUF_SIZE];
+      char *encoded_text;
+
+      mbedtls_x509_crt_info(buf, sizeof(buf), CERT_INFO_PREFIX, crt);
+      encoded_text = html_encode(buf);
+      strlcpy(last->info_buf, encoded_text, sizeof(last->info_buf));
+      freez(encoded_text);
    }
 
    return 0;
@@ -1860,7 +2276,7 @@ static int ssl_verify_callback(void *csp_void, mbedtls_x509_crt *crt,
  * Function    :  free_certificate_chain
  *
  * Description :  Frees certificates linked list. This linked list is
- *                used to save informations about certificates in
+ *                used to save information about certificates in
  *                trusted chain.
  *
  * Parameters  :
@@ -1874,38 +2290,35 @@ static void free_certificate_chain(struct client_state *csp)
    struct certs_chain *cert = csp->server_certs_chain.next;
 
    /* 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.info_buf, 0,
+      sizeof(csp->server_certs_chain.info_buf));
+   memset(csp->server_certs_chain.file_buf, 0,
       sizeof(csp->server_certs_chain.file_buf));
    csp->server_certs_chain.next = NULL;
 
    /* Freeing memory in whole linked list */
-   if (cert != NULL)
+   while (cert != NULL)
    {
-      do
-      {
-         struct certs_chain *cert_for_free = cert;
-         cert = cert->next;
-         freez(cert_for_free);
-      } while (cert != NULL);
+      struct certs_chain *cert_for_free = cert;
+      cert = cert->next;
+      freez(cert_for_free);
    }
 }
 
 
 /*********************************************************************
-*
-* 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;
@@ -1920,27 +2333,25 @@ static int file_exists(const char *path)
 
 
 /*********************************************************************
-*
-* Function    :  host_to_hash
-*
-* Description :  Creates MD5 hash from host name. Host name is loaded
-*                from structure csp and saved again into it.
-*
-* Parameters  :
-*          1  :  csp = Current client state (buffers, headers, etc...)
-*
-* Returns     :  1 => Error while creating hash
-*                0 => Hash created successfully
-*
-*********************************************************************/
-static int host_to_hash(struct client_state * csp)
+ *
+ * Function    :  host_to_hash
+ *
+ * Description :  Creates MD5 hash from host name. Host name is loaded
+ *                from structure csp and saved again into it.
+ *
+ * Parameters  :
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *
+ * Returns     :  1 => Error while creating hash
+ *                0 => Hash created successfully
+ *
+ *********************************************************************/
+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),
@@ -1968,7 +2379,7 @@ static int host_to_hash(struct client_state * csp)
  * Function    :  tunnel_established_successfully
  *
  * Description :  Check if parent proxy server response contains
- *                informations about successfully created connection with
+ *                information about successfully created connection with
  *                destination server. (HTTP/... 2xx ...)
  *
  * Parameters  :
@@ -2042,8 +2453,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);