diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-02-18 11:09:32 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-02-22 10:44:07 +0100 |
| commit | b254f5a83145b348def5950d46628d3f4549585e (patch) | |
| tree | aac3de6f53cc3e956e0766fb2884d9b556e4ead4 /lib/ssl/test/ssl_basic_SUITE.erl | |
| parent | 88021d58ff1c5b92689b100d1288ef7d3185233f (diff) | |
| download | otp-b254f5a83145b348def5950d46628d3f4549585e.tar.gz otp-b254f5a83145b348def5950d46628d3f4549585e.tar.bz2 otp-b254f5a83145b348def5950d46628d3f4549585e.zip | |
ssl: Newer cipher suites now presented correctly
Older SSL/TLS versions have cipher suites
that look like {key_exchange(), cipher(), MAC::hash()}
and the hash function used by the PRF (Pseudo Random function)
is implicit and always the same for that protocol version.
In TLS 1.2 a cipher suite is
{key_exchange(), cipher(), MAC::hash(), PRF::hash()}.
Internally a cipher suite is always a four tuple but
for backwards compatibility older cipher suites
will be presented as a three tuples, however new cipher suites
should be presented as four tuples.
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 9be99afe48..1a864edb8b 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -4197,6 +4197,12 @@ first_rsa_suite([{dhe_rsa, _, _} = Suite| _]) -> Suite; first_rsa_suite([{rsa, _, _} = Suite| _]) -> Suite; +first_rsa_suite([{ecdhe_rsa, _, _, _} = Suite | _]) -> + Suite; +first_rsa_suite([{dhe_rsa, _, _, _} = Suite| _]) -> + Suite; +first_rsa_suite([{rsa, _, _, _} = Suite| _]) -> + Suite; first_rsa_suite([_ | Rest]) -> first_rsa_suite(Rest). |