Breaking Change: merge BoringSSL branch into master

tests/standalone/io/secure_socket_renegotiate_test.dart

Index: tests/standalone/io/secure_socket_renegotiate_test.dart
diff --git a/tests/standalone/io/secure_socket_renegotiate_test.dart b/tests/standalone/io/secure_socket_renegotiate_test.dart
index 595dd0d0ac25e552b7256c0b5c82d6cdc5ad10ea..457cee63625acca1f018667ff615d15aa01d2541 100644
--- a/tests/standalone/io/secure_socket_renegotiate_test.dart
+++ b/tests/standalone/io/secure_socket_renegotiate_test.dart
@@ -14,17 +14,15 @@ import "package:expect/expect.dart";
 import "package:path/path.dart";
 
 const HOST_NAME = "localhost";
-const CERTIFICATE = "localhost_cert";
-
-
-String certificateDatabase() => Platform.script.resolve('pkcert').toFilePath();
+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');
 
 Future<SecureServerSocket> runServer() {
-  SecureSocket.initialize(database: certificateDatabase(),
-                          password: 'dartdart');
-
-  return SecureServerSocket.bind(HOST_NAME, 0, CERTIFICATE)
+  return SecureServerSocket.bind(HOST_NAME, 0, serverContext)
     .then((SecureServerSocket server) {
       server.listen((SecureSocket socket) {
         Expect.isNull(socket.peerCertificate);
@@ -71,8 +69,7 @@ void main() {
       Expect.isTrue(clientScript.endsWith("_client.dart"));
       Process.run(Platform.executable,
                   [clientScript,
-                   server.port.toString(),
-                   certificateDatabase()])
+                   server.port.toString()])
         .then((ProcessResult result) {
           if (result.exitCode != 0) {
             print("Client failed, stdout:");