diff options
author | Ingela Anderton Andin <[email protected]> | 2014-03-18 11:35:03 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2014-03-18 11:35:03 +0100 |
commit | fb0a5a669e43590de66d662b99c2762e596c01e3 (patch) | |
tree | 358ccbff0e3521b6af1a8b3a50b9c00d3f6eae11 /lib/ssl/src/tls_v1.erl | |
parent | 57367a29ee6cdcba8ee05030fcfbf86c3bb77382 (diff) | |
parent | ebfd862f47611fa17be72cad1afcd6a13f14bc4d (diff) | |
download | otp-fb0a5a669e43590de66d662b99c2762e596c01e3.tar.gz otp-fb0a5a669e43590de66d662b99c2762e596c01e3.tar.bz2 otp-fb0a5a669e43590de66d662b99c2762e596c01e3.zip |
Merge branch 'ia/ssl/ECC-error-handling/OTP-11780'
* ia/ssl/ECC-error-handling/OTP-11780:
ssl: Server now ignores client ECC curves that it does not support instead of crashing.
Add test for unknown elliptic curve supported by client
Diffstat (limited to 'lib/ssl/src/tls_v1.erl')
-rw-r--r-- | lib/ssl/src/tls_v1.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl index 7c7fdd64c3..7b1f53b969 100644 --- a/lib/ssl/src/tls_v1.erl +++ b/lib/ssl/src/tls_v1.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2013. All Rights Reserved. +%% Copyright Ericsson AB 2007-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -439,7 +439,9 @@ enum_to_oid(24) -> ?secp384r1; enum_to_oid(25) -> ?secp521r1; enum_to_oid(26) -> ?brainpoolP256r1; enum_to_oid(27) -> ?brainpoolP384r1; -enum_to_oid(28) -> ?brainpoolP512r1. +enum_to_oid(28) -> ?brainpoolP512r1; +enum_to_oid(_) -> + undefined. sufficent_ec_support() -> CryptoSupport = crypto:supports(), |