diff options
| author | Raimo Niskanen <[email protected]> | 2018-06-11 09:25:18 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2018-06-11 09:25:18 +0200 |
| commit | 46a07a914f049748e03ed78769ba4310753322e0 (patch) | |
| tree | 0f584834907e27bce18b2e9a2f0ca55e580ebcea /lib/ssl/test | |
| parent | cabbb94eab4d94f3c924f8854e3f030d7ceca9cc (diff) | |
| parent | 67a552d897291508a37269b1c0b9909f42dcf325 (diff) | |
| download | otp-46a07a914f049748e03ed78769ba4310753322e0.tar.gz otp-46a07a914f049748e03ed78769ba4310753322e0.tar.bz2 otp-46a07a914f049748e03ed78769ba4310753322e0.zip | |
Merge branch 'raimo/better-TLS-distribution/OTP-15058'
* raimo/better-TLS-distribution/OTP-15058:
Test nodename whitelist
Use public_key to verify client hostname
Diffstat (limited to 'lib/ssl/test')
| -rw-r--r-- | lib/ssl/test/ssl_dist_bench_SUITE.erl | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/ssl/test/ssl_dist_bench_SUITE.erl b/lib/ssl/test/ssl_dist_bench_SUITE.erl index f827ea12bb..3c7904cf24 100644 --- a/lib/ssl/test/ssl_dist_bench_SUITE.erl +++ b/lib/ssl/test/ssl_dist_bench_SUITE.erl @@ -117,19 +117,14 @@ init_per_suite(Config) -> ?MODULE_STRING ++ " ROOT CA", CertOptions), SSLConf = [{verify, verify_peer}, - {fail_if_no_peer_cert, true}, {versions, [TLSVersion]}, {ciphers, [TLSCipher]}], ServerConf = - [{verify_fun, - {fun inet_tls_dist:verify_client/3, - fun inet_tls_dist:cert_nodes/1}} - | SSLConf], - ClientConf = - [{verify_fun, - {fun inet_tls_dist:verify_server/3, - fun inet_tls_dist:cert_nodes/1}} + [{fail_if_no_peer_cert, true}, + {verify_fun, + {fun inet_tls_dist:verify_client/3,[]}} | SSLConf], + ClientConf = SSLConf, %% write_node_conf( NodeAConfFile, NodeA, ServerConf, ClientConf, @@ -291,6 +286,8 @@ roundtrip(A, B, Prefix, HA, HB) -> Rounds = 40000, [] = ssl_apply(HA, erlang, nodes, []), [] = ssl_apply(HB, erlang, nodes, []), + ok = ssl_apply(HA, net_kernel, allow, [[B]]), + ok = ssl_apply(HB, net_kernel, allow, [[A]]), Time = ssl_apply(HA, fun () -> roundtrip_runner(A, B, Rounds) end), [B] = ssl_apply(HA, erlang, nodes, []), [A] = ssl_apply(HB, erlang, nodes, []), |