diff options
| author | Péter Dimitrov <[email protected]> | 2019-05-23 14:25:42 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-05-23 14:25:42 +0200 |
| commit | 7fe0e9f5ccf197e3e3d93db82713eb9948795a61 (patch) | |
| tree | 5d34af1521a0f76bf0ee261914385f705c29bcbb | |
| parent | a4226b1fd9093a43902510b6e7b0e7af2406a23e (diff) | |
| download | otp-7fe0e9f5ccf197e3e3d93db82713eb9948795a61.tar.gz otp-7fe0e9f5ccf197e3e3d93db82713eb9948795a61.tar.bz2 otp-7fe0e9f5ccf197e3e3d93db82713eb9948795a61.zip | |
ssl: Improve interoperability with openssl
Handle the NewSessionTicket post-handshake message that is sent
by openssl s_server after a successful handshake.
| -rw-r--r-- | lib/ssl/src/ssl_logger.erl | 5 | ||||
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_logger.erl b/lib/ssl/src/ssl_logger.erl index 987693b96b..514a4464bc 100644 --- a/lib/ssl/src/ssl_logger.erl +++ b/lib/ssl/src/ssl_logger.erl @@ -200,6 +200,11 @@ parse_handshake(Direction, #encrypted_extensions{} = EncryptedExtensions) -> Header = io_lib:format("~s Handshake, EncryptedExtensions", [header_prefix(Direction)]), Message = io_lib:format("~p", [?rec_info(encrypted_extensions, EncryptedExtensions)]), + {Header, Message}; +parse_handshake(Direction, #new_session_ticket{} = NewSessionTicket) -> + Header = io_lib:format("~s Post-Handshake, NewSessionTicket", + [header_prefix(Direction)]), + Message = io_lib:format("~p", [?rec_info(new_session_ticket, NewSessionTicket)]), {Header, Message}. diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index aec58a27eb..2651fc09bd 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -31,6 +31,7 @@ -include("tls_connection.hrl"). -include("tls_handshake.hrl"). +-include("tls_handshake_1_3.hrl"). -include("ssl_alert.hrl"). -include("tls_record.hrl"). -include("ssl_cipher.hrl"). @@ -810,6 +811,11 @@ connection(internal, #client_hello{}, State = reinit_handshake_data(State0), next_event(?FUNCTION_NAME, no_record, State); +connection(internal, #new_session_ticket{}, State) -> + %% TLS 1.3 + %% Drop NewSessionTicket (currently not supported) + next_event(?FUNCTION_NAME, no_record, State); + connection(Type, Event, State) -> ssl_connection:?FUNCTION_NAME(Type, Event, State, ?MODULE). |