Merge remote-tracking branch 'origin/master' into topic/bernhard/input-threads

This commit is contained in:
Bernhard Amann 2012-03-07 13:43:48 -08:00
commit cd78005d09
38 changed files with 139 additions and 332 deletions

View file

@ -50,17 +50,7 @@ extern int tcp_max_initial_window;
extern int tcp_max_above_hole_without_any_acks;
extern int tcp_excessive_data_without_further_acks;
// see policy/ssl.bro for details
extern int ssl_compare_cipherspecs;
extern int ssl_analyze_certificates;
extern int ssl_store_certificates;
extern int ssl_verify_certificates;
extern int ssl_store_key_material;
extern int ssl_max_cipherspec_size;
extern StringVal* ssl_store_cert_path;
extern StringVal* x509_trusted_cert_path;
extern RecordType* x509_type;
extern StringVal* x509_crl_file;
extern double non_analyzed_lifetime;
extern double tcp_inactivity_timeout;