Rename FEATURE_HTTPS_FILTERING to FEATURE_HTTPS_INSPECTION

[privoxy.git] / project.h

diff --git a/project.h b/project.h
index 7cd6e50..c0f69a8 100644 (file)
--- a/project.h
+++ b/project.h
@@ -9,7 +9,7 @@
  *                (though it does declare some macros).
  *
  * Copyright   :  Written by and Copyright (C) 2001-2014 the
- *                Privoxy team. http://www.privoxy.org/
+ *                Privoxy team. https://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
  *                by and Copyright (C) 1997 Anonymous Coders and
@@ -44,7 +44,7 @@
 /* Needed for pcre choice */
 #include "config.h"
 
-#ifdef FEATURE_HTTPS_FILTERING
+#ifdef FEATURE_HTTPS_INSPECTION
 #ifdef FEATURE_PTHREAD
 #  include <pthread.h>
    typedef pthread_mutex_t privoxy_mutex_t;
@@ -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
  */
@@ -337,7 +337,7 @@ struct http_request
    int    dcount;  /**< How many parts to this domain? (length of dvec)   */
 #endif /* ndef FEATURE_EXTENDED_HOST_PATTERNS */
 
-#ifdef FEATURE_HTTPS_FILTERING
+#ifdef FEATURE_HTTPS_INSPECTION
    int client_ssl;                                                  /**< Flag if we should comunicate with slient over ssl   */
    int server_ssl;                                                  /**< Flag if we should comunicate 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'       */
@@ -346,35 +346,12 @@ struct http_request
 };
 
 
-#ifdef FEATURE_HTTPS_FILTERING
+#ifdef FEATURE_HTTPS_INSPECTION
 /*
- * 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;
-
-/*
- * Properties of key for generating
+ * If this macro is defined, mutexes count for generating
+ * private keys is changed from 65536 to 32.
  */
-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;
-
+#define LIMIT_MUTEX_NUMBER
 /*
  * Struct for linked list containing certificates
  */
@@ -382,7 +359,7 @@ typedef struct certs_chain {
    char text_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;
+} certs_chain_t;
 #endif
 
 /**
@@ -1043,7 +1020,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
@@ -1060,7 +1037,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
@@ -1116,7 +1093,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;
 
@@ -1561,7 +1538,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;