Breaking Change: merge BoringSSL branch into master

tests/standalone/io/secure_session_resume_test.dart

Index: tests/standalone/io/secure_session_resume_test.dart
diff --git a/tests/standalone/io/secure_session_resume_test.dart b/tests/standalone/io/secure_session_resume_test.dart
index 5b8a3a3761468a9323b5e19b751037431b1639b5..8ec99a452b57c1b80bbab24df7f92521d52f3be3 100644
--- a/tests/standalone/io/secure_session_resume_test.dart
+++ b/tests/standalone/io/secure_session_resume_test.dart
@@ -24,11 +24,21 @@ import "package:expect/expect.dart";
 import "package:async_helper/async_helper.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<SecureServerSocket> startServer() {
   return SecureServerSocket.bind(HOST,
                                  0,
-                                 CERTIFICATE).then((server) {
+                                 serverContext).then((server) {
     server.listen((SecureSocket client) {
       client.fold(<int>[], (message, data) => message..addAll(data))
           .then((message) {
@@ -44,7 +54,8 @@ Future<SecureServerSocket> startServer() {
 }
 
 Future testClient(server, name) {
-  return SecureSocket.connect(HOST, server.port).then((socket) {
+  return SecureSocket.connect(HOST, server.port, context: clientContext)
+  .then((socket) {
     socket.write("Hello from client $name");
     socket.close();
     return socket.fold(<int>[], (message, data) => message..addAll(data))
@@ -57,9 +68,6 @@ Future testClient(server, name) {
 
 void main() {
   asyncStart();
-  String certificateDatabase = Platform.script.resolve('pkcert').toFilePath();
-  SecureSocket.initialize(database: certificateDatabase,
-                          password: 'dartdart');
   InternetAddress.lookup("localhost").then((hosts) {
     HOST = hosts.first;
     runTests().then((_) => asyncEnd());