diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-06-04 10:34:53 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-06-04 10:34:53 +0200 |
| commit | 6fd795f56297141507e06254a495a06f40c88521 (patch) | |
| tree | b01dd4ad0d88cc5d8857005d98065dcc43403f53 /lib/ssl/src/ssl_cipher.erl | |
| parent | a4dac83e01f7f74ccad5ee1f81bdb12808e2d9e0 (diff) | |
| parent | 3e82b3663a5be56acefb4a18a08f01976fbbb73e (diff) | |
| download | otp-6fd795f56297141507e06254a495a06f40c88521.tar.gz otp-6fd795f56297141507e06254a495a06f40c88521.tar.bz2 otp-6fd795f56297141507e06254a495a06f40c88521.zip | |
Merge branch 'ia/ssl/default-ciphers/OTP-11966' into maint
* ia/ssl/default-ciphers/OTP-11966:
ssl: Workaround that gen_fsm does not call CB:format_status when CB:terminate crashes.
SSL: always filter the full list of supported ciphers against the supported algorithms
ssl: Filter default ciphers for supported Crypto algorihms
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index a3ec419c2a..72467ea2a0 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -1019,7 +1019,8 @@ openssl_suite_name(Cipher) -> %%-------------------------------------------------------------------- -spec filter(undefined | binary(), [cipher_suite()]) -> [cipher_suite()]. %% -%% Description: . +%% Description: Select the cipher suites that can be used together with the +%% supplied certificate. (Server side functionality) %%------------------------------------------------------------------- filter(undefined, Ciphers) -> Ciphers; @@ -1053,7 +1054,7 @@ filter(DerCert, Ciphers) -> %%-------------------------------------------------------------------- -spec filter_suites([cipher_suite()]) -> [cipher_suite()]. %% -%% Description: filter suites for algorithms +%% Description: Filter suites for algorithms supported by crypto. %%------------------------------------------------------------------- filter_suites(Suites = [{_,_,_}|_]) -> Algos = crypto:supports(), |