aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-05-15 11:04:34 +0200
committerIngela Anderton Andin <[email protected]>2017-05-15 11:04:34 +0200
commitb18f2c3428a52ad648281fc57ffee3d12a1caa0e (patch)
tree4b435a100ab77947085535131a822025b123493a /lib/ssl/test
parent773c4d4f0416f25e3c0c6939f8d0871dc4486bab (diff)
parent1ff077bc7b68f06b0c6157527ca00f4ff5aa4ff4 (diff)
downloadotp-b18f2c3428a52ad648281fc57ffee3d12a1caa0e.tar.gz
otp-b18f2c3428a52ad648281fc57ffee3d12a1caa0e.tar.bz2
otp-b18f2c3428a52ad648281fc57ffee3d12a1caa0e.zip
Merge branch 'ingela/ssl/bench-certs'
* ingela/ssl/bench-certs: ssl: Disable Server Name verification in bench tests for now
Diffstat (limited to 'lib/ssl/test')
-rw-r--r--lib/ssl/test/ssl_bench_SUITE.erl20
1 files changed, 13 insertions, 7 deletions
diff --git a/lib/ssl/test/ssl_bench_SUITE.erl b/lib/ssl/test/ssl_bench_SUITE.erl
index 960ddf7808..ae2928b1c3 100644
--- a/lib/ssl/test/ssl_bench_SUITE.erl
+++ b/lib/ssl/test/ssl_bench_SUITE.erl
@@ -410,13 +410,19 @@ ssl_opts(connect_der) ->
[{verify, verify_peer} | ssl_opts("client_der")];
ssl_opts(Role) ->
CertData = cert_data(Role),
- [{active, false},
- {depth, 2},
- {reuseaddr, true},
- {mode,binary},
- {nodelay, true},
- {ciphers, [{dhe_rsa,aes_256_cbc,sha}]}
- |CertData].
+ Opts = [{active, false},
+ {depth, 2},
+ {reuseaddr, true},
+ {mode,binary},
+ {nodelay, true},
+ {ciphers, [{dhe_rsa,aes_256_cbc,sha}]}
+ |CertData],
+ case Role of
+ "client" ++ _ ->
+ [{server_name_indication, disable} | Opts];
+ "server" ++ _ ->
+ Opts
+ end.
cert_data(Der) when Der =:= "server_der"; Der =:= "client_der" ->
[Role,_] = string:tokens(Der, "_"),