aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorPéter Dimitrov <[email protected]>2019-06-17 16:19:47 +0200
committerPéter Dimitrov <[email protected]>2019-06-17 16:19:47 +0200
commitc5ab02e56946b5edd0c9b2705214aa6f4fd6d6ba (patch)
tree04a159db9c391f69c70de0eb02757f1ebd9fe95f /lib/ssl/src
parent6b2fea0bfceada3ef0b45cf5a1ead291c45f2ccc (diff)
parent021607a213435344db07662bc79ea4895b6b94e6 (diff)
downloadotp-c5ab02e56946b5edd0c9b2705214aa6f4fd6d6ba.tar.gz
otp-c5ab02e56946b5edd0c9b2705214aa6f4fd6d6ba.tar.bz2
otp-c5ab02e56946b5edd0c9b2705214aa6f4fd6d6ba.zip
Merge branch 'peterdmv/ssl/fix-handshake-hello/ERL-975/OTP-15888' into maint
* 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.erl11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index bd9407a207..c6698bc74a 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -1479,7 +1479,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