Commit 597c51bc authored by Matt Caswell's avatar Matt Caswell
Browse files

Merge HRR into ServerHello 



Reviewed-by: default avatarBen Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4701)
parent db37d32c

apps/s_cb.c

+0 −1
Original line number Diff line number Diff line
@@ -525,7 +525,6 @@ static STRINT_PAIR handshakes[] = { 
    {", 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},

crypto/err/openssl.txt

+1 −0
Original line number Diff line number Diff line
@@ -1340,6 +1340,7 @@ SSL_F_TLS_POST_PROCESS_CLIENT_HELLO:378:tls_post_process_client_hello 
SSL_F_TLS_POST_PROCESS_CLIENT_KEY_EXCHANGE:384:\

	tls_post_process_client_key_exchange

SSL_F_TLS_PREPARE_CLIENT_CERTIFICATE:360:tls_prepare_client_certificate

SSL_F_TLS_PROCESS_AS_HELLO_RETRY_REQUEST:610:tls_process_as_hello_retry_request

SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST:361:tls_process_certificate_request

SSL_F_TLS_PROCESS_CERT_STATUS:362:*

SSL_F_TLS_PROCESS_CERT_STATUS_BODY:495:tls_process_cert_status_body

include/openssl/ssl.h

+0 −2
Original line number Diff line number Diff line
@@ -987,8 +987,6 @@ typedef enum { 
    TLS_ST_CR_CERT_VRFY,

    TLS_ST_SW_CERT_VRFY,

    TLS_ST_CR_HELLO_REQ,

    TLS_ST_SW_HELLO_RETRY_REQUEST,

    TLS_ST_CR_HELLO_RETRY_REQUEST,

    TLS_ST_SW_KEY_UPDATE,

    TLS_ST_CW_KEY_UPDATE,

    TLS_ST_SR_KEY_UPDATE,

include/openssl/ssl3.h

+0 −1
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ extern "C" { 
# define SSL3_MT_SERVER_HELLO                    2

# define SSL3_MT_NEWSESSION_TICKET               4

# define SSL3_MT_END_OF_EARLY_DATA               5

# define SSL3_MT_HELLO_RETRY_REQUEST             6

# define SSL3_MT_ENCRYPTED_EXTENSIONS            8

# define SSL3_MT_CERTIFICATE                     11

# define SSL3_MT_SERVER_KEY_EXCHANGE             12

include/openssl/sslerr.h

+1 −0
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_TLS_POST_PROCESS_CLIENT_HELLO              378

# define SSL_F_TLS_POST_PROCESS_CLIENT_KEY_EXCHANGE       384

# define SSL_F_TLS_PREPARE_CLIENT_CERTIFICATE             360

# define SSL_F_TLS_PROCESS_AS_HELLO_RETRY_REQUEST         610

# define SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST            361

# define SSL_F_TLS_PROCESS_CERT_STATUS                    362

# define SSL_F_TLS_PROCESS_CERT_STATUS_BODY               495