aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_basic_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-05-09 10:57:06 +0200
committerIngela Anderton Andin <[email protected]>2017-05-09 10:57:06 +0200
commit0049bee925a014c2dfb49c8d98eac94165532070 (patch)
tree1059b33807b5cfffa9ff85a38194863220467afe /lib/ssl/test/ssl_basic_SUITE.erl
parente1c70e41196e8118d9f24b8d9023cb0f876ee0df (diff)
parente9b0dbb4a95dbc8e328f08d6df6654dcbe13db09 (diff)
downloadotp-0049bee925a014c2dfb49c8d98eac94165532070.tar.gz
otp-0049bee925a014c2dfb49c8d98eac94165532070.tar.bz2
otp-0049bee925a014c2dfb49c8d98eac94165532070.zip
Merge branch 'ingela/ssl/server-hostname-verify/OTP-14197'
* ingela/ssl/server-hostname-verify/OTP-14197: ssl: Add hostname check of server certificate
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_basic_SUITE.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 018110514c..58870a3419 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -2880,10 +2880,10 @@ der_input(Config) when is_list(Config) ->
Size = ets:info(CADb, size),
- SeverVerifyOpts = ssl_test_lib:ssl_options(server_verification_opts, Config),
+ SeverVerifyOpts = ssl_test_lib:ssl_options(server_opts, Config),
{ServerCert, ServerKey, ServerCaCerts, DHParams} = der_input_opts([{dhfile, DHParamFile} |
SeverVerifyOpts]),
- ClientVerifyOpts = ssl_test_lib:ssl_options(client_verification_opts, Config),
+ ClientVerifyOpts = ssl_test_lib:ssl_options(client_opts, Config),
{ClientCert, ClientKey, ClientCaCerts, DHParams} = der_input_opts([{dhfile, DHParamFile} |
ClientVerifyOpts]),
ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true},