diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-06-10 09:53:18 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-10 09:53:18 +0200 |
| commit | 867e19e98095275ee4d3e102de269f60c52fdb45 (patch) | |
| tree | 7f2488d1f75191824fc9affd18389951b42e1482 /lib/ssl/src/tls_handshake.erl | |
| parent | 24a7d69e1272184a849a2a01bcfc476fc880b356 (diff) | |
| parent | f7c480076d34ff6666e9f15c992792817aab5078 (diff) | |
| download | otp-867e19e98095275ee4d3e102de269f60c52fdb45.tar.gz otp-867e19e98095275ee4d3e102de269f60c52fdb45.tar.bz2 otp-867e19e98095275ee4d3e102de269f60c52fdb45.zip | |
Merge remote-tracking branch 'upstream/maint'
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)}. |