diff options
| author | Péter Dimitrov <[email protected]> | 2019-02-14 14:40:40 +0100 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-02-14 14:40:40 +0100 |
| commit | 5da74b88496c9231d2fbd9cb2b7aea1121b79fa0 (patch) | |
| tree | 3edf51c8096c1f44a5bb87bfe59aca8bddab67a6 /lib/ssl/test/ssl_test_lib.erl | |
| parent | 3103cc205c30dff1c9fe50380eaeed9189a799e4 (diff) | |
| parent | a3de6360569ccbf3be7c10bde88d903f5968d825 (diff) | |
| download | otp-5da74b88496c9231d2fbd9cb2b7aea1121b79fa0.tar.gz otp-5da74b88496c9231d2fbd9cb2b7aea1121b79fa0.tar.bz2 otp-5da74b88496c9231d2fbd9cb2b7aea1121b79fa0.zip | |
Merge branch 'peterdmv/ssl/server-process-client-finished'
* peterdmv/ssl/server-process-client-finished:
ssl: Test TLS 1.3 connectivity
ssl: Fix crash when sending Alerts
ssl: Fix dialyzer warning
ssl: Improve TLS 1.3 statem
Change-Id: I258e0309ba3a132d5ab2056151935a3df8646344
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index b350dabcaf..c921dcae4c 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1106,6 +1106,20 @@ ecc_test_error(COpts, SOpts, CECCOpts, SECCOpts, Config) -> Client = start_client_ecc_error(erlang, Port, COpts, CECCOpts, Config), check_server_alert(Server, Client, insufficient_security). +start_basic_client(openssl, Version, Port, ClientOpts) -> + Cert = proplists:get_value(certfile, ClientOpts), + Key = proplists:get_value(keyfile, ClientOpts), + CA = proplists:get_value(cacertfile, ClientOpts), + Exe = "openssl", + Args = ["s_client", "-verify", "2", "-port", integer_to_list(Port), + ssl_test_lib:version_flag(Version), + "-cert", Cert, "-CAfile", CA, + "-key", Key, "-host","localhost", "-msg", "-debug"], + + OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args), + true = port_command(OpenSslPort, "Hello world"), + OpenSslPort. + start_client(openssl, Port, ClientOpts, Config) -> Cert = proplists:get_value(certfile, ClientOpts), Key = proplists:get_value(keyfile, ClientOpts), @@ -1911,6 +1925,8 @@ version_flag('tlsv1.1') -> "-tls1_1"; version_flag('tlsv1.2') -> "-tls1_2"; +version_flag('tlsv1.3') -> + "-tls1_3"; version_flag(sslv3) -> "-ssl3"; version_flag(sslv2) -> |