Merge "Add missing files to restore io:test"

Juniper · Feb 2, 2017 · 3ce3aa4 · 3ce3aa4
2 parents a315246 + c7c973f
commit 3ce3aa4
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/src/io/test/newcert.pem b/src/io/test/newcert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBrTCCARYCCQC2W9YQ2PQi6DANBgkqhkiG9w0BAQUFADAbMQswCQYDVQQIDAJD
+QTEMMAoGA1UEBwwDU1ZMMB4XDTEzMTExMzE2NTcxMVoXDTIzMTExMTE2NTcxMVow
+GzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NWTDCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEAsxuKwU4m83tWtc2DlW/Vcy+6c7aMivAsFnIuMmahq0pOyqCHjfD+
++GSW7z0aHTbIYXvktEvN5uv5ppjfzJVAnf86b2lL7mZc+4gn8pjh6/Dool/aKhMP
+KSRzNP9QbTozh4E8IKd36KIJnpKTtN4QDj25nOQ04kkOoxTMwsNN3y8CAwEAATAN
+BgkqhkiG9w0BAQUFAAOBgQAprcz72hd5o+WMDhQvjNqg4bhuIQmyG1lOefkmwTRo
+w+uxPZ7cbvz3NeMcaHEElrnfkiFqZFnYxQP+OGo0G56XDXvhOtuK1qIYrBGq9LLO
+F7D2JFo67PzbWmchHuxhqBZpeIEDevziTtgiHgvyIgz2V5IpYCJp5yCwPAe/sXIg
+LQ==
+-----END CERTIFICATE-----
diff --git a/src/io/test/privkey.pem b/src/io/test/privkey.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQCzG4rBTibze1a1zYOVb9VzL7pztoyK8CwWci4yZqGrSk7KoIeN
+8P74ZJbvPRodNshhe+S0S83m6/mmmN/MlUCd/zpvaUvuZlz7iCfymOHr8OiiX9oq
+Ew8pJHM0/1BtOjOHgTwgp3foogmekpO03hAOPbmc5DTiSQ6jFMzCw03fLwIDAQAB
+AoGADg4wQmE2r07TjCrXk6eWEZcCQ8hkmRal7xEAzRW+xCltq3sTiDEMYUPLkHS0
+EuzUpsnJNdjpDKEiE0/V6EEiM+Il+gt5mHYjW8ULhbnDjnyoYrEf37q04JhcA0i8
+F9QXWaKsFyXDWvCGvNLh9YpsE4kUiOtYcPFYBM36fvYOjGECQQDtK78yEVzDViqF
+8ogoRD8cibV5gYT0zSZZf3VO6SAa/IzSq1wtXXINk5M+w6BoOyhspZC1Es1+oXPr
+3TjUsIOxAkEAwVO39Ve9s8KtWUDGtgo5ligaqy8KCSwYIpP/KqK0zAeOUUxVe58V
+EujC6/C2UGs5e6iUk9AVzAVxXNZnm8+o3wJAJQdHepGrYfP5/5+2ElNVZyc45heK
+oo3FBwQXVJKhKJV1hw6p/YsxW11HB+2TBbL2xL+0sBCXdMXQS2rmjI5igQJAdKvQ
+hgj4nEatlQKpqWzMShlT1uFhfh2VRzDnulRNJiCdO+UEZcGg1zOPhxJTBH9hRoZ7
+fCUFMoZKXsup5XdSIwJAci2DbXsu+JiExQttsIDw/n7t4O5LbMUZo9+TBlMQ2ApR
+UNRpF6e4O6ju4RRkA7kNreMTb2YHzOzf46jl8rjYgw==
+-----END RSA PRIVATE KEY-----
diff --git a/src/io/test/ssl_server_test.cc b/src/io/test/ssl_server_test.cc
@@ -69,9 +69,9 @@ class EchoServer : public SslServer {
                               boost::asio::ssl::verify_fail_if_no_peer_cert), ec);
         assert(ec.value() == 0);
         ctx->use_certificate_chain_file
-            ("controller/src/ifmap/client/test/newcert.pem", ec);
+            ("controller/src/io/test/newcert.pem", ec);
         assert(ec.value() == 0);
-        ctx->use_private_key_file("controller/src/ifmap/client/test/privkey.pem",
+        ctx->use_private_key_file("controller/src/io/test/privkey.pem",
                                   boost::asio::ssl::context::pem, ec);
         assert(ec.value() == 0);
         ctx->load_verify_file("controller/src/io/test/ssl_client_cert.pem",
@@ -85,7 +85,7 @@ class EchoServer : public SslServer {
     void set_verify_fail_certs() {
         boost::asio::ssl::context *ctx = context();
         boost::system::error_code ec;
-        ctx->load_verify_file("controller/src/ifmap/client/test/newcert.pem",
+        ctx->load_verify_file("controller/src/io/test/newcert.pem",
                               ec);
         assert(ec.value() == 0);
     }
@@ -201,7 +201,7 @@ class SslClient : public SslServer {
         ctx->use_private_key_file("controller/src/io/test/ssl_client_privkey.pem",
                                   boost::asio::ssl::context::pem, ec);
         assert(ec.value() == 0);
-        ctx->load_verify_file("controller/src/ifmap/client/test/newcert.pem",
+        ctx->load_verify_file("controller/src/io/test/newcert.pem",
                               ec);
         assert(ec.value() == 0);
     }
@@ -220,7 +220,7 @@ class SslClient : public SslServer {
                               boost::asio::ssl::verify_fail_if_no_peer_cert), ec);
         assert(ec.value() == 0);
         ctx->use_certificate_chain_file
-            ("controller/src/ifmap/client/test/newcert.pem", ec);
+            ("controller/src/io/test/newcert.pem", ec);
         assert(ec.value() == 0);
         ctx->load_verify_file("controller/src/io/test/ssl_client_cert.pem",
                               ec);