diff options
| author | Erlang/OTP <[email protected]> | 2019-06-03 11:34:51 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-06-03 11:34:51 +0200 |
| commit | b931c0c741aadb29cd29a42d82ee2676048caac7 (patch) | |
| tree | a454124ce8dc8e169a72655840a59f99e14e371f /lib/ssl/test/ssl_test_lib.erl | |
| parent | a4a35c8cfd19781875a84dda9db56fe839004d64 (diff) | |
| parent | a04228cc4ebe53af4e676cc6a7642e3a1025cc3f (diff) | |
| download | otp-b931c0c741aadb29cd29a42d82ee2676048caac7.tar.gz otp-b931c0c741aadb29cd29a42d82ee2676048caac7.tar.bz2 otp-b931c0c741aadb29cd29a42d82ee2676048caac7.zip | |
Merge branch 'ingela/ssl/alert-strings/OTP-15844' into maint-21
* ingela/ssl/alert-strings/OTP-15844:
Export named_curve/0
ssl: Export type that user may want to use
ssl: Returned "alert error string" should be same as logged alert string
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index c3e64e62d6..bfed7d6fda 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -440,14 +440,17 @@ check_result(Pid, Msg) -> end. check_server_alert(Pid, Alert) -> receive - {Pid, {error, {tls_alert, {Alert, _}}}} -> + {Pid, {error, {tls_alert, {Alert, STxt}}}} -> + check_server_txt(STxt), ok end. check_server_alert(Server, Client, Alert) -> receive - {Server, {error, {tls_alert, {Alert, _}}}} -> + {Server, {error, {tls_alert, {Alert, STxt}}}} -> + check_server_txt(STxt), receive - {Client, {error, {tls_alert, {Alert, _}}}} -> + {Client, {error, {tls_alert, {Alert, CTxt}}}} -> + check_client_txt(CTxt), ok; {Client, {error, closed}} -> ok @@ -455,20 +458,35 @@ check_server_alert(Server, Client, Alert) -> end. check_client_alert(Pid, Alert) -> receive - {Pid, {error, {tls_alert, {Alert, _}}}} -> + {Pid, {error, {tls_alert, {Alert, CTxt}}}} -> + check_client_txt(CTxt), ok end. check_client_alert(Server, Client, Alert) -> receive - {Client, {error, {tls_alert, {Alert, _}}}} -> + {Client, {error, {tls_alert, {Alert, CTxt}}}} -> + check_client_txt(CTxt), receive - {Server, {error, {tls_alert, {Alert, _}}}} -> + {Server, {error, {tls_alert, {Alert, STxt}}}} -> + check_server_txt(STxt), ok; {Server, {error, closed}} -> ok end end. +check_server_txt("TLS server" ++ _) -> + ok; +check_server_txt("DTLS server" ++ _) -> + ok; +check_server_txt(Txt) -> + ct:fail({expected_server, {got, Txt}}). +check_client_txt("TLS client" ++ _) -> + ok; +check_client_txt("DTLS client" ++ _) -> + ok; +check_client_txt(Txt) -> + ct:fail({expected_server, {got, Txt}}). wait_for_result(Server, ServerMsg, Client, ClientMsg) -> receive |