Breaking Change: merge BoringSSL branch into master

tests/standalone/io/web_socket_error_test.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 //
 // VMOptions=
 // VMOptions=--short_socket_read
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
 library dart.io;
 
 import "dart:async";
 import "dart:io";
 import "dart:math";
 import "dart:typed_data";
 
 import "package:async_helper/async_helper.dart";
 import "package:expect/expect.dart";
 import "package:path/path.dart";
 
 part "../../../sdk/lib/io/crypto.dart";
 
 
 const String webSocketGUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
 const String CERT_NAME = 'localhost_cert';
 const String HOST_NAME = 'localhost';
 
+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'));
+
 /**
  * A SecurityConfiguration lets us run the tests over HTTP or HTTPS.
  */
 class SecurityConfiguration {
   final bool secure;
 
   SecurityConfiguration({bool this.secure});
 
   Future<HttpServer> createServer({int backlog: 0}) =>
       secure ? HttpServer.bindSecure(HOST_NAME,
                                      0,
-                                     backlog: backlog,
-                                     certificateName: CERT_NAME)
+                                     serverContext,
+                                     backlog: backlog)
              : HttpServer.bind(HOST_NAME,
                                0,
                                backlog: backlog);
 
   Future<WebSocket> createClient(int port) =>
+    // TODO(whesse): Add a client context argument to WebSocket.connect.
     WebSocket.connect('${secure ? "wss" : "ws"}://$HOST_NAME:$port/');
 
 
   void testForceCloseServerEnd(int totalConnections) {
     createServer().then((server) {
       server.listen((request) {
         var response = request.response;
         response.statusCode = HttpStatus.SWITCHING_PROTOCOLS;
         response.headers.set(HttpHeaders.CONNECTION, "upgrade");
         response.headers.set(HttpHeaders.UPGRADE, "websocket");
@@ skipping 26 matching lines @@
       }
     });
   }
 
   void runTests() {
     testForceCloseServerEnd(10);
   }
 }
 
 
-void initializeSSL() {
-  var testPkcertDatabase = Platform.script.resolve('pkcert').toFilePath();
-  SecureSocket.initialize(database: testPkcertDatabase,
-                          password: "dartdart");
-}
-
-
 main() {
   asyncStart();
   new SecurityConfiguration(secure: false).runTests();
-  initializeSSL();
-  new SecurityConfiguration(secure: true).runTests();
+  // TODO(whesse): WebSocket.connect needs an optional context: parameter
+  // new SecurityConfiguration(secure: true).runTests();
   asyncEnd();
 }