OERV-RUNTIME/boringssl
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename SERVER_DONE to SERVER_HELLO_DONE.

Browse Source 
Match the actual name of the type.

Change-Id: I0ad27196ee2876ce0690d13068fa95f68b05b0da
Reviewed-on: https://boringssl-review.googlesource.com/8187
Reviewed-by: David Benjamin <davidben@google.com>
This commit is contained in:
David Benjamin
2016-06-08 19:26:59 +00:00
parent cfec7c60b9
commit 3dcec458f1
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openssl/ssl3.h
+4 -3
View File
@@ -399,7 +399,7 @@ OPENSSL_COMPILE_ASSERT(
#define SSL3_MT_CERTIFICATE 11
#define SSL3_MT_SERVER_KEY_EXCHANGE 12
#define SSL3_MT_CERTIFICATE_REQUEST 13
#define SSL3_MT_SERVER_DONE 14
#define SSL3_MT_SERVER_HELLO_DONE 14
#define SSL3_MT_CERTIFICATE_VERIFY 15
#define SSL3_MT_CLIENT_KEY_EXCHANGE 16
#define SSL3_MT_FINISHED 20
@@ -409,8 +409,9 @@ OPENSSL_COMPILE_ASSERT(
#define SSL3_MT_CHANNEL_ID_ENCRYPTED_EXTENSIONS 203
#define DTLS1_MT_HELLO_VERIFY_REQUEST 3
/* SSL3_MT_NEWSESSION_TICKET is a legacy alias for |SSL3_MT_NEW_SESSION_TICKET|
* for consumers which use |SSL_CTX_set_msg_callback|. */
/* The following are legacy aliases for consumers which use
* |SSL_CTX_set_msg_callback|. */
#define SSL3_MT_SERVER_DONE SSL3_MT_SERVER_HELLO_DONE
#define SSL3_MT_NEWSESSION_TICKET SSL3_MT_NEW_SESSION_TICKET
ssl/handshake_client.c
+6 -6
View File
@@ -178,7 +178,7 @@ static int ssl3_get_cert_status(SSL *ssl);
static int ssl3_verify_server_cert(SSL *ssl);
static int ssl3_get_server_key_exchange(SSL *ssl);
static int ssl3_get_certificate_request(SSL *ssl);
static int ssl3_get_server_done(SSL *ssl);
static int ssl3_get_server_hello_done(SSL *ssl);
static int ssl3_send_client_certificate(SSL *ssl);
static int ssl3_send_client_key_exchange(SSL *ssl);
static int ssl3_send_cert_verify(SSL *ssl);
@@ -323,7 +323,7 @@ int ssl3_connect(SSL *ssl) {
break;
case SSL3_ST_CR_SRVR_DONE_A:
ret = ssl3_get_server_done(ssl);
ret = ssl3_get_server_hello_done(ssl);
if (ret <= 0) {
goto end;
}
@@ -1420,7 +1420,7 @@ static int ssl3_get_certificate_request(SSL *ssl) {
ssl->s3->tmp.cert_req = 0;
if (ssl->s3->tmp.message_type == SSL3_MT_SERVER_DONE) {
if (ssl->s3->tmp.message_type == SSL3_MT_SERVER_HELLO_DONE) {
ssl->s3->tmp.reuse_message = 1;
/* If we get here we don't need the handshake buffer as we won't be doing
* client auth. */
@@ -1515,12 +1515,12 @@ err:
return ret;
}
static int ssl3_get_server_done(SSL *ssl) {
static int ssl3_get_server_hello_done(SSL *ssl) {
int ok;
long n;
n = ssl->method->ssl_get_message(ssl, SSL3_MT_SERVER_DONE, ssl_hash_message,
&ok);
n = ssl->method->ssl_get_message(ssl, SSL3_MT_SERVER_HELLO_DONE,
ssl_hash_message, &ok);
if (!ok) {
return n;
ssl/handshake_server.c
+4 -4
View File
@@ -181,7 +181,7 @@ static int ssl3_send_server_certificate(SSL *ssl);
static int ssl3_send_certificate_status(SSL *ssl);
static int ssl3_send_server_key_exchange(SSL *ssl);
static int ssl3_send_certificate_request(SSL *ssl);
static int ssl3_send_server_done(SSL *ssl);
static int ssl3_send_server_hello_done(SSL *ssl);
static int ssl3_get_client_certificate(SSL *ssl);
static int ssl3_get_client_key_exchange(SSL *ssl);
static int ssl3_get_cert_verify(SSL *ssl);
@@ -344,7 +344,7 @@ int ssl3_accept(SSL *ssl) {
case SSL3_ST_SW_SRVR_DONE_A:
case SSL3_ST_SW_SRVR_DONE_B:
ret = ssl3_send_server_done(ssl);
ret = ssl3_send_server_hello_done(ssl);
if (ret <= 0) {
goto end;
}
@@ -1415,9 +1415,9 @@ err:
return -1;
}
static int ssl3_send_server_done(SSL *ssl) {
static int ssl3_send_server_hello_done(SSL *ssl) {
if (ssl->state == SSL3_ST_SW_SRVR_DONE_A) {
if (!ssl_set_handshake_header(ssl, SSL3_MT_SERVER_DONE, 0)) {
if (!ssl_set_handshake_header(ssl, SSL3_MT_SERVER_HELLO_DONE, 0)) {
return -1;
}
ssl->state = SSL3_ST_SW_SRVR_DONE_B;