commit | f31229be918beb36153746ca75f900569b57e30f | [log] [tgz] |
---|---|---|
author | David Benjamin <davidben@google.com> | Wed Jan 25 14:08:15 2017 -0500 |
committer | David Benjamin <davidben@google.com> | Wed Jan 25 17:04:27 2017 -0500 |
tree | 395fcdd018362039a8ecf63cac6f4723cc1e9964 | |
parent | b0b45c63bbbf16b7f5ff3cbe3f1d0905108038aa [diff] [blame] |
external/boringssl: Sync to 6d50f475e319de153a43e1dba5a1beca95948c63. This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/0726fb76ebe7f422e3c4fb2e25a0064926975770..6d50f475e319de153a43e1dba5a1beca95948c63 This also updates the build files to add the new GTest-based targets and work with the C++ file in libssl. Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a Change-Id: I99718d51c901fe2e2e1e0398fc61fe1e76ccdb3f
diff --git a/src/ssl/tls13_both.c b/src/ssl/tls13_both.c index 7347fc4..1425665 100644 --- a/src/ssl/tls13_both.c +++ b/src/ssl/tls13_both.c
@@ -45,9 +45,8 @@ case ssl_hs_flush: case ssl_hs_flush_and_read_message: { - int ret = BIO_flush(ssl->wbio); + int ret = ssl->method->flush_flight(ssl); if (ret <= 0) { - ssl->rwstate = SSL_WRITING; return ret; } if (hs->wait != ssl_hs_flush_and_read_message) {