projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
privoxy-log-parser: Bump version to 0.9.2
[privoxy.git]
/
project.h
diff --git
a/project.h
b/project.h
index
6821aa0
..
14b957f
100644
(file)
--- a/
project.h
+++ b/
project.h
@@
-59,6
+59,10
@@
typedef pthread_mutex_t privoxy_mutex_t;
#else
# ifdef _WIN32
typedef pthread_mutex_t privoxy_mutex_t;
#else
# ifdef _WIN32
+# include <winsock2.h>
+ /* without winsock2.h I get lots of compiler warnings about
+ * #warning Please include winsock2.h before windows.h
+ */
# include <windows.h>
# endif
typedef CRITICAL_SECTION privoxy_mutex_t;
# include <windows.h>
# endif
typedef CRITICAL_SECTION privoxy_mutex_t;
@@
-75,6
+79,11
@@
#endif /* FEATURE_HTTPS_INSPECTION_MBEDTLS */
#ifdef FEATURE_HTTPS_INSPECTION_OPENSSL
#endif /* FEATURE_HTTPS_INSPECTION_MBEDTLS */
#ifdef FEATURE_HTTPS_INSPECTION_OPENSSL
+#ifdef _WIN32
+#include <wincrypt.h>
+#undef X509_NAME
+#undef X509_EXTENSIONS
+#endif
#include <openssl/ssl.h>
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
#include <openssl/bio.h>
#include <openssl/err.h>
@@
-306,6
+315,7
@@
typedef struct {
mbedtls_x509_crt server_cert;
mbedtls_x509_crt ca_cert;
mbedtls_pk_context prim_key;
mbedtls_x509_crt server_cert;
mbedtls_x509_crt ca_cert;
mbedtls_pk_context prim_key;
+ int *ciphersuites_list;
#if defined(MBEDTLS_SSL_CACHE_C)
mbedtls_ssl_cache_context cache;
#if defined(MBEDTLS_SSL_CACHE_C)
mbedtls_ssl_cache_context cache;
@@
-318,7
+328,7
@@
typedef struct {
* Struct of attributes necessary for TLS/SSL connection
*/
typedef struct {
* Struct of attributes necessary for TLS/SSL connection
*/
typedef struct {
- SSL_CTX
*
ctx;
+ SSL_CTX
*
ctx;
BIO *bio;
} openssl_connection_attr;
#endif /* FEATURE_HTTPS_INSPECTION_OPENSSL */
BIO *bio;
} openssl_connection_attr;
#endif /* FEATURE_HTTPS_INSPECTION_OPENSSL */
@@
-643,8
+653,10
@@
struct iob
#define ACTION_MULTI_SERVER_HEADER_TAGGER 5
/** Number of multi-string actions. */
#define ACTION_MULTI_EXTERNAL_FILTER 6
#define ACTION_MULTI_SERVER_HEADER_TAGGER 5
/** Number of multi-string actions. */
#define ACTION_MULTI_EXTERNAL_FILTER 6
+/** Index into current_action_spec::multi[] for tags to suppress. */
+#define ACTION_MULTI_SUPPRESS_TAG 7
/** Number of multi-string actions. */
/** Number of multi-string actions. */
-#define ACTION_MULTI_COUNT
7
+#define ACTION_MULTI_COUNT
8
/**
/**
@@
-766,6
+778,9
@@
struct reusable_connection
enum forwarder_type forwarder_type;
char *gateway_host;
int gateway_port;
enum forwarder_type forwarder_type;
char *gateway_host;
int gateway_port;
+ char *auth_username;
+ char *auth_password;
+
char *forward_host;
int forward_port;
};
char *forward_host;
int forward_port;
};
@@
-1294,13
+1309,14
@@
enum filter_type
#ifdef FEATURE_EXTERNAL_FILTERS
FT_EXTERNAL_CONTENT_FILTER = 5,
#endif
#ifdef FEATURE_EXTERNAL_FILTERS
FT_EXTERNAL_CONTENT_FILTER = 5,
#endif
+ FT_SUPPRESS_TAG = 6,
FT_INVALID_FILTER = 42,
};
#ifdef FEATURE_EXTERNAL_FILTERS
FT_INVALID_FILTER = 42,
};
#ifdef FEATURE_EXTERNAL_FILTERS
-#define MAX_FILTER_TYPES
6
+#define MAX_FILTER_TYPES
7
#else
#else
-#define MAX_FILTER_TYPES
5
+#define MAX_FILTER_TYPES
6
#endif
/**
#endif
/**
@@
-1580,6
+1596,9
@@
struct configuration_spec
/** Directory for saving certificates and keys for each webpage **/
char *certificate_directory;
/** Directory for saving certificates and keys for each webpage **/
char *certificate_directory;
+ /** Cipher list to use **/
+ char *cipher_list;
+
/** Filename of trusted CAs certificates **/
char * trusted_cas_file;
#endif
/** Filename of trusted CAs certificates **/
char * trusted_cas_file;
#endif
@@
-1633,8
+1652,13
@@
struct configuration_spec
* The prefix for CGI pages. Written out in generated HTML.
* INCLUDES the trailing slash.
*/
* The prefix for CGI pages. Written out in generated HTML.
* INCLUDES the trailing slash.
*/
+#ifdef FEATURE_HTTPS_INSPECTION
+#define CGI_PREFIX "//" CGI_SITE_2_HOST CGI_SITE_2_PATH "/"
+#define CGI_PREFIX_HTTPS "https:" CGI_PREFIX
+#else
#define CGI_PREFIX "http://" CGI_SITE_2_HOST CGI_SITE_2_PATH "/"
#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
+#define CGI_PREFIX_HTTP "http://" CGI_SITE_2_HOST CGI_SITE_2_PATH "/"
#endif /* ndef PROJECT_H_INCLUDED */
#endif /* ndef PROJECT_H_INCLUDED */