commit 3dcec458f18eb0d8e463de254e71c252970d4cbc
author David Benjamin <davidben@google.com> Tue Jun 07 17:13:28 2016 -0400
committer David Benjamin <davidben@google.com> Wed Jun 08 19:26:59 2016 +0000
tree a53db379a85d2e84db3edf069543e88e8a00c89e
parent cfec7c60b9eb2c403d923081ebc5158cc97e65e7

Rename SERVER_DONE to SERVER_HELLO_DONE.

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>

ssl/handshake_client.c

diff --git a/ssl/handshake_client.c b/ssl/handshake_client.c
index 0360b5e..9b96bcd 100644
--- a/ssl/handshake_client.c
+++ b/ssl/handshake_client.c
@@ -178,7 +178,7 @@
 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 @@
         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 @@
 
   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 @@
   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

diff --git a/ssl/handshake_server.c b/ssl/handshake_server.c
index 0158c79..68a013e 100644
--- a/ssl/handshake_server.c
+++ b/ssl/handshake_server.c
@@ -181,7 +181,7 @@
 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 @@
 
       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 @@
   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;