Merge remote-tracking branch 'upstream/maint'

Conflicts:
	lib/crypto/doc/src/crypto_app.xml

1 files changed, 9 insertions, 9 deletions

diff --git a/lib/ssl/test/ssl_certificate_verify_SUITE.erl b/lib/ssl/test/ssl_certificate_verify_SUITE.erl
index 26938bda50..2703d2d79c 100644
--- a/lib/ssl/test/ssl_certificate_verify_SUITE.erl
+++ b/lib/ssl/test/ssl_certificate_verify_SUITE.erl
@@ -86,7 +86,7 @@ init_per_suite(Config0) ->
 	    Result =
 		(catch make_certs:all(?config(data_dir, Config0),
 				      ?config(priv_dir, Config0))),
-	    ct:print("Make certs  ~p~n", [Result]),
+	    ct:log("Make certs  ~p~n", [Result]),
 
 	    Config1 = ssl_test_lib:make_dsa_cert(Config0),
 	    Config = ssl_test_lib:cert_options(Config1),
@@ -297,7 +297,7 @@ verify_fun_always_run_client(Config) when is_list(Config) ->
     %% this is not a bug it is a circumstance of how tcp works!
     receive
 	{Server, ServerError} ->
-	    ct:print("Server Error ~p~n", [ServerError])
+	    ct:log("Server Error ~p~n", [ServerError])
     end,
 
     ssl_test_lib:check_result(Client, {error, {tls_alert, "handshake failure"}}).
@@ -346,7 +346,7 @@ verify_fun_always_run_server(Config) when is_list(Config) ->
     %% this is not a bug it is a circumstance of how tcp works!
     receive
 	{Client, ClientError} ->
-	    ct:print("Client Error ~p~n", [ClientError])
+	    ct:log("Client Error ~p~n", [ClientError])
     end,
 
     ssl_test_lib:check_result(Server, {error, {tls_alert, "handshake failure"}}).
@@ -413,7 +413,7 @@ cert_expired(Config) when is_list(Config) ->
 							       two_digits_str(Sec)])),
     NewValidity = {'Validity', {generalTime, NotBeforeStr}, {generalTime, NotAfterStr}},
 
-    ct:print("Validity: ~p ~n NewValidity: ~p ~n",
+    ct:log("Validity: ~p ~n NewValidity: ~p ~n",
 		       [OTPTbsCert#'OTPTBSCertificate'.validity, NewValidity]),
 
     NewOTPTbsCert =  OTPTbsCert#'OTPTBSCertificate'{validity = NewValidity},
@@ -644,7 +644,7 @@ no_authority_key_identifier(Config) when is_list(Config) ->
     NewExtensions =  delete_authority_key_extension(Extensions, []),
     NewOTPTbsCert =  OTPTbsCert#'OTPTBSCertificate'{extensions = NewExtensions},
 
-    ct:print("Extensions ~p~n, NewExtensions: ~p~n", [Extensions, NewExtensions]),
+    ct:log("Extensions ~p~n, NewExtensions: ~p~n", [Extensions, NewExtensions]),
 
     NewDerCert = public_key:pkix_sign(NewOTPTbsCert, Key),
     ssl_test_lib:der_to_pem(NewCertFile, [{'Certificate', NewDerCert, not_encrypted}]),
@@ -955,10 +955,10 @@ client_msg(Client, ClientMsg) ->
 	{Client, ClientMsg} ->
 	    ok;
 	{Client, {error,closed}} ->
-	    ct:print("client got close"),
+	    ct:log("client got close"),
 	    ok;
 	{Client, {error, Reason}} ->
-	    ct:print("client got econnaborted: ~p", [Reason]),
+	    ct:log("client got econnaborted: ~p", [Reason]),
 	    ok;
 	Unexpected ->
 	    ct:fail(Unexpected)
@@ -968,10 +968,10 @@ server_msg(Server, ServerMsg) ->
 	{Server, ServerMsg} ->
 	    ok;
 	{Server, {error,closed}} ->
-	    ct:print("server got close"),
+	    ct:log("server got close"),
 	    ok;
 	{Server, {error, Reason}} ->
-	    ct:print("server got econnaborted: ~p", [Reason]),
+	    ct:log("server got econnaborted: ~p", [Reason]),
 	    ok;
 	Unexpected ->
 	    ct:fail(Unexpected)