diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-02-19 09:43:55 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-02-19 09:43:55 +0100 |
| commit | bd9d965ad204f3eecd6022d1f7565235ffa0c227 (patch) | |
| tree | 3b4088244c0686a6671788abfcb348fb5dbdffb1 /lib/ssl/test/ssl_test_lib.erl | |
| parent | 48411ad12f4d730412895e90c188c2d8f7813ce5 (diff) | |
| parent | 3db7370a556d0dd064f005fd745bdbf50840eda1 (diff) | |
| download | otp-bd9d965ad204f3eecd6022d1f7565235ffa0c227.tar.gz otp-bd9d965ad204f3eecd6022d1f7565235ffa0c227.tar.bz2 otp-bd9d965ad204f3eecd6022d1f7565235ffa0c227.zip | |
Merge branch 'ia/ssl/remove-default-DES/OTP-13195'
* ia/ssl/remove-default-DES/OTP-13195:
ssl: Remove DES ciphers from default configuration
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index afd21f0d2f..2686dfc1a1 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -981,6 +981,10 @@ rc4_suites(Version) -> Suites = ssl_cipher:rc4_suites(Version), ssl_cipher:filter_suites(Suites). +des_suites(Version) -> + Suites = ssl_cipher:des_suites(Version), + ssl_cipher:filter_suites(Suites). + pem_to_der(File) -> {ok, PemBin} = file:read_file(File), public_key:pem_decode(PemBin). |