Merge branch 'ingela/ssl/dtls-progress/connection-states-as-maps' into maint

* ingela/ssl/dtls-progress/connection-states-as-maps:
  dtls: fix encoding of client hello cookie
  dtls: Prepare start of DTLS connection manager with SSL app
  ssl: Refactor to use maps for the connection states
  ssl, dtls: Refactor sni handling
  dtls: Add close/5
  dtls: Add renegotiate/2
  dtls: Add protocol event handling
  ssl: Refactor code so that tls and dtls can share more code
  ssl, dtls: Disable V2 compatibility clause from ssl_handshake:update_handshake_history
  ssl: Make sure common code for TLS and DTLS uses the TLS Version
  ssl: remove unused RecordCB argument from master_secret
  dtls: Add reinit_handshake_data/1 to dtls
  dtls: replace tls_record with RecordCB in connection_info
  Fix version numbers and dependencies

1 files changed, 5 insertions, 8 deletions

diff --git a/lib/ssl/test/ssl_npn_hello_SUITE.erl b/lib/ssl/test/ssl_npn_hello_SUITE.erl
index 6ae9efe5e9..69aeea10c5 100644
--- a/lib/ssl/test/ssl_npn_hello_SUITE.erl
+++ b/lib/ssl/test/ssl_npn_hello_SUITE.erl
@@ -135,15 +135,12 @@ create_server_handshake(Npn) ->
 				     }, Vsn).
 
 create_connection_states() ->
-    #connection_states{
-       pending_read = #connection_state{
-			 security_parameters = #security_parameters{
+    #{pending_read => #{security_parameters => #security_parameters{
 						  server_random = <<1:256>>,
 						  compression_algorithm = 1,
 						  cipher_suite = ?TLS_DHE_DSS_WITH_DES_CBC_SHA
 						 }
-			},
-       current_read = #connection_state {
-			 secure_renegotiation = false
-			}
-      }.
+		       },
+      current_read => #{secure_renegotiation => false
+       }
+     }.