From c1677553d1ef529ecdbc1caba877ae2ab5e35bd4 Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Thu, 18 Feb 2021 23:57:20 +0000
Subject: [PATCH] [build] Update boringssl to
 1607f54fed72c6589d560254626909a64124f091

Bug: https://github.com/dart-lang/sdk/issues/41061
Change-Id: I6a02cd3ba42030bf88646e89664515c04234fdb4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/185487
Reviewed-by: Zach Anderson <zra@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
---
 DEPS                                          |  4 +--
 ...secure_server_client_certificate_test.dart | 31 +++++++++++++------
 ...secure_server_client_certificate_test.dart | 31 +++++++++++++------
 3 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/DEPS b/DEPS
index 21261119e9e..da24cc7f387 100644
--- a/DEPS
+++ b/DEPS
@@ -73,8 +73,8 @@ vars = {
   "bazel_worker_rev": "060c55a933d39798681a4f533b161b81dc48d77e",
   "benchmark_harness_rev": "c546dbd9f639f75cd2f75de8df2eb9f8ea15e8e7",
   "boolean_selector_rev": "665e6921ab246569420376f827bff4585dff0b14",
-  "boringssl_gen_rev": "aaac86738c4f2d1bdf00f54d197f50f247ffee04",
-  "boringssl_rev" : "4dfd5af70191b068aebe567b8e29ce108cee85ce",
+  "boringssl_gen_rev": "7322fc15cc065d8d2957fccce6b62a509dc4d641",
+  "boringssl_rev" : "1607f54fed72c6589d560254626909a64124f091",
   "browser-compat-data_tag": "v1.0.22",
   "charcode_rev": "bcd8a12c315b7a83390e4865ad847ecd9344cba2",
   "chrome_rev" : "19997",
diff --git a/tests/standalone/io/secure_server_client_certificate_test.dart b/tests/standalone/io/secure_server_client_certificate_test.dart
index 2223d3ee324..81da9fbf46e 100644
--- a/tests/standalone/io/secure_server_client_certificate_test.dart
+++ b/tests/standalone/io/secure_server_client_certificate_test.dart
@@ -68,16 +68,27 @@ Future testClientCertificate(
   var clientEndFuture =
       SecureSocket.connect(HOST, server.port, context: clientContext);
   if (required && !sendCert) {
-    try {
-      await server.first;
-    } catch (e) {
-      try {
-        await clientEndFuture;
-      } catch (e) {
-        return;
-      }
-    }
-    Expect.fail("Connection succeeded with no required client certificate");
+    final serverErrorCompleter = Completer<Exception>();
+    server.listen((request) {
+      Expect.fail('Should not get a request through');
+    }, onError: (e) => serverErrorCompleter.complete(e));
+
+    final clientDisconnected = Completer();
+    final clientEnd = await clientEndFuture;
+    clientEnd.write(<int>[5, 6, 7, 8]);
+    clientEnd.close();
+    clientEnd.listen((data) {
+      Expect.fail('Should not get data through');
+    }, onError: (e) {
+      Expect.isTrue(e is SocketException);
+    }, onDone: () {
+      clientDisconnected.complete();
+    });
+    Expect.isTrue(await serverErrorCompleter.future is HandshakeException);
+    // Client might not report an error, might get just disconnected.
+    await clientDisconnected.future;
+    server.close();
+    return;
   }
   var serverEnd = await server.first;
   var clientEnd = await clientEndFuture;
diff --git a/tests/standalone_2/io/secure_server_client_certificate_test.dart b/tests/standalone_2/io/secure_server_client_certificate_test.dart
index e28a462d0e4..7c7da85e404 100644
--- a/tests/standalone_2/io/secure_server_client_certificate_test.dart
+++ b/tests/standalone_2/io/secure_server_client_certificate_test.dart
@@ -65,16 +65,27 @@ Future testClientCertificate(
   var clientEndFuture =
       SecureSocket.connect(HOST, server.port, context: clientContext);
   if (required && !sendCert) {
-    try {
-      await server.first;
-    } catch (e) {
-      try {
-        await clientEndFuture;
-      } catch (e) {
-        return;
-      }
-    }
-    Expect.fail("Connection succeeded with no required client certificate");
+    final serverErrorCompleter = Completer<Exception>();
+    server.listen((request) {
+      Expect.fail('Should not get a request through');
+    }, onError: (e) => serverErrorCompleter.complete(e));
+
+    final clientDisconnected = Completer();
+    final clientEnd = await clientEndFuture;
+    clientEnd.write(<int>[5, 6, 7, 8]);
+    clientEnd.close();
+    clientEnd.listen((data) {
+      Expect.fail('Should not get data through');
+    }, onError: (e) {
+      Expect.isTrue(e is SocketException);
+    }, onDone: () {
+      clientDisconnected.complete();
+    });
+    Expect.isTrue(await serverErrorCompleter.future is HandshakeException);
+    // Client might not report an error, might get just disconnected.
+    await clientDisconnected.future;
+    server.close();
+    return;
   }
   var serverEnd = await server.first;
   var clientEnd = await clientEndFuture;