Breaking Change: merge BoringSSL branch into master

tests/standalone/io/secure_server_client_no_certificate_test.dart

Index: tests/standalone/io/secure_server_client_no_certificate_test.dart
diff --git a/tests/standalone/io/secure_server_client_no_certificate_test.dart b/tests/standalone/io/secure_server_client_no_certificate_test.dart
index 888f9888fc26cc6084e58001e2f837472a8478e8..97a422b5f2cf5bbbd040dde650c4c7f86204f2b9 100644
--- a/tests/standalone/io/secure_server_client_no_certificate_test.dart
+++ b/tests/standalone/io/secure_server_client_no_certificate_test.dart
@@ -9,16 +9,25 @@ import "package:async_helper/async_helper.dart";
 import "package:expect/expect.dart";
 
 InternetAddress HOST;
-const CERTIFICATE = "localhost_cert";
+String localFile(path) => Platform.script.resolve(path).toFilePath();
+
+SecurityContext serverContext = new SecurityContext()
+  ..useCertificateChain(localFile('certificates/server_chain.pem'))
+  ..usePrivateKey(localFile('certificates/server_key.pem'),
+                  password: 'dartdart');
+
+SecurityContext clientContext = new SecurityContext()
+  ..setTrustedCertificates(file: localFile('certificates/trusted_certs.pem'));
 
 Future testNoClientCertificate() {
   var completer = new Completer();
   SecureServerSocket.bind(HOST,
                           0,
-                          CERTIFICATE,
+                          serverContext,
                           requestClientCertificate: true).then((server) {
     var clientEndFuture = SecureSocket.connect(HOST,
-                                               server.port);
+                                               server.port,
+                                               context: clientContext);
     server.listen((serverEnd) {
       X509Certificate certificate = serverEnd.peerCertificate;
       Expect.isNull(certificate);
@@ -38,10 +47,11 @@ Future testNoRequiredClientCertificate() {
   bool clientError = false;
   SecureServerSocket.bind(HOST,
                           0,
-                          CERTIFICATE,
+                          serverContext,
                           requireClientCertificate: true).then((server) {
-    Future clientDone = SecureSocket.connect(HOST, server.port)
-      .catchError((e) { clientError = true; });
+    Future clientDone =
+        SecureSocket.connect(HOST, server.port, context: clientContext)
+        .catchError((e) { clientError = true; });
     server.listen((serverEnd) {
       Expect.fail("Got a unverifiable connection");
     },
@@ -57,11 +67,6 @@ Future testNoRequiredClientCertificate() {
 }
 
 void main() {
-  String certificateDatabase = Platform.script.resolve('pkcert').toFilePath();
-  SecureSocket.initialize(database: certificateDatabase,
-                          password: 'dartdart',
-                          useBuiltinRoots: false);
-
   asyncStart();
   InternetAddress.lookup("localhost").then((hosts) => HOST = hosts.first)
     .then((_) => testNoRequiredClientCertificate())