osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Follow SSL -> Follow TLS 

Change-Id: I6b89d07ee5b57d3f3b709d7af7e3362206518a62
Reviewed-on: https://code.wireshark.org/review/30471
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2018-11-01 17:02:55 +01:00
parent 66da676a35
commit dde5c53446
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-tls-utils.c
View File

@ -3570,7 +3570,7 @@ tls13_generate_keys(SslDecryptSession *ssl_session, const StringInfo *secret, gb
}
/* Continue the TLS session with new keys, but reuse old flow to keep things
* like "Follow SSL" working (by linking application data records). */
* like "Follow TLS" working (by linking application data records). */
if (is_from_server) {
decoder->flow = ssl_session->server ? ssl_session->server->flow : ssl_create_flow();
ssl_session->server = decoder;
@ -4586,7 +4586,7 @@ ssl_packet_from_server(SslSession *session, dissector_table_t table, packet_info
/**
* Remembers the decrypted TLS record fragment (TLSInnerPlaintext in TLS 1.3) to
* avoid the need for a decoder in the second pass. Additionally, it remembers
* sequence numbers (for reassembly and Follow SSL Stream).
* sequence numbers (for reassembly and Follow TLS Stream).
*
* @param proto The protocol identifier (proto_ssl or proto_dtls).
* @param pinfo The packet where the record originates from.

2
epan/dissectors/packet-tls.c
View File

@ -4164,7 +4164,7 @@ proto_register_tls(void)
&addresses_ports_reassembly_table_functions);
register_decode_as(&ssl_da);
/* XXX: this seems unused due to new "Follow SSL" method, remove? */
/* XXX: this seems unused due to new "Follow TLS" method, remove? */
tls_tap = register_tap("tls");
ssl_debug_printf("proto_register_ssl: registered tap %s:%d\n",
"tls", tls_tap);