CVE-2017-13687/CHDLC: Improve bounds and length checks.

[tcpdump] / tests / crypto.sh

diff --git a/tests/crypto.sh b/tests/crypto.sh
index 3aa29caa5babf843841ea69788ce1e95fb3f9402..dd852bab5547f2f12d4f158851fa8d7455bde3ca 100755 (executable)
--- a/tests/crypto.sh
+++ b/tests/crypto.sh
@@ -1,12 +1,40 @@
 #!/bin/sh
 
 #!/bin/sh
 

+exitcode=0
+

 # Only attempt OpenSSL-specific tests when compiled with the library.
 
 if grep '^#define HAVE_LIBCRYPTO 1$' ../config.h >/dev/null
 then
 # Only attempt OpenSSL-specific tests when compiled with the library.
 
 if grep '^#define HAVE_LIBCRYPTO 1$' ../config.h >/dev/null
 then

-       ./TESTonce esp1 02-sunrise-sunset-esp.pcap esp1.out '-E "[email protected] 3des-cbc-hmac96:0x4043434545464649494a4a4c4c4f4f515152525454575758"'
-       ./TESTonce esp2 08-sunrise-sunset-esp2.pcap esp2.out '-E "[email protected] 3des-cbc-hmac96:0x43434545464649494a4a4c4c4f4f51515252545457575840,[email protected] 3des-cbc-hmac96:0x434545464649494a4a4c4c4f4f5151525254545757584043"'
-       ./TESTonce esp3 02-sunrise-sunset-esp.pcap esp1.out '-E "3des-cbc-hmac96:0x4043434545464649494a4a4c4c4f4f515152525454575758"'
+       passed=`cat .passed`
+       failed=`cat .failed`
+       if ./TESTonce esp1 02-sunrise-sunset-esp.pcap esp1.out '-E "[email protected] 3des-cbc-hmac96:0x4043434545464649494a4a4c4c4f4f515152525454575758"'
+       then
+               passed=`expr $passed + 1`
+               echo $passed >.passed
+       else
+               failed=`expr $failed + 1`
+               echo $failed >.failed
+               exitcode=1
+       fi
+       if ./TESTonce esp2 08-sunrise-sunset-esp2.pcap esp2.out '-E "[email protected] 3des-cbc-hmac96:0x43434545464649494a4a4c4c4f4f51515252545457575840,[email protected] 3des-cbc-hmac96:0x434545464649494a4a4c4c4f4f5151525254545757584043"'
+       then
+               passed=`expr $passed + 1`
+               echo $passed >.passed
+       else
+               failed=`expr $failed + 1`
+               echo $failed >.failed
+               exitcode=1
+       fi
+       if ./TESTonce esp3 02-sunrise-sunset-esp.pcap esp1.out '-E "3des-cbc-hmac96:0x4043434545464649494a4a4c4c4f4f515152525454575758"'
+       then
+               passed=`expr $passed + 1`
+               echo $passed >.passed
+       else
+               failed=`expr $failed + 1`
+               echo $failed >.failed
+               exitcode=1
+       fi

        # Reading the secret(s) from a file does not work with Capsicum.
        if grep '^#define HAVE_CAPSICUM 1$' ../config.h >/dev/null
        then
        # Reading the secret(s) from a file does not work with Capsicum.
        if grep '^#define HAVE_CAPSICUM 1$' ../config.h >/dev/null
        then


@@ -17,11 +45,51 @@ then
                printf "$FORMAT" ikev2pI2
                printf "$FORMAT" isakmp4
        else
                printf "$FORMAT" ikev2pI2
                printf "$FORMAT" isakmp4
        else

-               ./TESTonce esp4 08-sunrise-sunset-esp2.pcap esp2.out '-E "file esp-secrets.txt"'
-               ./TESTonce esp5 08-sunrise-sunset-aes.pcap esp5.out '-E "file esp-secrets.txt"'
-               ./TESTonce espudp1 espudp1.pcap espudp1.out '-nnnn -E "file esp-secrets.txt"'
-               ./TESTonce ikev2pI2 ikev2pI2.pcap ikev2pI2.out '-E "file ikev2pI2-secrets.txt" -v -v -v -v'
-               ./TESTonce isakmp4 isakmp4500.pcap isakmp4.out '-E "file esp-secrets.txt"'
+               if ./TESTonce esp4 08-sunrise-sunset-esp2.pcap esp2.out '-E "file esp-secrets.txt"'
+               then
+                       passed=`expr $passed + 1`
+                       echo $passed >.passed
+               else
+                       failed=`expr $failed + 1`
+                       echo $failed >.failed
+                       exitcode=1
+               fi
+               if ./TESTonce esp5 08-sunrise-sunset-aes.pcap esp5.out '-E "file esp-secrets.txt"'
+               then
+                       passed=`expr $passed + 1`
+                       echo $passed >.passed
+               else
+                       failed=`expr $failed + 1`
+                       echo $failed >.failed
+                       exitcode=1
+               fi
+               if ./TESTonce espudp1 espudp1.pcap espudp1.out '-nnnn -E "file esp-secrets.txt"'
+               then
+                       passed=`expr $passed + 1`
+                       echo $passed >.passed
+               else
+                       failed=`expr $failed + 1`
+                       echo $failed >.failed
+                       exitcode=1
+               fi
+               if ./TESTonce ikev2pI2 ikev2pI2.pcap ikev2pI2.out '-E "file ikev2pI2-secrets.txt" -v -v -v -v'
+               then
+                       passed=`expr $passed + 1`
+                       echo $passed >.passed
+               else
+                       failed=`expr $failed + 1`
+                       echo $failed >.failed
+                       exitcode=1
+               fi
+               if ./TESTonce isakmp4 isakmp4500.pcap isakmp4.out '-E "file esp-secrets.txt"'
+               then
+                       passed=`expr $passed + 1`
+                       echo $passed >.passed
+               else
+                       failed=`expr $failed + 1`
+                       echo $failed >.failed
+                       exitcode=1
+               fi

        fi
 else
        FORMAT='    %-35s: TEST SKIPPED (compiled w/o OpenSSL)\n'
        fi
 else
        FORMAT='    %-35s: TEST SKIPPED (compiled w/o OpenSSL)\n'


@@ -34,3 +102,5 @@ else
        printf "$FORMAT" ikev2pI2
        printf "$FORMAT" isakmp4
 fi
        printf "$FORMAT" ikev2pI2
        printf "$FORMAT" isakmp4
 fi

+
+exit $exitcode