projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
[privoxy.git]
/
project.h
diff --git
a/project.h
b/project.h
index
a9fe894
..
ec3c155
100644
(file)
--- a/
project.h
+++ b/
project.h
@@
-75,6
+75,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
+311,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
+324,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 */
@@
-1583,6
+1589,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