diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-01-25 10:33:40 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-01-25 10:33:40 +0100 |
| commit | e6842033aa2ddcab751fc9cbd89eeaca19cfdf71 (patch) | |
| tree | b4c4719dd55d84ca8dfeee8395f0aa98cb4c831a /lib/ssl | |
| parent | ff58636f3261150aec21c2209492c0a7feb75bd6 (diff) | |
| parent | a25e3e814febd5459e77435cb972f5baa5eebbf5 (diff) | |
| download | otp-e6842033aa2ddcab751fc9cbd89eeaca19cfdf71.tar.gz otp-e6842033aa2ddcab751fc9cbd89eeaca19cfdf71.tar.bz2 otp-e6842033aa2ddcab751fc9cbd89eeaca19cfdf71.zip | |
Merge branch 'ia/ssl/hs-timing/OTP-13253' into maint
* ia/ssl/hs-timing/OTP-13253:
ssl: Prepare for release
ssl: Fix timing releated bug
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 6 | ||||
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 11728128c4..057906bcb3 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,6 +1,9 @@ %% -*- erlang -*- {"%VSN%", [ + {<<"7\\.2">>, [{load_module, tls_connection, soft_purge, soft_purge, []}, + {load_module, ssl_tls_dist_proxy, soft_purge, soft_purge, []} + ]}, {<<"7\\..*">>, [{restart_application, ssl}]}, {<<"6\\..*">>, [{restart_application, ssl}]}, {<<"5\\..*">>, [{restart_application, ssl}]}, @@ -8,6 +11,9 @@ {<<"3\\..*">>, [{restart_application, ssl}]} ], [ + {<<"7\\.2">>, [{load_module, tls_connection, soft_purge, soft_purge, []}, + {load_module, ssl_tls_dist_proxy, soft_purge, soft_purge, []} + ]}, {<<"7\\..*">>, [{restart_application, ssl}]}, {<<"6\\..*">>, [{restart_application, ssl}]}, {<<"5\\..*">>, [{restart_application, ssl}]}, diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index b2b85eaf8d..c3f0206d25 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -764,6 +764,8 @@ handle_tls_handshake(Handle, StateName, case Handle(Packet, FsmReturn) of {next_state, NextStateName, State, _Timeout} -> handle_tls_handshake(Handle, NextStateName, State); + {next_state, NextStateName, State} -> + handle_tls_handshake(Handle, NextStateName, State); {stop, _,_} = Stop -> Stop end; diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index aa1af21990..9f79a7fb34 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 7.2 +SSL_VSN = 7.2.1 |