commit c64d1239334b72e92587e91f45becc4a616c4535
author David Benjamin <davidben@google.com> Wed Oct 04 18:14:28 2017 -0400
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue Oct 10 14:27:58 2017 +0000
tree a3651f85dde3c8c60350e214a9f76b687e2a8210
parent 751d1a1c22631b506b3e9bab8ca7fd8bcc1f8edb

Push Span down a layer.

Change-Id: I893292b140d033a5aed7e08f928a6c32996bb983
Reviewed-on: https://boringssl-review.googlesource.com/21287
Commit-Queue: Steven Valdez <svaldez@google.com>
Reviewed-by: Steven Valdez <svaldez@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>

ssl/d1_pkt.cc

diff --git a/ssl/d1_pkt.cc b/ssl/d1_pkt.cc
index 91fc647..d9496d9 100644
--- a/ssl/d1_pkt.cc
+++ b/ssl/d1_pkt.cc
@@ -141,7 +141,7 @@
   }
 
   // Read a new packet if there is no unconsumed one.
-  if (ssl_read_buffer_len(ssl) == 0) {
+  if (ssl_read_buffer(ssl).empty()) {
     int read_ret = ssl_read_buffer_extend_to(ssl, 0 /* unused */);
     if (read_ret < 0 && dtls1_is_timer_expired(ssl)) {
       // Historically, timeouts were handled implicitly if the caller did not
@@ -159,14 +159,13 @@
       return read_ret;
     }
   }
-  assert(ssl_read_buffer_len(ssl) > 0);
+  assert(!ssl_read_buffer(ssl).empty());
 
-  CBS body;
+  Span<uint8_t> body;
   uint8_t type, alert;
   size_t consumed;
-  enum ssl_open_record_t open_ret =
-      dtls_open_record(ssl, &type, &body, &consumed, &alert,
-                       ssl_read_buffer(ssl), ssl_read_buffer_len(ssl));
+  enum ssl_open_record_t open_ret = dtls_open_record(
+      ssl, &type, &body, &consumed, &alert, ssl_read_buffer(ssl));
   ssl_read_buffer_consume(ssl, consumed);
   switch (open_ret) {
     case ssl_open_record_partial:
@@ -174,15 +173,15 @@
       break;
 
     case ssl_open_record_success: {
-      if (CBS_len(&body) > 0xffff) {
+      if (body.size() > 0xffff) {
         OPENSSL_PUT_ERROR(SSL, ERR_R_OVERFLOW);
         return -1;
       }
 
       SSL3_RECORD *rr = &ssl->s3->rrec;
       rr->type = type;
-      rr->length = (uint16_t)CBS_len(&body);
-      rr->data = (uint8_t *)CBS_data(&body);
+      rr->length = static_cast<uint16_t>(body.size());
+      rr->data = body.data();
       return 1;
     }
 
@@ -368,8 +367,7 @@
     BIO_flush(ssl->wbio);
   }
 
-  ssl_do_msg_callback(ssl, 1 /* write */, SSL3_RT_ALERT, ssl->s3->send_alert,
-                      2);
+  ssl_do_msg_callback(ssl, 1 /* write */, SSL3_RT_ALERT, ssl->s3->send_alert);
 
   int alert = (ssl->s3->send_alert[0] << 8) | ssl->s3->send_alert[1];
   ssl_do_info_callback(ssl, SSL_CB_WRITE_ALERT, alert);