put correct -vvv into smb print tests

diff --git a/tests/TESTLIST b/tests/TESTLIST
index 3baebef5834bb8c1530aa4550e7458db17e5a498..c7c5e20220ad16e173f08cf163337334a914fb8f 100644 (file)
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -647,7 +647,7 @@ kh-tcpdump-003          kh-tcpdump-003.pcap     kh-tcpdump-003.out
 
 # CVE-2018-10105 bad packets from Luis Rocha
 cve-2018-10105-segv-sflowprint           cve-2018-10105-segv-sflowprint.pcapng    cve-2018-10105-segv-sflowprint.out -v
-cve-2018-10105_smbprint-readofsize1      cve-2018-10105_smbprint-readofsize1.pcap cve-2018-10105_smbprint-readofsize1.out
-cve-2018-10105_smbutil_withoutasan       cve-2018-10105_smbutil_withoutasan.pcap  cve-2018-10105_smbutil_withoutasan.out
+cve-2018-10105_smbprint-readofsize1      cve-2018-10105_smbprint-readofsize1.pcap cve-2018-10105_smbprint-readofsize1.out -vvv
+cve-2018-10105_smbutil_withoutasan       cve-2018-10105_smbutil_withoutasan.pcap  cve-2018-10105_smbutil_withoutasan.out -vvv
 
 

diff --git a/tests/cve-2018-10105_smbutil_withoutasan.out b/tests/cve-2018-10105_smbutil_withoutasan.out
index 6c8513421deb088d36336d1ffb5788474a0e529a..3a2ad23ad4399cff1618840320afa39928d696d8 100644 (file)
--- a/tests/cve-2018-10105_smbutil_withoutasan.out
+++ b/tests/cve-2018-10105_smbutil_withoutasan.out
@@ -1,8 +1,101 @@
-IP 192.168.56.55.445 > 192.168.56.119.49199: Flags [P.], seq 4267808374:4267808462, ack 628292694, win 63102, length 88 SMB PACKET: SMBtrans2 (REPLY)
+IP (tos 0x0, ttl 128, id 376, offset 0, flags [DF], proto TCP (6), length 128)
+    192.168.56.55.445 > 192.168.56.119.49199: Flags [P.], cksum 0x3e2f (incorrect -> 0x3d49), seq 4267808374:4267808462, ack 628292694, win 63102, length 88 
+SMB PACKET: SMBtrans2 (REPLY)
+SMB Command   =  0x32
+Error class   =  0x0
+Error code    =  0 (0x0)
+Flags1        =  0xFF
+Flags2        =  0x7
+Tree ID       =  2048 (0x800)
+Proc ID       =  2848 (0xb20)
+UID           =  4098 (0x1002)
+MID           =  1616 (0x650)
+Word Count    =  10 (0xa)
+TRANSACT2_OPEN param_length=2 data_length=24
+TotParam=2 (0x2)
+TotData=24 (0x18)
+Res1=0x0
+ParamCnt=2 (0x2)
+ParamOff=56 (0x38)
+ParamDisp0 (0x0)
+DataCnt=24 (0x18)
+DataOff=60 (0x3c)
+DataDisp=0 (0x0)
+SetupCnt=0 (0x0)
+smb_bcc=29
+Handle=0 (0x0)
+Attrib=Data=
+Data: (24 bytes)
+[000] 00 00 0B 00 00 00 00 00  00 00 00 00 00 00 00 00  \0x00\0x00\0x0b\0x00\0x00\0x00\0x00\0x00 \0x00\0x00\0x00\0x00\0x00\0x00\0x00\0x00
+[010] 01 00 00 00 00 00 00 00                           \0x01\0x00\0x00\0x00\0x00\0x00\0x00\0x00 
 
 IP 192.168.56.119.49199 > 192.168.56.55.445: Flags [P.], seq 1:75, ack 88, win 254, length 74 SMB PACKET: SMBtrans2 (REQUEST)
 
-IP 192.168.56.55.445 > 192.168.56.119.49199: Flags [P.], seq 88:168, ack 75, win 63028, length 80 SMB PACKET: SMBtrans2 (REPLY)
+IP (tos 0x0, ttl 128, id 632, offset 0, flags [DF], proto TCP (6), length 114)
+    192.168.56.119.49199 > 192.168.56.55.445: Flags [P.], cksum 0x2437 (correct), seq 1:75, ack 88, win 254, length 74 
+SMB PACKET: SMBtrans2 (REQUEST)
+SMB Command   =  0x32
+Error class   =  0x0
+Error code    =  0 (0x0)
+Flags1        =  0x18
+Flags2        =  0x7
+Tree ID       =  2048 (0x800)
+Proc ID       =  2848 (0xb20)
+UID           =  4098 (0x1002)
+MID           =  1632 (0x660)
+Word Count    =  15 (0xf)
+TRANSACT2_QFSINFO param_length=2 data_length=0
+TotParam=2 (0x2)
+TotData=0 (0x0)
+MaxParam=0 (0x0)
+MaxData=560 (0x230)
+MaxSetup=0 (0x0)
+Flags=0x0
+TimeOut=0 (0x0)
+Res1=0x0
+ParamCnt=2 (0x2)
+ParamOff=68 (0x44)
+DataCnt=0 (0x0)
+DataOff=0 (0x0)
+SetupCnt=1 (0x1)
+smb_bcc=5
+InfoLevel=261 (0x105)
 
-IP 192.168.56.119.49199 > 192.168.56.55.445: Flags [P.], seq 75:151, ack 168, win 253, length 76 SMB-over-TCP packet:(raw data or continuation?)
+
+IP (tos 0x0, ttl 128, id 377, offset 0, flags [DF], proto TCP (6), length 120)
+    192.168.56.55.445 > 192.168.56.119.49199: Flags [P.], cksum 0xf1fb (incorrect -> 0x1559), seq 88:168, ack 75, win 63028, length 80 
+SMB PACKET: SMBtrans2 (REPLY)
+SMB Command   =  0x32
+Error class   =  0x0
+Error code    =  0 (0x0)
+Flags1        =  0x98
+Flags2        =  0x7
+Tree ID       =  0 (0x0)
+Proc ID       =  0 (0x0)
+UID           =  0 (0x0)
+MID           =  0 (0x0)
+Word Count    =  11 (0xb)
+TRANSACT2_QFSINFO param_length=0 data_length=20
+TotParam=0 (0x0)
+TotData=0 (0x0)
+Res1=0x0
+ParamCnt=0 (0x0)
+ParamOff=56 (0x38)
+ParamDisp0 (0x0)
+DataCnt=20 (0x14)
+DataOff=56 (0x38)
+DataDisp=0 (0x0)
+SetupCnt=0 (0x0)
+smb_bcc=65280
+Capabilities=0x700FF
+MaxFileLen=255 (0xff)
+VolNameLen=4278190088
+Volume=...
+data:
+[000] FF 00 07 00 FF 00 00 00  08 00 00 FF FF FF FF 00  \0xff\0x00\0x07\0x00\0xff\0x00\0x00\0x00 \0x08\0x00\0x00\0xff\0xff\0xff\0xff\0x00
+[010] 46 00 53 00                                       F\0x00S\0x00 
+
+
+IP (tos 0x0, ttl 128, id 633, offset 0, flags [DF], proto TCP (6), length 116)
+    192.168.56.119.49199 > 192.168.56.55.445: Flags [P.], cksum 0x2253 (incorrect -> 0x229b), seq 75:151, ack 168, win 253, length 76 SMB-over-TCP packet:(raw data or continuation?)