diff options
| author | Erlang/OTP <[email protected]> | 2019-06-17 16:51:17 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-06-17 16:51:17 +0200 |
| commit | a3b1191abf3d5c0157f51d915053bcca6bec107c (patch) | |
| tree | 986b47b93fe565e03e6a3f2f3fe3639f2a90a844 /lib/ssl/src | |
| parent | ff0ac9ba35a5c8790c8cd3cda1b68fc59cc37449 (diff) | |
| parent | 021607a213435344db07662bc79ea4895b6b94e6 (diff) | |
| download | otp-a3b1191abf3d5c0157f51d915053bcca6bec107c.tar.gz otp-a3b1191abf3d5c0157f51d915053bcca6bec107c.tar.bz2 otp-a3b1191abf3d5c0157f51d915053bcca6bec107c.zip | |
Merge branch 'peterdmv/ssl/fix-handshake-hello/ERL-975/OTP-15888' into maint-22
* peterdmv/ssl/fix-handshake-hello/ERL-975/OTP-15888:
ssl: Fix negative tests in ssl_basic_SUITE
ssl: Fix run_client_error/1 in ssl_test_lib
ssl: Fix ssl_handshake:extension_value/1
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 5a6e6de819..fbed7258c6 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1471,7 +1471,16 @@ extension_value(#next_protocol_negotiation{extension_data = Data}) -> extension_value(#srp{username = Name}) -> Name; extension_value(#renegotiation_info{renegotiated_connection = Data}) -> - Data. + Data; +extension_value(#signature_algorithms{signature_scheme_list = Schemes}) -> + Schemes; +extension_value(#signature_algorithms_cert{signature_scheme_list = Schemes}) -> + Schemes; +extension_value(#key_share_client_hello{client_shares = ClientShares}) -> + ClientShares; +extension_value(#client_hello_versions{versions = Versions}) -> + Versions. + %%-------------------------------------------------------------------- %%% Internal functions |