summaryrefslogtreecommitdiff
path: root/test/erl
diff options
context:
space:
mode:
authorJames E. King, III <jking@apache.org>2017-02-15 14:33:20 -0500
committerJames E. King, III <jking@apache.org>2017-02-15 14:33:20 -0500
commit377719c2d85f6f92df7a40e34a84129406f6deb4 (patch)
tree34753d6f0b1a92167a9639887a1efa6d5a2416a0 /test/erl
parentb28160b9c38b7febc3843cf69c6abc12c4d79df5 (diff)
downloadthrift-377719c2d85f6f92df7a40e34a84129406f6deb4.tar.gz
THRIFT-3272 (THRIFT-4066) fix perl SSL authentication support; fixed error in erlang test client using wrong key file and added CA
Client: Perl This closes #1189
Diffstat (limited to 'test/erl')
-rw-r--r--test/erl/src/test_client.erl5
-rw-r--r--test/erl/src/test_thrift_server.erl2
2 files changed, 4 insertions, 3 deletions
diff --git a/test/erl/src/test_client.erl b/test/erl/src/test_client.erl
index 50ffc64fb..c916cee71 100644
--- a/test/erl/src/test_client.erl
+++ b/test/erl/src/test_client.erl
@@ -51,8 +51,9 @@ parse_args([Head | Rest], Opts) ->
ssl:start(),
SslOptions =
{ssloptions, [
- {certfile, "../keys/client.crt"}
- ,{keyfile, "../keys/server.key"}
+ {cacertfile, "../keys/CA.pem"},
+ {certfile, "../keys/client.pem"},
+ {keyfile, "../keys/client.key"}
]},
Opts#options{client_opts = [{ssltransport, true} | [SslOptions | Opts#options.client_opts]]};
"--protocol=" ++ Proto ->
diff --git a/test/erl/src/test_thrift_server.erl b/test/erl/src/test_thrift_server.erl
index f3ed2f7b0..dad8dec93 100644
--- a/test/erl/src/test_thrift_server.erl
+++ b/test/erl/src/test_thrift_server.erl
@@ -51,7 +51,7 @@ parse_args([Head | Rest], Opts) ->
ssl:start(),
SslOptions =
{ssloptions, [
- {certfile, "../keys/server.crt"}
+ {certfile, "../keys/server.pem"}
,{keyfile, "../keys/server.key"}
]},
Opts#options{server_opts = [{ssltransport, true} | [SslOptions | Opts#options.server_opts]]};