mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add TLSv1.3 draft-19 messages to trace

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2970)
This commit is contained in:
Todd Short 2017-03-16 12:56:01 -04:00 committed by Rich Salz
parent 6828358c65
commit 07518cfb38
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
apps/s_cb.c
View File

@ -522,24 +522,29 @@ static STRINT_PAIR alert_types[] = {
}; };
static STRINT_PAIR handshakes[] = { static STRINT_PAIR handshakes[] = {
{", HelloRequest", 0}, {", HelloRequest", SSL3_MT_HELLO_REQUEST},
{", ClientHello", 1}, {", ClientHello", SSL3_MT_CLIENT_HELLO},
{", ServerHello", 2}, {", ServerHello", SSL3_MT_SERVER_HELLO},
{", HelloVerifyRequest", 3}, {", HelloVerifyRequest", DTLS1_MT_HELLO_VERIFY_REQUEST},
{", NewSessionTicket", 4}, {", NewSessionTicket", SSL3_MT_NEWSESSION_TICKET},
{", HelloRetryRequest", 6}, {", EndOfEarlyData", SSL3_MT_END_OF_EARLY_DATA},
{", EncryptedExtensions", 8}, {", HelloRetryRequest", SSL3_MT_HELLO_RETRY_REQUEST},
{", Certificate", 11}, {", EncryptedExtensions", SSL3_MT_ENCRYPTED_EXTENSIONS},
{", ServerKeyExchange", 12}, {", Certificate", SSL3_MT_CERTIFICATE},
{", CertificateRequest", 13}, {", ServerKeyExchange", SSL3_MT_SERVER_KEY_EXCHANGE},
{", ServerHelloDone", 14}, {", CertificateRequest", SSL3_MT_CERTIFICATE_REQUEST},
{", CertificateVerify", 15}, {", ServerHelloDone", SSL3_MT_SERVER_DONE},
{", ClientKeyExchange", 16}, {", CertificateVerify", SSL3_MT_CERTIFICATE_VERIFY},
{", Finished", 20}, {", ClientKeyExchange", SSL3_MT_CLIENT_KEY_EXCHANGE},
{", Finished", SSL3_MT_FINISHED},
{", CertificateUrl", 21}, {", CertificateUrl", 21},
{", CertificateStatus", 22}, {", CertificateStatus", SSL3_MT_CERTIFICATE_STATUS},
{", SupplementalData", 23}, {", SupplementalData", 23},
{", KeyUpdate", 24 }, {", KeyUpdate", SSL3_MT_KEY_UPDATE},
#ifndef OPENSSL_NO_NEXTPROTONEG
{", NextProto", SSL3_MT_NEXT_PROTO},
#endif
{", MessageHash", SSL3_MT_MESSAGE_HASH},
{NULL} {NULL}
}; };

7
ssl/t1_trce.c
View File

@ -85,6 +85,7 @@ static ssl_trace_tbl ssl_handshake_tbl[] = {
{SSL3_MT_SERVER_HELLO, "ServerHello"}, {SSL3_MT_SERVER_HELLO, "ServerHello"},
{DTLS1_MT_HELLO_VERIFY_REQUEST, "HelloVerifyRequest"}, {DTLS1_MT_HELLO_VERIFY_REQUEST, "HelloVerifyRequest"},
{SSL3_MT_NEWSESSION_TICKET, "NewSessionTicket"}, {SSL3_MT_NEWSESSION_TICKET, "NewSessionTicket"},
{SSL3_MT_END_OF_EARLY_DATA, "EndOfEarlyData"},
{SSL3_MT_HELLO_RETRY_REQUEST, "HelloRetryRequest"}, {SSL3_MT_HELLO_RETRY_REQUEST, "HelloRetryRequest"},
{SSL3_MT_ENCRYPTED_EXTENSIONS, "EncryptedExtensions"}, {SSL3_MT_ENCRYPTED_EXTENSIONS, "EncryptedExtensions"},
{SSL3_MT_CERTIFICATE, "Certificate"}, {SSL3_MT_CERTIFICATE, "Certificate"},
@ -97,7 +98,11 @@ static ssl_trace_tbl ssl_handshake_tbl[] = {
{SSL3_MT_CLIENT_KEY_EXCHANGE, "ClientKeyExchange"}, {SSL3_MT_CLIENT_KEY_EXCHANGE, "ClientKeyExchange"},
{SSL3_MT_FINISHED, "Finished"}, {SSL3_MT_FINISHED, "Finished"},
{SSL3_MT_CERTIFICATE_STATUS, "CertificateStatus"}, {SSL3_MT_CERTIFICATE_STATUS, "CertificateStatus"},
{SSL3_MT_KEY_UPDATE, "KeyUpdate"} {SSL3_MT_KEY_UPDATE, "KeyUpdate"},
# ifndef OPENSSL_NO_NEXTPROTONEG
{SSL3_MT_NEXT_PROTO, "NextProto"},
# endif
{SSL3_MT_MESSAGE_HASH, "MessageHash"}
}; };
/* Cipher suites */ /* Cipher suites */