diff options
| author | Péter Dimitrov <[email protected]> | 2019-01-08 16:39:38 +0100 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-01-08 16:39:38 +0100 |
| commit | 609e818e9e819f029bf6fc677240a08fd3e0ec1b (patch) | |
| tree | d8074785a814ef449aa3e9e88cc94648a62a74ac /lib/ssl/src/ssl_handshake.erl | |
| parent | a9235a9545f352805e462a29c14d14554894effc (diff) | |
| parent | 225220030d58272e5e53290abcd93de860a1ebc8 (diff) | |
| download | otp-609e818e9e819f029bf6fc677240a08fd3e0ec1b.tar.gz otp-609e818e9e819f029bf6fc677240a08fd3e0ec1b.tar.bz2 otp-609e818e9e819f029bf6fc677240a08fd3e0ec1b.zip | |
Merge branch 'maint'
* maint:
ssl: Fix encoding/decoding of the SRP extension
Change-Id: I3b5887cf01b1a538c65d0c66da4d4ccf7793478d
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index f8bc700d7f..9ed2654668 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -639,7 +639,7 @@ encode_extensions([#ec_point_formats{ec_point_format_list = ECPointFormats} | Re ?UINT16(Len), ?BYTE(ListLen), ECPointFormatList/binary, Acc/binary>>); encode_extensions([#srp{username = UserName} | Rest], Acc) -> SRPLen = byte_size(UserName), - Len = SRPLen + 2, + Len = SRPLen + 1, encode_extensions(Rest, <<?UINT16(?SRP_EXT), ?UINT16(Len), ?BYTE(SRPLen), UserName/binary, Acc/binary>>); encode_extensions([#hash_sign_algos{hash_sign_algos = HashSignAlgos} | Rest], Acc) -> @@ -2223,7 +2223,7 @@ decode_extensions(<<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), decode_extensions(<<?UINT16(?SRP_EXT), ?UINT16(Len), ?BYTE(SRPLen), SRP:SRPLen/binary, Rest/binary>>, Version, MessageType, Acc) - when Len == SRPLen + 2 -> + when Len == SRPLen + 1 -> decode_extensions(Rest, Version, MessageType, Acc#{srp => #srp{username = SRP}}); decode_extensions(<<?UINT16(?SIGNATURE_ALGORITHMS_EXT), ?UINT16(Len), |