aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-04-05 11:05:35 +0200
committerMichael Mann <mmann78@netscape.net>2014-04-05 23:40:24 +0000
commitb903789b466f64bcd54f78ae54cea15e128818fc (patch)
tree34822ccdb5076ba71c2b529b07e7317109028055 /epan
parentbf190f26a4717353577c29f12f19f3c760abdd2e (diff)
ssl-utils: add constants defined for draft-ietf-tls-oob-pubkey-11
This adds two tls hello extensions from http://tools.ietf.org/html/draft-ietf-tls-oob-pubkey-11 which got numbers assigned by the IANA in https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml In addition it also adds a new certificate type defined in the same documents. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Change-Id: I3c52d9602f2f255a5700cc6a9954385ad0d7cae8 Reviewed-on: https://code.wireshark.org/review/969 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ssl-utils.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 4d0bf5638d..63d37a0ef5 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -1098,6 +1098,8 @@ const value_string tls_hello_extension_types[] = {
{ SSL_HND_HELLO_EXT_HEARTBEAT, "Heartbeat" }, /* RFC 6520 */
{ SSL_HND_HELLO_EXT_ALPN, "Application Layer Protocol Negotiation" }, /* draft-ietf-tls-applayerprotoneg-01 */
{ SSL_HND_HELLO_EXT_STATUS_REQUEST_V2, "status_request_v2" }, /* RFC 6961 */
+ { 19, "client_certificate_type" }, /* http://tools.ietf.org/html/draft-ietf-tls-oob-pubkey-11 */
+ { 20, "server_certificate_type" }, /* http://tools.ietf.org/html/draft-ietf-tls-oob-pubkey-11 */
{ SSL_HND_HELLO_EXT_SESSION_TICKET, "SessionTicket TLS" }, /* RFC 4507 */
{ SSL_HND_HELLO_EXT_NPN, "next_protocol_negotiation"}, /* http://technotes.googlecode.com/git/nextprotoneg.html */
{ SSL_HND_HELLO_EXT_RENEG_INFO, "renegotiation_info" }, /* RFC 5746 */
@@ -1136,6 +1138,7 @@ const value_string tls_signature_algorithm[] = {
const value_string tls_certificate_type[] = {
{ 0, "X.509" },
{ 1, "OpenPGP" },
+ { 2, "Raw Public Key" }, /* http://tools.ietf.org/html/draft-ietf-tls-oob-pubkey-11 */
{ 0, NULL }
};