Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / boringssl / src / ssl / d1_lib.c

diff --git a/src/third_party/boringssl/src/ssl/d1_lib.c b/src/third_party/boringssl/src/ssl/d1_lib.c
index 96ce496..650d8e7 100644 (file)
--- a/src/third_party/boringssl/src/ssl/d1_lib.c
+++ b/src/third_party/boringssl/src/ssl/d1_lib.c
@@ -74,8 +74,9 @@
 static void get_current_time(OPENSSL_timeval *t);
 static OPENSSL_timeval* dtls1_get_timeout(SSL *s, OPENSSL_timeval* timeleft);
 static void dtls1_set_handshake_header(SSL *s, int type, unsigned long len);
-static int dtls1_handshake_write(SSL *s);
+static int dtls1_handshake_write(SSL *s, enum should_add_to_finished_hash should_add_to_finished_hash);
 int dtls1_listen(SSL *s, struct sockaddr *client);
+static void dtls1_add_to_finished_hash(SSL *s);
 
 SSL3_ENC_METHOD DTLSv1_enc_data={
        tls1_enc,
@@ -93,7 +94,8 @@ SSL3_ENC_METHOD DTLSv1_enc_data={
        SSL_ENC_FLAG_DTLS|SSL_ENC_FLAG_EXPLICIT_IV,
        DTLS1_HM_HEADER_LENGTH,
        dtls1_set_handshake_header,
-       dtls1_handshake_write   
+       dtls1_handshake_write,
+       dtls1_add_to_finished_hash,
        };
 
 SSL3_ENC_METHOD DTLSv1_2_enc_data={
@@ -113,7 +115,8 @@ SSL3_ENC_METHOD DTLSv1_2_enc_data={
                |SSL_ENC_FLAG_SHA256_PRF|SSL_ENC_FLAG_TLS1_2_CIPHERS,
        DTLS1_HM_HEADER_LENGTH,
        dtls1_set_handshake_header,
-       dtls1_handshake_write   
+       dtls1_handshake_write,
+       dtls1_add_to_finished_hash,
        };
 
 int dtls1_new(SSL *s)
@@ -502,7 +505,25 @@ static void dtls1_set_handshake_header(SSL *s, int htype, unsigned long len)
        dtls1_buffer_message(s, 0);
        }
 
-static int dtls1_handshake_write(SSL *s)
+static int dtls1_handshake_write(SSL *s, enum should_add_to_finished_hash should_add_to_finished_hash)
        {
-       return dtls1_do_write(s, SSL3_RT_HANDSHAKE);
+       return dtls1_do_write(s, SSL3_RT_HANDSHAKE, should_add_to_finished_hash);
+       }
+
+static void dtls1_add_to_finished_hash(SSL *s)
+       {
+       uint8_t *record = (uint8_t *) &s->init_buf->data[s->init_off];
+       const struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
+       uint8_t serialised_header[DTLS1_HM_HEADER_LENGTH];
+       uint8_t *p = serialised_header;
+
+       /* Construct the message header as if it were a single fragment. */
+       *p++ = msg_hdr->type;
+       l2n3(msg_hdr->msg_len, p);
+       s2n (msg_hdr->seq, p);
+       l2n3(0, p);
+       l2n3(msg_hdr->msg_len, p);
+       ssl3_finish_mac(s, serialised_header, sizeof(serialised_header));
+       ssl3_finish_mac(s, record + DTLS1_HM_HEADER_LENGTH,
+                       s->init_num - DTLS1_HM_HEADER_LENGTH);
        }