You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/07/03 17:39:34 UTC
mesos git commit: Fixed the broken SSL build.
Repository: mesos
Updated Branches:
refs/heads/master 096937397 -> 6f3e5e399
Fixed the broken SSL build.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6f3e5e39
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6f3e5e39
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6f3e5e39
Branch: refs/heads/master
Commit: 6f3e5e399647b5cd6991c744a257fd4400ac3fa5
Parents: 0969373
Author: Michael Park <mp...@apache.org>
Authored: Sun Jul 3 18:47:38 2016 +0200
Committer: Michael Park <mp...@apache.org>
Committed: Sun Jul 3 18:47:48 2016 +0200
----------------------------------------------------------------------
3rdparty/libprocess/src/ssl/utilities.cpp | 4 +-
3rdparty/libprocess/src/tests/ssl_tests.cpp | 104 +++++++++++------------
2 files changed, 54 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6f3e5e39/3rdparty/libprocess/src/ssl/utilities.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/ssl/utilities.cpp b/3rdparty/libprocess/src/ssl/utilities.cpp
index d23f462..02bfd17 100644
--- a/3rdparty/libprocess/src/ssl/utilities.cpp
+++ b/3rdparty/libprocess/src/ssl/utilities.cpp
@@ -220,7 +220,7 @@ Try<X509*> generate_x509(
Try<Nothing> write_key_file(EVP_PKEY* private_key, const Path& path)
{
// We use 'FILE*' here because it is an API requirement by openssl.
- FILE* file = fopen(path.value.c_str(), "wb");
+ FILE* file = fopen(path.string().c_str(), "wb");
if (file == nullptr) {
return Error("Failed to open file '" + stringify(path) + "' for writing");
}
@@ -241,7 +241,7 @@ Try<Nothing> write_key_file(EVP_PKEY* private_key, const Path& path)
Try<Nothing> write_certificate_file(X509* x509, const Path& path)
{
// We use 'FILE*' here because it is an API requirement by openssl.
- FILE* file = fopen(path.value.c_str(), "wb");
+ FILE* file = fopen(path.string().c_str(), "wb");
if (file == nullptr) {
return Error("Failed to open file '" + stringify(path) + "' for writing");
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/6f3e5e39/3rdparty/libprocess/src/tests/ssl_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/ssl_tests.cpp b/3rdparty/libprocess/src/tests/ssl_tests.cpp
index cf0119d..6fc9038 100644
--- a/3rdparty/libprocess/src/tests/ssl_tests.cpp
+++ b/3rdparty/libprocess/src/tests/ssl_tests.cpp
@@ -116,11 +116,11 @@ TEST(SSL, Disabled)
TEST_F(SSLTest, BasicSameProcess)
{
os::setenv("SSL_ENABLED", "true");
- os::setenv("SSL_KEY_FILE", key_path().value);
- os::setenv("SSL_CERT_FILE", certificate_path().value);
+ os::setenv("SSL_KEY_FILE", key_path().string());
+ os::setenv("SSL_CERT_FILE", certificate_path().string());
os::setenv("SSL_REQUIRE_CERT", "true");
os::setenv("SSL_CA_DIR", os::getcwd());
- os::setenv("SSL_CA_FILE", certificate_path().value);
+ os::setenv("SSL_CA_FILE", certificate_path().string());
openssl::reinitialize();
@@ -175,14 +175,14 @@ TEST_F(SSLTest, SSLSocket)
{
Try<Socket> server = setup_server({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value}});
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()}});
ASSERT_SOME(server);
Try<Subprocess> client = launch_client({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value}},
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()}},
server.get(),
true);
ASSERT_SOME(client);
@@ -204,14 +204,14 @@ TEST_F(SSLTest, NonSSLSocket)
{
Try<Socket> server = setup_server({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value}});
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()}});
ASSERT_SOME(server);
Try<Subprocess> client = launch_client({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value}},
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()}},
server.get(),
false);
ASSERT_SOME(client);
@@ -230,18 +230,18 @@ TEST_F(SSLTest, NoVerifyBadCA)
{
Try<Socket> server = setup_server({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value},
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()},
{"SSL_VERIFY_CERT", "false"},
{"SSL_REQUIRE_CERT", "false"}});
ASSERT_SOME(server);
Try<Subprocess> client = launch_client({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", scrap_key_path().value},
- {"SSL_CERT_FILE", scrap_certificate_path().value},
+ {"SSL_KEY_FILE", scrap_key_path().string()},
+ {"SSL_CERT_FILE", scrap_certificate_path().string()},
{"SSL_REQUIRE_CERT", "true"},
- {"SSL_CA_FILE", certificate_path().value}},
+ {"SSL_CA_FILE", certificate_path().string()}},
server.get(),
true);
ASSERT_SOME(client);
@@ -264,15 +264,15 @@ TEST_F(SSLTest, RequireBadCA)
{
Try<Socket> server = setup_server({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value},
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()},
{"SSL_REQUIRE_CERT", "true"}});
ASSERT_SOME(server);
Try<Subprocess> client = launch_client({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", scrap_key_path().value},
- {"SSL_CERT_FILE", scrap_certificate_path().value},
+ {"SSL_KEY_FILE", scrap_key_path().string()},
+ {"SSL_CERT_FILE", scrap_certificate_path().string()},
{"SSL_REQUIRE_CERT", "false"}},
server.get(),
true);
@@ -292,15 +292,15 @@ TEST_F(SSLTest, VerifyBadCA)
{
Try<Socket> server = setup_server({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value},
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()},
{"SSL_VERIFY_CERT", "true"}});
ASSERT_SOME(server);
Try<Subprocess> client = launch_client({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", scrap_key_path().value},
- {"SSL_CERT_FILE", scrap_certificate_path().value},
+ {"SSL_KEY_FILE", scrap_key_path().string()},
+ {"SSL_CERT_FILE", scrap_certificate_path().string()},
{"SSL_REQUIRE_CERT", "false"}},
server.get(),
true);
@@ -320,15 +320,15 @@ TEST_F(SSLTest, VerifyCertificate)
{
Try<Socket> server = setup_server({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value},
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()},
{"SSL_VERIFY_CERT", "true"}});
ASSERT_SOME(server);
Try<Subprocess> client = launch_client({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value},
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()},
{"SSL_REQUIRE_CERT", "true"}},
server.get(),
true);
@@ -352,15 +352,15 @@ TEST_F(SSLTest, RequireCertificate)
{
Try<Socket> server = setup_server({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value},
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()},
{"SSL_REQUIRE_CERT", "true"}});
ASSERT_SOME(server);
Try<Subprocess> client = launch_client({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value},
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()},
{"SSL_REQUIRE_CERT", "true"}},
server.get(),
true);
@@ -405,15 +405,15 @@ TEST_F(SSLTest, ProtocolMismatch)
// Set up the default server environment variables.
map<string, string> server_environment = {
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value}
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()}
};
// Set up the default client environment variables.
map<string, string> client_environment = {
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value},
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()},
};
// Disable all protocols except for the one we're testing.
@@ -465,8 +465,8 @@ TEST_F(SSLTest, ValidDowngrade)
Try<Socket> server = setup_server({
{"SSL_ENABLED", "true"},
{"SSL_SUPPORT_DOWNGRADE", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value},
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()},
{"SSL_REQUIRE_CERT", "true"}});
ASSERT_SOME(server);
@@ -494,8 +494,8 @@ TEST_F(SSLTest, NoValidDowngrade)
Try<Socket> server = setup_server({
{"SSL_ENABLED", "true"},
{"SSL_SUPPORT_DOWNGRADE", "false"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value},
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()},
{"SSL_REQUIRE_CERT", "true"}});
ASSERT_SOME(server);
@@ -524,8 +524,8 @@ TEST_F(SSLTest, ValidDowngradeEachProtocol)
map<string, string> server_environment = {
{"SSL_ENABLED", "true"},
{"SSL_SUPPORT_DOWNGRADE", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value}
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()}
};
// Disable all protocols except for the one we're testing.
@@ -571,8 +571,8 @@ TEST_F(SSLTest, NoValidDowngradeEachProtocol)
map<string, string> server_environment = {
{"SSL_ENABLED", "true"},
{"SSL_SUPPORT_DOWNGRADE", "false"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value}
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()}
};
// Disable all protocols except for the one we're testing.
@@ -606,8 +606,8 @@ TEST_F(SSLTest, PeerAddress)
{
Try<Socket> server = setup_server({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value}});
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()}});
ASSERT_SOME(server);
const Try<Socket> client_create = Socket::create(Socket::SSL);
@@ -643,8 +643,8 @@ TEST_F(SSLTest, HTTPSGet)
{
Try<Socket> server = setup_server({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value}});
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()}});
ASSERT_SOME(server);
ASSERT_SOME(server.get().address());
@@ -683,8 +683,8 @@ TEST_F(SSLTest, HTTPSPost)
{
Try<Socket> server = setup_server({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value}});
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()}});
ASSERT_SOME(server);
ASSERT_SOME(server.get().address());
@@ -727,8 +727,8 @@ TEST_F(SSLTest, SilentSocket)
{
Try<Socket> server = setup_server({
{"SSL_ENABLED", "true"},
- {"SSL_KEY_FILE", key_path().value},
- {"SSL_CERT_FILE", certificate_path().value}});
+ {"SSL_KEY_FILE", key_path().string()},
+ {"SSL_CERT_FILE", certificate_path().string()}});
ASSERT_SOME(server);
ASSERT_SOME(server->address());
Re: mesos git commit: Fixed the broken SSL build.
Posted by Benjamin Mahler <bm...@apache.org>.
Thanks! Just saw that I broke the build.
On Sun, Jul 3, 2016 at 10:39 AM, <mp...@apache.org> wrote:
> Repository: mesos
> Updated Branches:
> refs/heads/master 096937397 -> 6f3e5e399
>
>
> Fixed the broken SSL build.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
> Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6f3e5e39
> Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6f3e5e39
> Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6f3e5e39
>
> Branch: refs/heads/master
> Commit: 6f3e5e399647b5cd6991c744a257fd4400ac3fa5
> Parents: 0969373
> Author: Michael Park <mp...@apache.org>
> Authored: Sun Jul 3 18:47:38 2016 +0200
> Committer: Michael Park <mp...@apache.org>
> Committed: Sun Jul 3 18:47:48 2016 +0200
>
> ----------------------------------------------------------------------
> 3rdparty/libprocess/src/ssl/utilities.cpp | 4 +-
> 3rdparty/libprocess/src/tests/ssl_tests.cpp | 104 +++++++++++------------
> 2 files changed, 54 insertions(+), 54 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/mesos/blob/6f3e5e39/3rdparty/libprocess/src/ssl/utilities.cpp
> ----------------------------------------------------------------------
> diff --git a/3rdparty/libprocess/src/ssl/utilities.cpp
> b/3rdparty/libprocess/src/ssl/utilities.cpp
> index d23f462..02bfd17 100644
> --- a/3rdparty/libprocess/src/ssl/utilities.cpp
> +++ b/3rdparty/libprocess/src/ssl/utilities.cpp
> @@ -220,7 +220,7 @@ Try<X509*> generate_x509(
> Try<Nothing> write_key_file(EVP_PKEY* private_key, const Path& path)
> {
> // We use 'FILE*' here because it is an API requirement by openssl.
> - FILE* file = fopen(path.value.c_str(), "wb");
> + FILE* file = fopen(path.string().c_str(), "wb");
> if (file == nullptr) {
> return Error("Failed to open file '" + stringify(path) + "' for
> writing");
> }
> @@ -241,7 +241,7 @@ Try<Nothing> write_key_file(EVP_PKEY* private_key,
> const Path& path)
> Try<Nothing> write_certificate_file(X509* x509, const Path& path)
> {
> // We use 'FILE*' here because it is an API requirement by openssl.
> - FILE* file = fopen(path.value.c_str(), "wb");
> + FILE* file = fopen(path.string().c_str(), "wb");
> if (file == nullptr) {
> return Error("Failed to open file '" + stringify(path) + "' for
> writing");
> }
>
>
> http://git-wip-us.apache.org/repos/asf/mesos/blob/6f3e5e39/3rdparty/libprocess/src/tests/ssl_tests.cpp
> ----------------------------------------------------------------------
> diff --git a/3rdparty/libprocess/src/tests/ssl_tests.cpp
> b/3rdparty/libprocess/src/tests/ssl_tests.cpp
> index cf0119d..6fc9038 100644
> --- a/3rdparty/libprocess/src/tests/ssl_tests.cpp
> +++ b/3rdparty/libprocess/src/tests/ssl_tests.cpp
> @@ -116,11 +116,11 @@ TEST(SSL, Disabled)
> TEST_F(SSLTest, BasicSameProcess)
> {
> os::setenv("SSL_ENABLED", "true");
> - os::setenv("SSL_KEY_FILE", key_path().value);
> - os::setenv("SSL_CERT_FILE", certificate_path().value);
> + os::setenv("SSL_KEY_FILE", key_path().string());
> + os::setenv("SSL_CERT_FILE", certificate_path().string());
> os::setenv("SSL_REQUIRE_CERT", "true");
> os::setenv("SSL_CA_DIR", os::getcwd());
> - os::setenv("SSL_CA_FILE", certificate_path().value);
> + os::setenv("SSL_CA_FILE", certificate_path().string());
>
> openssl::reinitialize();
>
> @@ -175,14 +175,14 @@ TEST_F(SSLTest, SSLSocket)
> {
> Try<Socket> server = setup_server({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value}});
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()}});
> ASSERT_SOME(server);
>
> Try<Subprocess> client = launch_client({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value}},
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()}},
> server.get(),
> true);
> ASSERT_SOME(client);
> @@ -204,14 +204,14 @@ TEST_F(SSLTest, NonSSLSocket)
> {
> Try<Socket> server = setup_server({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value}});
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()}});
> ASSERT_SOME(server);
>
> Try<Subprocess> client = launch_client({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value}},
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()}},
> server.get(),
> false);
> ASSERT_SOME(client);
> @@ -230,18 +230,18 @@ TEST_F(SSLTest, NoVerifyBadCA)
> {
> Try<Socket> server = setup_server({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value},
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()},
> {"SSL_VERIFY_CERT", "false"},
> {"SSL_REQUIRE_CERT", "false"}});
> ASSERT_SOME(server);
>
> Try<Subprocess> client = launch_client({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", scrap_key_path().value},
> - {"SSL_CERT_FILE", scrap_certificate_path().value},
> + {"SSL_KEY_FILE", scrap_key_path().string()},
> + {"SSL_CERT_FILE", scrap_certificate_path().string()},
> {"SSL_REQUIRE_CERT", "true"},
> - {"SSL_CA_FILE", certificate_path().value}},
> + {"SSL_CA_FILE", certificate_path().string()}},
> server.get(),
> true);
> ASSERT_SOME(client);
> @@ -264,15 +264,15 @@ TEST_F(SSLTest, RequireBadCA)
> {
> Try<Socket> server = setup_server({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value},
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()},
> {"SSL_REQUIRE_CERT", "true"}});
> ASSERT_SOME(server);
>
> Try<Subprocess> client = launch_client({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", scrap_key_path().value},
> - {"SSL_CERT_FILE", scrap_certificate_path().value},
> + {"SSL_KEY_FILE", scrap_key_path().string()},
> + {"SSL_CERT_FILE", scrap_certificate_path().string()},
> {"SSL_REQUIRE_CERT", "false"}},
> server.get(),
> true);
> @@ -292,15 +292,15 @@ TEST_F(SSLTest, VerifyBadCA)
> {
> Try<Socket> server = setup_server({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value},
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()},
> {"SSL_VERIFY_CERT", "true"}});
> ASSERT_SOME(server);
>
> Try<Subprocess> client = launch_client({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", scrap_key_path().value},
> - {"SSL_CERT_FILE", scrap_certificate_path().value},
> + {"SSL_KEY_FILE", scrap_key_path().string()},
> + {"SSL_CERT_FILE", scrap_certificate_path().string()},
> {"SSL_REQUIRE_CERT", "false"}},
> server.get(),
> true);
> @@ -320,15 +320,15 @@ TEST_F(SSLTest, VerifyCertificate)
> {
> Try<Socket> server = setup_server({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value},
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()},
> {"SSL_VERIFY_CERT", "true"}});
> ASSERT_SOME(server);
>
> Try<Subprocess> client = launch_client({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value},
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()},
> {"SSL_REQUIRE_CERT", "true"}},
> server.get(),
> true);
> @@ -352,15 +352,15 @@ TEST_F(SSLTest, RequireCertificate)
> {
> Try<Socket> server = setup_server({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value},
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()},
> {"SSL_REQUIRE_CERT", "true"}});
> ASSERT_SOME(server);
>
> Try<Subprocess> client = launch_client({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value},
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()},
> {"SSL_REQUIRE_CERT", "true"}},
> server.get(),
> true);
> @@ -405,15 +405,15 @@ TEST_F(SSLTest, ProtocolMismatch)
> // Set up the default server environment variables.
> map<string, string> server_environment = {
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value}
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()}
> };
>
> // Set up the default client environment variables.
> map<string, string> client_environment = {
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value},
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()},
> };
>
> // Disable all protocols except for the one we're testing.
> @@ -465,8 +465,8 @@ TEST_F(SSLTest, ValidDowngrade)
> Try<Socket> server = setup_server({
> {"SSL_ENABLED", "true"},
> {"SSL_SUPPORT_DOWNGRADE", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value},
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()},
> {"SSL_REQUIRE_CERT", "true"}});
> ASSERT_SOME(server);
>
> @@ -494,8 +494,8 @@ TEST_F(SSLTest, NoValidDowngrade)
> Try<Socket> server = setup_server({
> {"SSL_ENABLED", "true"},
> {"SSL_SUPPORT_DOWNGRADE", "false"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value},
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()},
> {"SSL_REQUIRE_CERT", "true"}});
> ASSERT_SOME(server);
>
> @@ -524,8 +524,8 @@ TEST_F(SSLTest, ValidDowngradeEachProtocol)
> map<string, string> server_environment = {
> {"SSL_ENABLED", "true"},
> {"SSL_SUPPORT_DOWNGRADE", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value}
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()}
> };
>
> // Disable all protocols except for the one we're testing.
> @@ -571,8 +571,8 @@ TEST_F(SSLTest, NoValidDowngradeEachProtocol)
> map<string, string> server_environment = {
> {"SSL_ENABLED", "true"},
> {"SSL_SUPPORT_DOWNGRADE", "false"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value}
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()}
> };
>
> // Disable all protocols except for the one we're testing.
> @@ -606,8 +606,8 @@ TEST_F(SSLTest, PeerAddress)
> {
> Try<Socket> server = setup_server({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value}});
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()}});
> ASSERT_SOME(server);
>
> const Try<Socket> client_create = Socket::create(Socket::SSL);
> @@ -643,8 +643,8 @@ TEST_F(SSLTest, HTTPSGet)
> {
> Try<Socket> server = setup_server({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value}});
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()}});
>
> ASSERT_SOME(server);
> ASSERT_SOME(server.get().address());
> @@ -683,8 +683,8 @@ TEST_F(SSLTest, HTTPSPost)
> {
> Try<Socket> server = setup_server({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value}});
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()}});
>
> ASSERT_SOME(server);
> ASSERT_SOME(server.get().address());
> @@ -727,8 +727,8 @@ TEST_F(SSLTest, SilentSocket)
> {
> Try<Socket> server = setup_server({
> {"SSL_ENABLED", "true"},
> - {"SSL_KEY_FILE", key_path().value},
> - {"SSL_CERT_FILE", certificate_path().value}});
> + {"SSL_KEY_FILE", key_path().string()},
> + {"SSL_CERT_FILE", certificate_path().string()}});
>
> ASSERT_SOME(server);
> ASSERT_SOME(server->address());
>
>