diff options
author | Ingela Anderton Andin <[email protected]> | 2018-02-07 14:21:08 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2018-02-07 15:47:43 +0100 |
commit | 3003f6150317cee3e2c6859a82829e1b2ff4f12e (patch) | |
tree | 9bc6f0f7590479f8a134a898ca73c2fe35e914ae /lib/ssl/src/dtls_v1.erl | |
parent | ddd9b35a529589edc46e04655fefba74dd2179f0 (diff) | |
parent | 9be186620d86b60791f20ddf5d051c63d576e737 (diff) | |
download | otp-3003f6150317cee3e2c6859a82829e1b2ff4f12e.tar.gz otp-3003f6150317cee3e2c6859a82829e1b2ff4f12e.tar.bz2 otp-3003f6150317cee3e2c6859a82829e1b2ff4f12e.zip |
Merge branch 'maint'
Conflicts:
lib/ssl/doc/src/ssl.xml
lib/ssl/src/ssl.erl
lib/ssl/src/ssl_cipher.erl
lib/ssl/test/ssl_basic_SUITE.erl
lib/ssl/test/ssl_test_lib.erl
Diffstat (limited to 'lib/ssl/src/dtls_v1.erl')
-rw-r--r-- | lib/ssl/src/dtls_v1.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/ssl/src/dtls_v1.erl b/lib/ssl/src/dtls_v1.erl index 51ee8ec047..0f6344b6f7 100644 --- a/lib/ssl/src/dtls_v1.erl +++ b/lib/ssl/src/dtls_v1.erl @@ -21,7 +21,7 @@ -include("ssl_cipher.hrl"). --export([suites/1, all_suites/1, hmac_hash/3, ecc_curves/1, +-export([suites/1, all_suites/1, anonymous_suites/1,hmac_hash/3, ecc_curves/1, corresponding_tls_version/1, corresponding_dtls_version/1, cookie_secret/0, cookie_timeout/0]). @@ -40,6 +40,12 @@ all_suites(Version) -> end, ssl_cipher:all_suites(corresponding_tls_version(Version))). +anonymous_suites(Version) -> + lists:filter(fun(Cipher) -> + is_acceptable_cipher(ssl_cipher:suite_definition(Cipher)) + end, + ssl_cipher:anonymous_suites(corresponding_tls_version(Version))). + hmac_hash(MacAlg, MacSecret, Value) -> tls_v1:hmac_hash(MacAlg, MacSecret, Value). |