Merge branch 'master' into topic/jsiwek/ipv6-ext-headers

This commit is contained in:
Jon Siwek 2012-03-05 09:31:53 -06:00
commit a0e07018f4
27 changed files with 56 additions and 311 deletions

View file

@ -1863,13 +1863,6 @@ global dns_skip_all_addl = T &redef;
## traffic and do not process it. Set to 0 to turn off this functionality.
global dns_max_queries = 5;
## The maxiumum size in bytes for an SSL cipher specifcation. If we see a packet
## that has bigger cipherspecs, we won't do a comparisons of cipherspecs.
const ssl_max_cipherspec_size = 68 &redef;
# todo::Is this still used?
# type X509_extensions: table[count] of string;
## An X509 certificate.
##
## .. bro:see:: x509_certificate
@ -1882,10 +1875,6 @@ type X509: record {
not_valid_after: time; ##< Timestamp after when certificate is not valid.
};
# This is indexed with the CA's name and yields a DER (binary) encoded certificate.
# todo::Is this still used?
# const root_ca_certs: table[string] of string = {} &redef;
## HTTP session statistics.
##
## .. bro:see:: http_stats