From 5a9bbc0fea6b519f86057e5c1a0e301d327ae7ce Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 26 Jul 2019 17:29:26 +0200
Subject: ssl: Remove NPN test from DTLS interop tests

OpenSSL does note seem to support NPN for DTLS so
we will have to skip those test
---
 lib/ssl/test/openssl_alpn_SUITE.erl |  4 ++--
 lib/ssl/test/openssl_npn_SUITE.erl  | 40 +++++++++----------------------------
 2 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/lib/ssl/test/openssl_alpn_SUITE.erl b/lib/ssl/test/openssl_alpn_SUITE.erl
index fa095b4bdb..1e8912be7d 100644
--- a/lib/ssl/test/openssl_alpn_SUITE.erl
+++ b/lib/ssl/test/openssl_alpn_SUITE.erl
@@ -59,8 +59,8 @@ groups() ->
              {'tlsv1.2', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()},
              {'tlsv1.1', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()},
              {'tlsv1', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()},
-             {'dtlsv1.2', [], alpn_tests() ++ alpn_npn_coexist()},
-             {'dtlsv1', [], alpn_tests() ++ alpn_npn_coexist()}
+             {'dtlsv1.2', [], alpn_tests()},
+             {'dtlsv1', [], alpn_tests()}
             ];
          false ->
             [
diff --git a/lib/ssl/test/openssl_npn_SUITE.erl b/lib/ssl/test/openssl_npn_SUITE.erl
index 9bd11f05d6..f249ba47c2 100644
--- a/lib/ssl/test/openssl_npn_SUITE.erl
+++ b/lib/ssl/test/openssl_npn_SUITE.erl
@@ -33,40 +33,18 @@
 %%--------------------------------------------------------------------
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
-
 all() -> 
-    %% Note: NPN not supported in sslv3
-    case ssl_test_lib:openssl_sane_dtls() of 
-        true ->
-            [{group, 'tlsv1.2'},
-             {group, 'tlsv1.1'},
-             {group, 'tlsv1'},
-             {group, 'dtlsv1.2'},
-             {group, 'dtlsv1'}];
-        false ->
-            [{group, 'tlsv1.2'},
-             {group, 'tlsv1.1'},
-             {group, 'tlsv1'}]
-    end.
+    %% NPN is not supported in TLS-1.3 (replaced by ALPN and deprecated in TLS 1.2)
+    %% OpenSSL DTLS support for NPN is either not there or broken.
+    [{group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'}].
 
 groups() ->
-     case ssl_test_lib:openssl_sane_dtls() of 
-         true ->
-             [{'tlsv1.2', [], npn_tests()},
-              {'tlsv1.1', [], npn_tests()},
-              {'tlsv1', [], npn_tests()},
-              {'dtlsv1.2', [], npn_tests() -- [erlang_server_openssl_client_npn_renegotiate,
-                                               erlang_client_openssl_server_npn_renegotiate]},
-              {'dtlsv1', [], npn_tests() -- [erlang_server_openssl_client_npn_renegotiate,
-                                             erlang_client_openssl_server_npn_renegotiate]
-              }
-             ];
-        false ->
-             [{'tlsv1.2', [], npn_tests()},
-              {'tlsv1.1', [], npn_tests()},
-              {'tlsv1', [], npn_tests()}
-             ]
-     end.
+    [{'tlsv1.2', [], npn_tests()},
+     {'tlsv1.1', [], npn_tests()},
+     {'tlsv1', [], npn_tests()}
+    ].
  
 npn_tests() ->
     [erlang_client_openssl_server_npn,
-- 
cgit v1.2.3