mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
Tweaks.
This commit is contained in:
parent
e5a42e8a85
commit
5ff7afaadb
2 changed files with 16 additions and 25 deletions
10
doc/_static/broxygen-extra.css
vendored
10
doc/_static/broxygen-extra.css
vendored
|
@ -38,11 +38,15 @@ h2 {
|
|||
font-style: normal;
|
||||
}
|
||||
|
||||
div.section h3 {
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-size: 20px;
|
||||
margin-top: 40px;
|
||||
margin-bottom: 0¡px;
|
||||
font-weight: normal;
|
||||
font-weight: bold;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
|
@ -78,6 +82,10 @@ dl.namespace {
|
|||
display: none;
|
||||
}
|
||||
|
||||
dl dt {
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
table.docutils tbody {
|
||||
margin: 1em 1em 1em 1em;
|
||||
}
|
||||
|
|
|
@ -4668,45 +4668,28 @@ event ssl_established%(c: connection%);
|
|||
## defined as part of the SSL/TLS protocol.
|
||||
##
|
||||
## .. bro:see:: ssl_client_hello ssl_established ssl_extension ssl_server_hello
|
||||
<<<<<<< HEAD
|
||||
## ssl_session_ticket_handshake x509_certificate x509_error x509_extension
|
||||
event ssl_alert%(c: connection, is_orig: bool, level: count, desc: count%);
|
||||
|
||||
## Generated for SSL/TLS handshake. SSL/TLS sessions start with an unencrypted
|
||||
## Generated for SSL/TLS handshake messages that are a part of the stateless-server
|
||||
## session resumption mechanism. SSL/TLS sessions start with an unencrypted
|
||||
## handshake, and Bro extracts as much information out of that as it can. This
|
||||
## event is raised when an SSL/TLS server passes session ticket to the client that
|
||||
## can later be used for resuming the session.
|
||||
## can later be used for resuming the session. The mechanism is described in
|
||||
## :rfc:`4507`
|
||||
##
|
||||
## See `Wikipedia <http://en.wikipedia.org/wiki/Transport_Layer_Security>`__ for
|
||||
## more information about the SSL/TLS protocol.
|
||||
##
|
||||
## c: The connection.
|
||||
##
|
||||
## ticket_lifetime_hint: A hint to the client indicating how long the ticket should
|
||||
## be valid.
|
||||
## ticket_lifetime_hint: A hint from the server about how long the ticket
|
||||
## should be stored by the client.
|
||||
##
|
||||
## ticket: The raw ticket.
|
||||
## ticket: The raw ticket data.
|
||||
##
|
||||
## .. bro:see:: ssl_client_hello ssl_established ssl_extension ssl_server_hello
|
||||
## x509_certificate x509_error x509_extension ssl_alert
|
||||
=======
|
||||
## x509_certificate x509_error x509_extension
|
||||
event ssl_alert%(c: connection, is_orig: bool, level: count, desc: count%);
|
||||
|
||||
## Generated for SSL/TLS session ticket handshake messages that are a part
|
||||
## of the stateless-server session resumption mechanism as described by
|
||||
## :rfc:`4507`.
|
||||
##
|
||||
## c: The connection.
|
||||
##
|
||||
## ticket_lifetime_hint: A hint from the server about how long the ticket
|
||||
## should be stored by the client.
|
||||
##
|
||||
## ticket: The ticket data.
|
||||
##
|
||||
## .. bro:see:: ssl_client_hello ssl_established ssl_extension ssl_server_hello
|
||||
## x509_certificate x509_error x509_extension
|
||||
>>>>>>> fd74eb8e308915fd6766ec221acfd15633361568
|
||||
event ssl_session_ticket_handshake%(c: connection, ticket_lifetime_hint: count, ticket: string%);
|
||||
|
||||
## Generated for x509 certificates seen in SSL/TLS connections. During the initial
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue