diff options
| author | Todd Short <tshort@akamai.com> | 2017-03-16 12:56:01 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-03-16 13:16:51 -0400 |
| commit | 07518cfb3883d1b6ad1d5a413c78a848b6e51177 (patch) | |
| tree | 2f77763334d4353920de8b754699844df9cd3a88 /apps | |
| parent | 6828358c6565af0e31ac1a9ff9c54c94a04bec75 (diff) | |
Add TLSv1.3 draft-19 messages to trace
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2970)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_cb.c | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/apps/s_cb.c b/apps/s_cb.c index 30709cb6d9..4400580119 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -522,24 +522,29 @@ static STRINT_PAIR alert_types[] = { }; static STRINT_PAIR handshakes[] = { - {", HelloRequest", 0}, - {", ClientHello", 1}, - {", ServerHello", 2}, - {", HelloVerifyRequest", 3}, - {", NewSessionTicket", 4}, - {", HelloRetryRequest", 6}, - {", EncryptedExtensions", 8}, - {", Certificate", 11}, - {", ServerKeyExchange", 12}, - {", CertificateRequest", 13}, - {", ServerHelloDone", 14}, - {", CertificateVerify", 15}, - {", ClientKeyExchange", 16}, - {", Finished", 20}, + {", HelloRequest", SSL3_MT_HELLO_REQUEST}, + {", ClientHello", SSL3_MT_CLIENT_HELLO}, + {", ServerHello", SSL3_MT_SERVER_HELLO}, + {", HelloVerifyRequest", DTLS1_MT_HELLO_VERIFY_REQUEST}, + {", NewSessionTicket", SSL3_MT_NEWSESSION_TICKET}, + {", EndOfEarlyData", SSL3_MT_END_OF_EARLY_DATA}, + {", HelloRetryRequest", SSL3_MT_HELLO_RETRY_REQUEST}, + {", EncryptedExtensions", SSL3_MT_ENCRYPTED_EXTENSIONS}, + {", Certificate", SSL3_MT_CERTIFICATE}, + {", ServerKeyExchange", SSL3_MT_SERVER_KEY_EXCHANGE}, + {", CertificateRequest", SSL3_MT_CERTIFICATE_REQUEST}, + {", ServerHelloDone", SSL3_MT_SERVER_DONE}, + {", CertificateVerify", SSL3_MT_CERTIFICATE_VERIFY}, + {", ClientKeyExchange", SSL3_MT_CLIENT_KEY_EXCHANGE}, + {", Finished", SSL3_MT_FINISHED}, {", CertificateUrl", 21}, - {", CertificateStatus", 22}, + {", CertificateStatus", SSL3_MT_CERTIFICATE_STATUS}, {", 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} }; |