Move two typedefs from project.h to ssl.c

[privoxy.git] / project.h

diff --git a/project.h b/project.h
index 75aaa65..cd545b7 100644 (file)
--- a/project.h
+++ b/project.h
@@ -347,34 +347,6 @@ struct http_request
 
 
 #ifdef FEATURE_HTTPS_FILTERING
-/*
- * 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
- */
-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;
-
 /*
  * Struct for linked list containing certificates
  */
@@ -981,7 +953,7 @@ struct reusable_connection
  * Maximum number of actions/filter files.  This limit is arbitrary - it's just used
  * to size an array.
  */
-#define MAX_AF_FILES 30
+#define MAX_AF_FILES 100
 
 /**
  * Maximum number of sockets to listen to.  This limit is arbitrary - it's just used
@@ -1060,6 +1032,11 @@ struct client_state
    /** List of all headers for this request */
    struct list headers[1];
 
+#ifdef FEATURE_HTTPS_FILTERING
+   /** List of all encrypted headers for this request */
+   struct list https_headers[1];
+#endif
+
    /** List of all tags that apply to this request */
    struct list tags[1];