[test suite] minor OS compatibility test re-order
authorMichael Rash <mbr@cipherdyne.org>
Thu, 13 Jun 2013 03:10:19 +0000 (23:10 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Thu, 13 Jun 2013 03:10:19 +0000 (23:10 -0400)
test/tests/os_compatibility.pl

index 2d7cddb..ea73de8 100644 (file)
@@ -1,6 +1,5 @@
 @os_compatibility = (
 
-    ### Ubuntu 12.04
     {
         'category' => 'Rijndael',
         'subcategory' => 'client->server OS compatibility',
         'fatal'    => $NO
     },
     {
-        'category' => 'Rijndael+HMAC',
-        'subcategory' => 'client->server OS compatibility',
-        'detail'   => 'v2.5 Ubuntu-12.04',
-        'function' => \&os_compatibility,
-        'no_ip_check' => 1,
-        'pkt' =>
-            '97UwsN9v6iQxs9/hrSnbRKDF8byw+niI0PDx0AvuhLP2NmAaz4qktRjl1p7lUA' .
-            'GBzLi+4o58wJCkHs3QUluHBcMAS6hqIT7qMc/aQlcJzNsQWEfPCkAE0m1zLnjG' .
-            'GE3C9u943F+0csrZs+ysKKca+sVBcAKhsTNsMjT9HojVMdk+r9RhJqUa2JJz7f' .
-            'ZIZauvBrygBVg0yh6o',
-        'server_positive_output_matches' => [qr/with expire time/],
-        'fwknopd_cmdline'  => "LD_LIBRARY_PATH=$lib_dir $valgrind_str " .
-            "$fwknopdCmd -c $cf{'disable_aging'} -a $cf{'hmac_access'} " .
-            "-d $default_digest_file -p $default_pid_file $intf_str",
-        'fw_rule_created' => $NEW_RULE_REQUIRED,
-        'fw_rule_removed' => $NEW_RULE_REMOVED,
-        'fatal'    => $NO
-    },
-
-    ### Ubuntu 13.04
-    {
         'category' => 'Rijndael',
         'subcategory' => 'client->server OS compatibility',
         'detail'   => 'v2.5 Ubuntu-13.04',
         'fatal'    => $NO
     },
     {
-        'category' => 'Rijndael+HMAC',
+        'category' => 'Rijndael',
         'subcategory' => 'client->server OS compatibility',
-        'detail'   => 'v2.5 Ubuntu-13.04',
+        'detail'   => 'v2.5 FreeBSD-8.2',
         'function' => \&os_compatibility,
         'no_ip_check' => 1,
         'pkt' =>
-            '/+pXmgSat9BUrGQLUFFELlOSqVAHSzY/BhPC2eP/gYfW5OrLplejpwh7MYoU06G' .
-            'PHRx4vqMBYjxzOcrWp0rFC1rrPzP16nFnRUo5P3jxg1FMjMLI48RrSwCcx8G1qk' .
-            'mknUjmg4+8maPhus2x7YhoPTMfMZijWKOaMWhX1G0khDqFfGU8GuehpQdwuGdX/' .
-            'oGZnheeQyczK4pY',
+            '9oprfzL5On8uyH5qJ0JQGLGddfGMI8j9YSafjFth2hiJrYG75FqBJNVvnsvetTA' .
+            '46kFmbdXHZCUx5iom9jOtpQnMvZJGex65vV4bSFdVwaoJ/ICkiRHbbzSTZo8qmp' .
+            'FTLSYWVhTWQddj4j80Ne6GH0h3zXomg9fJU',
         'server_positive_output_matches' => [qr/with expire time/],
         'fwknopd_cmdline'  => "LD_LIBRARY_PATH=$lib_dir $valgrind_str " .
-            "$fwknopdCmd -c $cf{'disable_aging'} -a $cf{'hmac_access'} " .
+            "$fwknopdCmd -c $cf{'disable_aging'} -a $cf{'def_access'} " .
             "-d $default_digest_file -p $default_pid_file $intf_str",
         'fw_rule_created' => $NEW_RULE_REQUIRED,
         'fw_rule_removed' => $NEW_RULE_REMOVED,
         'fatal'    => $NO
     },
-
-    ### OpenBSD 4.9
     {
         'category' => 'Rijndael',
         'subcategory' => 'client->server OS compatibility',
         'fw_rule_removed' => $NEW_RULE_REMOVED,
         'fatal'    => $NO
     },
+
     {
         'category' => 'Rijndael+HMAC',
         'subcategory' => 'client->server OS compatibility',
-        'detail'   => 'v2.5 OpenBSD-4.9',
+        'detail'   => 'v2.5 Ubuntu-12.04',
         'function' => \&os_compatibility,
         'no_ip_check' => 1,
         'pkt' =>
-            '9LnU3Tlrn7tpcOxviTD5DHlXZ9T0Sj9R92yvm319zB1xzhMYuwB18C4qgScj5q' .
-            'Vop4zyz0L1LQYMZ1/O3S2dqafGLIqSwk7j6YiH0ENVafQvuFVFG8ooeBRxFqzw' .
-            'YnywR5R9Drrw+hMxpl40HDb1O07xN7WBOSvNgU2vi8MHT7MSZVh02PKRF8aReL' .
-            'cQTD2sxRsn5tGfehC8',
+            '97UwsN9v6iQxs9/hrSnbRKDF8byw+niI0PDx0AvuhLP2NmAaz4qktRjl1p7lUA' .
+            'GBzLi+4o58wJCkHs3QUluHBcMAS6hqIT7qMc/aQlcJzNsQWEfPCkAE0m1zLnjG' .
+            'GE3C9u943F+0csrZs+ysKKca+sVBcAKhsTNsMjT9HojVMdk+r9RhJqUa2JJz7f' .
+            'ZIZauvBrygBVg0yh6o',
         'server_positive_output_matches' => [qr/with expire time/],
         'fwknopd_cmdline'  => "LD_LIBRARY_PATH=$lib_dir $valgrind_str " .
             "$fwknopdCmd -c $cf{'disable_aging'} -a $cf{'hmac_access'} " .
         'fw_rule_removed' => $NEW_RULE_REMOVED,
         'fatal'    => $NO
     },
-
-    ### FreeBSD 8.2
     {
-        'category' => 'Rijndael',
+        'category' => 'Rijndael+HMAC',
         'subcategory' => 'client->server OS compatibility',
-        'detail'   => 'v2.5 FreeBSD-8.2',
+        'detail'   => 'v2.5 Ubuntu-13.04',
         'function' => \&os_compatibility,
         'no_ip_check' => 1,
         'pkt' =>
-            '9oprfzL5On8uyH5qJ0JQGLGddfGMI8j9YSafjFth2hiJrYG75FqBJNVvnsvetTA' .
-            '46kFmbdXHZCUx5iom9jOtpQnMvZJGex65vV4bSFdVwaoJ/ICkiRHbbzSTZo8qmp' .
-            'FTLSYWVhTWQddj4j80Ne6GH0h3zXomg9fJU',
+            '/+pXmgSat9BUrGQLUFFELlOSqVAHSzY/BhPC2eP/gYfW5OrLplejpwh7MYoU06G' .
+            'PHRx4vqMBYjxzOcrWp0rFC1rrPzP16nFnRUo5P3jxg1FMjMLI48RrSwCcx8G1qk' .
+            'mknUjmg4+8maPhus2x7YhoPTMfMZijWKOaMWhX1G0khDqFfGU8GuehpQdwuGdX/' .
+            'oGZnheeQyczK4pY',
         'server_positive_output_matches' => [qr/with expire time/],
         'fwknopd_cmdline'  => "LD_LIBRARY_PATH=$lib_dir $valgrind_str " .
-            "$fwknopdCmd -c $cf{'disable_aging'} -a $cf{'def_access'} " .
+            "$fwknopdCmd -c $cf{'disable_aging'} -a $cf{'hmac_access'} " .
             "-d $default_digest_file -p $default_pid_file $intf_str",
         'fw_rule_created' => $NEW_RULE_REQUIRED,
         'fw_rule_removed' => $NEW_RULE_REMOVED,
         'fw_rule_removed' => $NEW_RULE_REMOVED,
         'fatal'    => $NO
     },
-
+    {
+        'category' => 'Rijndael+HMAC',
+        'subcategory' => 'client->server OS compatibility',
+        'detail'   => 'v2.5 OpenBSD-4.9',
+        'function' => \&os_compatibility,
+        'no_ip_check' => 1,
+        'pkt' =>
+            '9LnU3Tlrn7tpcOxviTD5DHlXZ9T0Sj9R92yvm319zB1xzhMYuwB18C4qgScj5q' .
+            'Vop4zyz0L1LQYMZ1/O3S2dqafGLIqSwk7j6YiH0ENVafQvuFVFG8ooeBRxFqzw' .
+            'YnywR5R9Drrw+hMxpl40HDb1O07xN7WBOSvNgU2vi8MHT7MSZVh02PKRF8aReL' .
+            'cQTD2sxRsn5tGfehC8',
+        'server_positive_output_matches' => [qr/with expire time/],
+        'fwknopd_cmdline'  => "LD_LIBRARY_PATH=$lib_dir $valgrind_str " .
+            "$fwknopdCmd -c $cf{'disable_aging'} -a $cf{'hmac_access'} " .
+            "-d $default_digest_file -p $default_pid_file $intf_str",
+        'fw_rule_created' => $NEW_RULE_REQUIRED,
+        'fw_rule_removed' => $NEW_RULE_REMOVED,
+        'fatal'    => $NO
+    },
 );