Wireshark-commits: [Wireshark-commits] master aa09fea: ssl, dtls: move ServerHello to ssl-utils
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=aa09feaf52f842adcf70aca60409281e5739ec08
Submitter: Evan Huus (eapache@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
aa09fea by Peter Wu (peter@xxxxxxxxxxxxx):
ssl,dtls: move ServerHello to ssl-utils
Changes to ServerHello:
- Get rid of session parameter as the SslDecryptSession already
provides a reference to SslSession. Done for the new
ssl_dissect_hnd_srv_hello and ssl_dissect_hnd_hello_ext functions.
- No need to generate the keyring here, decryption is only needed after
ChangeCipherSpec and the keyring will be generated there provided
that there are enough params (cipher, version, master-secret, etc.)
- Get rid of labels and goto in favor of if/else.
- DTLS: SSL_HAVE_SESSION_KEY is implicitly set when
ssl_generate_keyring_material succeeds, no need to set it. Remove it.
- Remove `if (tree || ssl)` since expert info seems not to apply
otherwise (this also needs changes in common and handshake
dissection). (Expert info from the TLS extensions, not the
ServerHello itself.)
Other changes:
- ClientHello: renamed some fields shared with ServerHello.
Change-Id: I466b905d990489e03250bac97bf9d862ff82ce6c
Reviewed-on: https://code.wireshark.org/review/3020
Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
Actions performed:
from fbcfe6e Fix email address and product name in Redback dissector
adds aa09fea ssl,dtls: move ServerHello to ssl-utils
Summary of changes:
epan/dissectors/packet-dtls.c | 120 ++----------------------------------
epan/dissectors/packet-ssl-utils.c | 66 +++++++++++++++++++-
epan/dissectors/packet-ssl-utils.h | 25 +++++++-
epan/dissectors/packet-ssl.c | 110 ++-------------------------------
4 files changed, 99 insertions(+), 222 deletions(-)
