diff options
| author | Raimo Niskanen <[email protected]> | 2019-05-08 11:47:38 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-05-08 11:47:38 +0200 |
| commit | b4037b963258b45b62a3bf3dbbdaf3ef7fd06c9c (patch) | |
| tree | 47f5116a23434eeb4a3c5b1a070ad8c4700cd560 /lib/ssl/test/ssl_dist_bench_SUITE.erl | |
| parent | a85ee28f2b72a72da63ada2561e2dd53afdbf6d9 (diff) | |
| parent | acaab6a1dc9aee21f43574a787a9242b718847d6 (diff) | |
| download | otp-b4037b963258b45b62a3bf3dbbdaf3ef7fd06c9c.tar.gz otp-b4037b963258b45b62a3bf3dbbdaf3ef7fd06c9c.tar.bz2 otp-b4037b963258b45b62a3bf3dbbdaf3ef7fd06c9c.zip | |
Merge branch 'raimo/inet_crypto_dist'
* raimo/inet_crypto_dist:
Rekey also the shared secret
Use shared secret to rekey
Cycle the keypair by time and count
Set socket buffer sizes to avoid handshake deadlock
Keep the keypair for the node's lifetime
Implement some kind of PEKE to get forward secrecy
Use incrementing IV
Use Erlang cookie as shared secret
Diffstat (limited to 'lib/ssl/test/ssl_dist_bench_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_dist_bench_SUITE.erl | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/ssl/test/ssl_dist_bench_SUITE.erl b/lib/ssl/test/ssl_dist_bench_SUITE.erl index 1fea6f6f72..67944c74d2 100644 --- a/lib/ssl/test/ssl_dist_bench_SUITE.erl +++ b/lib/ssl/test/ssl_dist_bench_SUITE.erl @@ -169,16 +169,10 @@ end_per_suite(Config) -> init_per_group(ssl, Config) -> [{ssl_dist, true}, {ssl_dist_prefix, "SSL"}|Config]; init_per_group(crypto, Config) -> - case inet_crypto_dist:is_supported() of - true -> - [{ssl_dist, false}, {ssl_dist_prefix, "Crypto"}, - {ssl_dist_args, - "-proto_dist inet_crypto " - "-inet_crypto '#{secret => \"123456\"}'"} - |Config]; - false -> - {skip, "Not supported on this OTP version"} - end; + [{ssl_dist, false}, {ssl_dist_prefix, "Crypto"}, + {ssl_dist_args, + "-proto_dist inet_crypto"} + |Config]; init_per_group(plain, Config) -> [{ssl_dist, false}, {ssl_dist_prefix, "Plain"}|Config]; init_per_group(_GroupName, Config) -> |