ssl: Generalize extensions handling

 As TLS 1.3 introduces more extensions in other places than in hello messages
 we like to have generalize extension handling encode/decode with some
 hello wrappers.

 Also extend property tests of handshake encod/decode

1 files changed, 9 insertions, 5 deletions

diff --git a/lib/ssl/src/tls_handshake_1_3.erl b/lib/ssl/src/tls_handshake_1_3.erl
index 2957e3a5b4..26abde3168 100644
--- a/lib/ssl/src/tls_handshake_1_3.erl
+++ b/lib/ssl/src/tls_handshake_1_3.erl
@@ -127,23 +127,27 @@ encode_cert_entries([], Acc) ->
     iolist_to_binary(lists:reverse(Acc));
 encode_cert_entries([#certificate_entry{data = Data,
                                         extensions = Exts} | Rest], Acc) ->
+    DSize = byte_size(Data),
     BinExts = encode_extensions(Exts),
-    Size = byte_size(Data),
+    ExtSize = byte_size(BinExts),
     encode_cert_entries(Rest, 
-                        [<<?UINT24(Size), Data/binary, BinExts/binary>> | Acc]).
+                        [<<?UINT24(DSize), Data/binary, ?UINT16(ExtSize), BinExts/binary>> | Acc]).
 
 decode_cert_entries(Entries) ->
     decode_cert_entries(Entries, []).
 
 decode_cert_entries(<<>>, Acc) ->
     lists:reverse(Acc);
-decode_cert_entries(<<?UINT24(DSize), Data:DSize/binary, ?UINT24(Esize), BinExts:Esize/binary,
+decode_cert_entries(<<?UINT24(DSize), Data:DSize/binary, ?UINT16(Esize), BinExts:Esize/binary,
                       Rest/binary>>, Acc) ->
     Exts = decode_extensions(BinExts),
     decode_cert_entries(Rest, [#certificate_entry{data = Data,
                                                   extensions = Exts} | Acc]).
 
 encode_extensions(Exts)->
-    ssl_handshake:encode_hello_extensions(Exts).
+    ssl_handshake:encode_extensions(extensions_list(Exts)).
 decode_extensions(Exts) ->
-    ssl_handshake:decode_hello_extensions(Exts).
+    ssl_handshake:decode_extensions(Exts).
+
+extensions_list(HelloExtensions) ->
+    [Ext || {_, Ext} <- maps:to_list(HelloExtensions)].