diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2020-03-11 16:07:49 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2020-03-11 16:07:49 +0100 |
| commit | 19167316dd1c16ae709c7e0469edf5edccb8173e (patch) | |
| tree | e3cc11b27f9a04f48881e12234879c080174b85e | |
| parent | 4bcdb90f1e5e1da7cfc02b13461fb6d4859f4b80 (diff) | |
| parent | 9c51234094191aadd402c66b211526121b7ebf9a (diff) | |
| download | erlang-19167316dd1c16ae709c7e0469edf5edccb8173e.tar.gz | |
Merge branch 'ingela/ssl/DTLS-alpn-openssl' into maint
* ingela/ssl/DTLS-alpn-openssl:
ssl: Cuddle tests
| -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 206c4c8b32..3c3248b3a5 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -3355,6 +3355,10 @@ openssl_sane_dtls_alpn() -> false; "OpenSSL 1.1.1a" ++ _ -> false; + "OpenSSL 1.1.1d FIPS" ++ _ -> + false; + "OpenSSL 1.1.1d-freebsd" ++ _ -> + false; _-> openssl_sane_dtls() end. |