File 1585-snmp-manager-Try-to-detect-crypto-skippabl... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1585-snmp-manager-Try-to-detect-crypto-skippable-test-cas.patch of Package erlang (Revision e3704281f725978c5a26174cd59024d0)

Currently displaying revision e3704281f725978c5a26174cd59024d0 , Show latest

From dcf5f8f81ae3f4f9377644a2d6ef37fcfb249a6a Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 29 Nov 2021 14:11:37 +0100
Subject: [PATCH 5/5] [snmp|manager] Try to detect (crypto-) skippable test
 cases

Need to test crypto for supports of various stuff before
attempting test cases.
---
 lib/snmp/test/snmp_manager_SUITE.erl        | 35 +++++++++++++++------
 lib/snmp/test/snmp_manager_config_SUITE.erl | 16 ++++++++--
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/lib/snmp/test/snmp_manager_SUITE.erl b/lib/snmp/test/snmp_manager_SUITE.erl
index af333f0833..466a32772e 100644
--- a/lib/snmp/test/snmp_manager_SUITE.erl
+++ b/lib/snmp/test/snmp_manager_SUITE.erl
@@ -182,6 +182,7 @@ groups() ->
      {all,                  [], all_cases()},
      {start_and_stop_tests, [], start_and_stop_tests_cases()},
      {misc_tests,           [], misc_tests_cases()},
+     {usm_priv_aes_tests,   [], usm_priv_aes_tests_cases()},
      {user_tests,           [], user_tests_cases()},
      {agent_tests,          [], agent_tests_cases()},
      {request_tests,        [], request_tests_cases()},
@@ -212,16 +213,17 @@ inet_backend_socket_cases() ->
 
 all_cases() -> 
     [
-     {group, start_and_stop_tests}, 
-     {group, misc_tests}, 
-     {group, user_tests}, 
-     {group, agent_tests}, 
-     {group, request_tests}, 
-     {group, request_tests_mt}, 
-     {group, event_tests}, 
-     {group, event_tests_mt}, 
-     discovery, 
-     {group, tickets}, 
+     {group, start_and_stop_tests},
+     {group, misc_tests},
+     {group, usm_priv_aes_tests},
+     {group, user_tests},
+     {group, agent_tests},
+     {group, request_tests},
+     {group, request_tests_mt},
+     {group, event_tests},
+     {group, event_tests_mt},
+     discovery,
+     {group, tickets},
      {group, ipv6},
      {group, ipv6_mt},
      {group, v3}
@@ -241,6 +243,11 @@ start_and_stop_tests_cases() ->
 misc_tests_cases() ->
     [
      info,
+     {group, usm_priv_aes_tests}
+    ].
+
+usm_priv_aes_tests_cases() ->
+    [
      usm_priv_aes,
      usm_sha224_priv_aes,
      usm_sha256_priv_aes,
@@ -480,6 +487,14 @@ init_per_group2(ipv6 = GroupName, Config) ->
     init_per_group_ipv6(GroupName, Config);
 %% init_per_group2(v3 = GroupName, Config) ->
 %%     ?LIB:init_group_top_dir(GroupName, Config);
+init_per_group2(usm_priv_aes_tests = GroupName, Config) ->
+    %% Check crypto support
+    case snmp_misc:is_crypto_supported(aes_128_cfb128) of
+        true ->
+            ?LIB:init_group_top_dir(GroupName, Config);
+        false ->
+            throw({skip, {not_supported, aes_128_cfb128}})
+    end;
 init_per_group2(GroupName, Config) ->
     ?LIB:init_group_top_dir(GroupName, Config).
 
diff --git a/lib/snmp/test/snmp_manager_config_SUITE.erl b/lib/snmp/test/snmp_manager_config_SUITE.erl
index 06bae05556..f70f506fb0 100644
--- a/lib/snmp/test/snmp_manager_config_SUITE.erl
+++ b/lib/snmp/test/snmp_manager_config_SUITE.erl
@@ -2363,10 +2363,15 @@ register_usm_user_using_function(Conf) when is_list(Conf) ->
                 {no, Reason} ->
                     ?SKIP({unsupported_encryption, Reason});
                 yes ->
-                    ok
+                    case snmp_misc:is_crypto_supported(aes_cfb128) of
+                        true ->
+                            ok;
+                        false ->
+                            ?SKIP({unsupported_crypto, aes_cfb128})
+                    end
             end;
         {error, Reason} ->
-            ?SKIP({failed_starting_crypto, Reason})
+                    ?SKIP({failed_starting_crypto, Reason})
     end,
      
     ConfDir = ?config(manager_conf_dir, Conf),
@@ -2509,7 +2514,12 @@ update_usm_user_info(Conf) when is_list(Conf) ->
                 {no, Reason} ->
                     ?SKIP({unsupported_encryption, Reason});
                 yes ->
-                    ok
+                    case snmp_misc:is_crypto_supported(aes_cfb128) of
+                        true ->
+                            ok;
+                        false ->
+                            ?SKIP({unsupported_crypto, aes_cfb128})
+                    end
             end;
         {error, Reason} ->
             ?SKIP({failed_starting_crypto, Reason})
-- 
2.31.1

Places

File 1585-snmp-manager-Try-to-detect-crypto-skippable-test-cas.patch of Package erlang (Revision e3704281f725978c5a26174cd59024d0)

Places