diff options
author | Ingela Anderton Andin <[email protected]> | 2019-02-05 15:14:03 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2019-02-05 15:57:03 +0100 |
commit | c44caa428b65e85b034b01a7f6145e5fee60a863 (patch) | |
tree | ab9e99da4400bf93cc2f512f10f1ebf66452fd80 /lib/ssl/test/ssl_to_openssl_SUITE.erl | |
parent | e8ddbc58fda4ca07ff1f2f4d3c77ecae036ee513 (diff) | |
parent | c2126443b79aa53c9fc04e7dad4e6c717ca6986b (diff) | |
download | otp-c44caa428b65e85b034b01a7f6145e5fee60a863.tar.gz otp-c44caa428b65e85b034b01a7f6145e5fee60a863.tar.bz2 otp-c44caa428b65e85b034b01a7f6145e5fee60a863.zip |
Merge branch 'maint'
Conflicts:
lib/ssl/doc/src/ssl.xml
lib/ssl/src/ssl.erl
lib/ssl/src/ssl_cipher_format.erl
lib/ssl/src/tls_handshake.erl
Diffstat (limited to 'lib/ssl/test/ssl_to_openssl_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index d180021439..87a1edfd96 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -1249,7 +1249,7 @@ ssl2_erlang_server_openssl_client(Config) when is_list(Config) -> ct:log("Ports ~p~n", [[erlang:port_info(P) || P <- erlang:ports()]]), ssl_test_lib:consume_port_exit(OpenSslPort), - ssl_test_lib:check_result(Server, {error, {tls_alert, "bad record mac"}}), + ssl_test_lib:check_server_alert(Server, bad_record_mac), process_flag(trap_exit, false). %%-------------------------------------------------------------------- |