diff options
author | Ingela Anderton Andin <[email protected]> | 2013-06-07 14:22:18 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2013-06-07 14:37:30 +0200 |
commit | 82a435ca0f91782ebd39b237d56426277ffeda80 (patch) | |
tree | 7ee6c2564f19c5aec09879f4c688a7b48094f8eb /lib/ssl/src/tls_handshake.erl | |
parent | b1da47eff2e41013d60dacebbdfa31ce60357d23 (diff) | |
download | otp-82a435ca0f91782ebd39b237d56426277ffeda80.tar.gz otp-82a435ca0f91782ebd39b237d56426277ffeda80.tar.bz2 otp-82a435ca0f91782ebd39b237d56426277ffeda80.zip |
ssl: Correct rebase mistakes
Diffstat (limited to 'lib/ssl/src/tls_handshake.erl')
-rw-r--r-- | lib/ssl/src/tls_handshake.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index fea75736f7..51fd2e1dc9 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -866,7 +866,7 @@ handle_ecc_point_fmt_extension(undefined) -> handle_ecc_point_fmt_extension(_) -> #ec_point_formats{ec_point_format_list = [?ECPOINT_UNCOMPRESSED]}. -handle_ecc_curves_extension(Version, undefined) -> +handle_ecc_curves_extension(_Version, undefined) -> undefined; handle_ecc_curves_extension(Version, _) -> #elliptic_curves{elliptic_curve_list = ssl_tls1:ecc_curves(Version)}. |