aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-08-21 10:20:09 +0200
committerIngela Anderton Andin <[email protected]>2019-08-21 10:20:09 +0200
commit9f220c8ed81719b3fec4f3032b1140df20ffe046 (patch)
tree50afcbdf4fa33dd1052e0beb9d86cdbc59b71c00
parent504d151a57bc93acb3fb7597214a8e62be9c1cfd (diff)
parentefe616ac2a43f0b45fbb909d28b48616ba5637ac (diff)
downloadotp-9f220c8ed81719b3fec4f3032b1140df20ffe046.tar.gz
otp-9f220c8ed81719b3fec4f3032b1140df20ffe046.tar.bz2
otp-9f220c8ed81719b3fec4f3032b1140df20ffe046.zip
Merge branch 'maint'
-rw-r--r--lib/public_key/src/pubkey_cert.erl2
-rw-r--r--lib/ssl/test/openssl_session_SUITE.erl1
-rw-r--r--lib/ssl/test/ssl_test_lib.erl5
3 files changed, 6 insertions, 2 deletions
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl
index 12c61e158f..d85f322918 100644
--- a/lib/public_key/src/pubkey_cert.erl
+++ b/lib/public_key/src/pubkey_cert.erl
@@ -1169,7 +1169,7 @@ validity(Opts) ->
Format =
fun({Y,M,D}) ->
lists:flatten(
- io_lib:format("~4..0w~2..0w~2..0w000000Z",[Y,M,D]))
+ io_lib:format("~4..0w~2..0w~2..0w130000Z",[Y,M,D]))
end,
#'Validity'{notBefore={generalTime, Format(DefFrom)},
notAfter ={generalTime, Format(DefTo)}}.
diff --git a/lib/ssl/test/openssl_session_SUITE.erl b/lib/ssl/test/openssl_session_SUITE.erl
index 97d83b98c3..7c129633da 100644
--- a/lib/ssl/test/openssl_session_SUITE.erl
+++ b/lib/ssl/test/openssl_session_SUITE.erl
@@ -149,6 +149,7 @@ reuse_session_erlang_server() ->
[{doc, "Test erlang server with openssl client that reconnects with the"
"same session id, to test reusing of sessions."}].
reuse_session_erlang_server(Config) when is_list(Config) ->
+ process_flag(trap_exit, true),
ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
{_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 5dd5fc45af..c4f294771a 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -493,7 +493,10 @@ check_result(Server, ServerMsg, Client, ClientMsg) ->
ct:log("~p:~p~n Openssl ~s~n",[?MODULE,?LINE, Debug]),
check_result(Server, ServerMsg, Client, ClientMsg);
{Port,closed} when is_port(Port) ->
- ct:log("~p:~p~n Openssl port ~n",[?MODULE,?LINE]),
+ ct:log("~p:~p~n Openssl port closed ~n",[?MODULE,?LINE]),
+ check_result(Server, ServerMsg, Client, ClientMsg);
+ {'EXIT', epipe} ->
+ ct:log("~p:~p~n Openssl port died ~n",[?MODULE,?LINE]),
check_result(Server, ServerMsg, Client, ClientMsg);
Unexpected ->
Reason = {{expected, {Client, ClientMsg}},