diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-09-28 09:12:38 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-09-28 09:12:38 +0200 |
| commit | df735da124c10ace126f49ab0153c905d0819a30 (patch) | |
| tree | d30777f61025b4bfdfc9d1e26d6ee6e46859e4f3 /lib/ssl/src | |
| parent | 6878e54486be7880b3c885b1903ed2093238a6b5 (diff) | |
| parent | cbb7313a14f83b3947c9d2067f5ebcabc0c0b3a0 (diff) | |
| download | otp-df735da124c10ace126f49ab0153c905d0819a30.tar.gz otp-df735da124c10ace126f49ab0153c905d0819a30.tar.bz2 otp-df735da124c10ace126f49ab0153c905d0819a30.zip | |
Merge remote branch 'upstream/dev' into major
* upstream/dev:
Both the SSLv3 and TLS 1.0/TLS 1.1 specifications require implementations to ignore data following the ClientHello (i.e., extensions) if they do not understand them.
fix unknown ssl extension parsing by changing length from bits to bytes
Temporary disable tests on MAC due to issus with the MAC ODBC drivers
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 453ea20f99..f873a6a913 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -39,6 +39,8 @@ encode_handshake/2, init_hashes/0, update_hashes/2, decrypt_premaster_secret/2]). +-export([dec_hello_extensions/2]). + -type tls_handshake() :: #client_hello{} | #server_hello{} | #server_hello_done{} | #certificate{} | #certificate_request{} | #client_key_exchange{} | #finished{} | #certificate_verify{} | @@ -912,9 +914,12 @@ dec_hello_extensions(<<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), Info:Len/binar end, dec_hello_extensions(Rest, [{renegotiation_info, #renegotiation_info{renegotiated_connection = RenegotiateInfo}} | Acc]); -dec_hello_extensions(<<?UINT16(_), ?UINT16(Len), _Unknown:Len, Rest/binary>>, Acc) -> + +%% Ignore data following the ClientHello (i.e., +%% extensions) if not understood. +dec_hello_extensions(<<?UINT16(_), ?UINT16(Len), _Unknown:Len/binary, Rest/binary>>, Acc) -> dec_hello_extensions(Rest, Acc); -%% Need this clause? +%% This theoretically should not happen if the protocol is followed, but if it does it is ignored. dec_hello_extensions(_, Acc) -> Acc. |