Merge branch 'maint'

* maint:
  Inline local function
  Optimize binary matching
  Clean up module boundaries
  Remove redundant return of CipherState
  Use iovec() internally in send path
  Small binary handling optimizations
  Optimize read_application_data with Okasaki queue
  Try to optimize decode_cipher_text/3
  Optimize application data aggregation
  Optimize TLS record parsing with Okasaki queue
  Cache strong_random_bytes for IV
  Optimize padding
  Produce less garbage in encrypt loop
  Reorganize #data{}
  Tidy up state machine
  Add server GC info to bench results

Conflicts:
	lib/ssl/src/ssl_cipher.erl
	lib/ssl/src/ssl_connection.erl
	lib/ssl/src/ssl_connection.hrl
	lib/ssl/src/ssl_logger.erl
	lib/ssl/src/ssl_record.erl
	lib/ssl/src/ssl_record.hrl
	lib/ssl/src/tls_connection.erl
	lib/ssl/src/tls_record.erl
	lib/ssl/src/tls_sender.erl

1 files changed, 10 insertions, 4 deletions

diff --git a/lib/ssl/src/ssl_logger.erl b/lib/ssl/src/ssl_logger.erl
index c4dd2dad60..d59a0dfda2 100644
--- a/lib/ssl/src/ssl_logger.erl
+++ b/lib/ssl/src/ssl_logger.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -46,13 +46,19 @@
 format(#{level:= _Level, msg:= {report, Msg}, meta:= _Meta}, _Config0) ->
      #{direction := Direction,
        protocol := Protocol,
-       message := BinMsg0} = Msg,
+       message := Content} = Msg,
     case Protocol of
         'tls_record' ->
-            BinMsg = lists:flatten(BinMsg0),
+            BinMsg =
+                case Content of
+                    #ssl_tls{} ->
+                        [tls_record:build_tls_record(Content)];
+                    _ when is_list(Content) ->
+                        lists:flatten(Content)
+                end,
             format_tls_record(Direction, BinMsg);
         'handshake' ->
-            format_handshake(Direction, BinMsg0);
+            format_handshake(Direction, Content);
         _Other ->
             []
     end.