X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=project.h;h=e241360a610b19649e26a38eea6dcbb8dc7ac14b;hp=c17a47e9d96dbf231672acf5db77b4804cb0b770;hb=9f1d548ce368763dcdda8cb392e2c2533dbd19e9;hpb=767afb7f5d7062d75385b9ab3afdad47d0249a39 diff --git a/project.h b/project.h index c17a47e9..e241360a 100644 --- a/project.h +++ b/project.h @@ -44,7 +44,7 @@ /* Needed for pcre choice */ #include "config.h" -#ifdef FEATURE_HTTPS_FILTERING +#ifdef FEATURE_HTTPS_INSPECTION #ifdef FEATURE_PTHREAD # include typedef pthread_mutex_t privoxy_mutex_t; @@ -175,7 +175,7 @@ typedef enum privoxy_err jb_err; /** * This macro is used to free a pointer that may be NULL. * It also sets the variable to NULL after it's been freed. - * The paramater should be a simple variable without side effects. + * The parameter should be a simple variable without side effects. */ #define freez(X) { if(X) { free((void*)X); X = NULL ; } } @@ -276,7 +276,7 @@ struct map_entry /** * A map from a string to another string. - * This is used for the paramaters passed in a HTTP GET request, and + * This is used for the parameters passed in a HTTP GET request, and * to store the exports when the CGI interface is filling in a template. */ struct map @@ -287,7 +287,7 @@ struct map struct map_entry *last; }; -#ifdef FEATURE_HTTPS_FILTERING +#ifdef FEATURE_HTTPS_INSPECTION /* * Struct of attributes necessary for TLS/SSL connection */ @@ -319,7 +319,7 @@ struct http_request char *ocmd; /**< Backup of original cmd for CLF logging */ char *gpc; /**< HTTP method: GET, POST, ... */ char *url; /**< The URL */ - char *ver; /**< Protocol version */ + char *version; /**< Protocol version */ int status; /**< HTTP Status */ char *host; /**< Host part of URL */ @@ -337,26 +337,21 @@ struct http_request int dcount; /**< How many parts to this domain? (length of dvec) */ #endif /* ndef FEATURE_EXTENDED_HOST_PATTERNS */ -#ifdef FEATURE_HTTPS_FILTERING - int client_ssl; /**< Flag if we should comunicate with slient over ssl */ - int server_ssl; /**< Flag if we should comunicate with server over ssl */ +#ifdef FEATURE_HTTPS_INSPECTION + int client_ssl; /**< Flag if we should communicate with client over ssl */ + int server_ssl; /**< Flag if we should communicate with server over ssl */ unsigned char hash_of_host_hex[(HASH_OF_HOST_BUF_SIZE * 2) + 1]; /**< chars for hash in hex string and one for '\0' */ unsigned char hash_of_host[HASH_OF_HOST_BUF_SIZE+1]; /**< chars for bytes of hash and one for '\0' */ #endif }; -#ifdef FEATURE_HTTPS_FILTERING -/* - * If this macro is defined, mutexes count for generating - * private keys is changed from 65536 to 32. - */ -#define LIMIT_MUTEX_NUMBER +#ifdef FEATURE_HTTPS_INSPECTION /* * Struct for linked list containing certificates */ typedef struct certs_chain { - char text_buf[CERT_INFO_BUF_SIZE]; /* text info about properties of certificate */ + char info_buf[CERT_INFO_BUF_SIZE]; /* text info about properties of certificate */ char file_buf[CERT_FILE_BUF_SIZE]; /* buffer for whole certificate - format to save in file */ struct certs_chain *next; /* next certificate in chain of trust */ } certs_chain_t; @@ -496,13 +491,14 @@ struct iob */ #define CT_GZIP 0x0010U /**< gzip-compressed data. */ #define CT_DEFLATE 0x0020U /**< zlib-compressed data. */ +#define CT_BROTLI 0x0040U /**< Brotli-compressed data. */ /** * Flag to signal that the server declared the content type, * so we can differentiate between unknown and undeclared * content types. */ -#define CT_DECLARED 0x0040U +#define CT_DECLARED 0x0080U /** * The mask which includes all actions. @@ -572,8 +568,8 @@ struct iob #define ACTION_LIMIT_COOKIE_LIFETIME 0x08000000UL /** Action bitmap: Delay writes */ #define ACTION_DELAY_RESPONSE 0x10000000UL -/** Action bitmap: Turn https filtering on */ -#define ACTION_ENABLE_HTTPS_FILTER 0x20000000UL +/** Action bitmap: Turn https inspection on */ +#define ACTION_HTTPS_INSPECTION 0x20000000UL /** Action bitmap: Turn certificates verification off */ #define ACTION_IGNORE_CERTIFICATE_ERRORS 0x40000000UL @@ -655,7 +651,7 @@ struct current_action_spec unsigned long flags; /** - * Paramaters for those actions that require them. + * Parameters for those actions that require them. * Each entry is valid if & only if the corresponding entry in "flags" is * set. */ @@ -927,7 +923,7 @@ struct reusable_connection #define CSP_FLAG_UNSUPPORTED_CLIENT_EXPECTATION 0x02000000U /** - * Flag for csp->flags: Set if we answered the request ourselve. + * Flag for csp->flags: Set if we answered the request ourselves. */ #define CSP_FLAG_CRUNCHED 0x04000000U @@ -1020,7 +1016,7 @@ struct client_state /* XXX: should be renamed to server_iob */ struct iob iob[1]; -#ifdef FEATURE_HTTPS_FILTERING +#ifdef FEATURE_HTTPS_INSPECTION mbedtls_connection_attr mbedtls_server_attr; /* attributes for connection to server */ mbedtls_connection_attr mbedtls_client_attr; /* attributes for connection to client */ #endif @@ -1037,7 +1033,7 @@ struct client_state /** List of all headers for this request */ struct list headers[1]; -#ifdef FEATURE_HTTPS_FILTERING +#ifdef FEATURE_HTTPS_INSPECTION /** List of all encrypted headers for this request */ struct list https_headers[1]; #endif @@ -1093,7 +1089,7 @@ struct client_state */ char *error_message; -#ifdef FEATURE_HTTPS_FILTERING +#ifdef FEATURE_HTTPS_INSPECTION /* Result of server certificate verification */ uint32_t server_cert_verification_result; @@ -1110,7 +1106,7 @@ struct client_state /* * Server certificate chain of trust including strings with certificates - * informations and string with whole certificate file + * information and string with whole certificate file */ struct certs_chain server_certs_chain; #endif @@ -1538,7 +1534,7 @@ struct configuration_spec /** Nonzero if we need to bind() to the new port. */ int need_bind; -#ifdef FEATURE_HTTPS_FILTERING +#ifdef FEATURE_HTTPS_INSPECTION /** Password for proxy ca file **/ char * ca_password; @@ -1608,6 +1604,7 @@ struct configuration_spec * INCLUDES the trailing slash. */ #define CGI_PREFIX "http://" CGI_SITE_2_HOST CGI_SITE_2_PATH "/" +#define CGI_PREFIX_HTTPS "https://" CGI_SITE_2_HOST CGI_SITE_2_PATH "/" #endif /* ndef PROJECT_H_INCLUDED */