aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ssl-utils.h
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2017-01-30 17:51:46 +0100
committerMichael Mann <mmann78@netscape.net>2017-01-31 14:53:08 +0000
commitaaa655106af794258215b97292abd4452d21b6fa (patch)
tree96ba715d346df0a286ed24c3d92bbea321de9b79 /epan/dissectors/packet-ssl-utils.h
parentc5adada79e1b10154b22c32b243bb3140bc903d8 (diff)
TLS13: update Certificate for draft -18
Note that RPK (RFC 7250) is not well-defined and is left untouched. https://github.com/tlswg/tls13-spec/issues/722 Certificate extensions dissections remains a task for later. Change-Id: I62276e59db94429e4c09058aca3c08f390ec3af7 Ping-Bug: 12779 Reviewed-on: https://code.wireshark.org/review/19864 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
-rw-r--r--epan/dissectors/packet-ssl-utils.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index 322f9634c3..67c09766ce 100644
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -778,6 +778,8 @@ typedef struct ssl_common_dissect {
gint hs_ext_draft_version_tls13;
gint hs_ext_psk_ke_modes_len;
gint hs_ext_psk_ke_mode;
+ gint hs_certificate_request_context;
+ gint hs_certificate_request_context_length;
/* do not forget to update SSL_COMMON_LIST_T and SSL_COMMON_HF_LIST! */
} hf;
@@ -913,7 +915,7 @@ ssl_common_dissect_t name = { \
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \
- -1, -1, -1, -1, -1, -1, -1, \
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, \
}, \
/* ett */ { \
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \
@@ -1522,6 +1524,16 @@ ssl_common_dissect_t name = { \
{ "PSK Key Exchange Mode", prefix ".handshake.psk_ke_mode", \
FT_UINT8, BASE_DEC, VALS(tls_hello_ext_psk_ke_mode), 0x0, \
"Key exchange modes where the client supports use of PSKs", HFILL } \
+ }, \
+ { & name .hf.hs_certificate_request_context_length, \
+ { "Certificate Request Context Length", prefix ".handshake.certificate_request_context_length", \
+ FT_UINT8, BASE_DEC, NULL, 0x0, \
+ NULL, HFILL } \
+ }, \
+ { & name .hf.hs_certificate_request_context, \
+ { "Certificate Request Context", prefix ".handshake.certificate_request_context", \
+ FT_BYTES, BASE_NONE, NULL, 0x0, \
+ "Value from CertificateRequest or empty for server auth", HFILL } \
}
/* }}} */