diff options
Diffstat (limited to '')
| -rw-r--r-- | test/suite_decryption.py | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/test/suite_decryption.py b/test/suite_decryption.py index 985a11f6..a224e155 100644 --- a/test/suite_decryption.py +++ b/test/suite_decryption.py @@ -524,13 +524,22 @@ class TestDecryptTLS: first_response = binascii.hexlify(b'Request for /first, version TLSv1.3, Early data: no\n').decode("ascii") early_response = binascii.hexlify(b'Request for /early, version TLSv1.3, Early data: yes\n').decode("ascii") second_response = binascii.hexlify(b'Request for /second, version TLSv1.3, Early data: yes\n').decode("ascii") + # assert [ + # r'5|/first|', + # fr'6||{first_response}', + # r'8|/early|', + # fr'10||{early_response}', + # r'12|/second|', + # fr'13||{second_response}', + # ] == stdout.splitlines() + assert [ r'5|/first|', - fr'6||{first_response}', + fr'6|/first|{first_response}', r'8|/early|', - fr'10||{early_response}', + fr'10|/early|{early_response}', r'12|/second|', - fr'13||{second_response}', + fr'13|/second|{second_response}', ] == stdout.splitlines() def test_tls13_rfc8446_noearly(self, cmd_tshark, dirs, features, capture_file, test_env): @@ -549,12 +558,20 @@ class TestDecryptTLS: first_response = binascii.hexlify(b'Request for /first, version TLSv1.3, Early data: no\n').decode("ascii") early_response = binascii.hexlify(b'Request for /early, version TLSv1.3, Early data: yes\n').decode("ascii") second_response = binascii.hexlify(b'Request for /second, version TLSv1.3, Early data: yes\n').decode("ascii") + # assert [ + # r'5|/first|', + # fr'6||{first_response}', + # fr'10||{early_response}', + # r'12|/second|', + # fr'13||{second_response}', + # ] == stdout.splitlines() + assert [ r'5|/first|', - fr'6||{first_response}', + fr'6|/first|{first_response}', fr'10||{early_response}', r'12|/second|', - fr'13||{second_response}', + fr'13|/second|{second_response}', ] == stdout.splitlines() def test_tls12_dsb(self, cmd_tshark, capture_file, test_env): @@ -1319,7 +1336,8 @@ class TestDecryptSmb2: '-Tfields', '-e', 'smb2.tree', '-Y', 'smb2.tree == "{}"'.format(tree.replace('\\', '\\\\')), - ), encoding='utf-8', env=env) + ), encoding='unicode_escape', env=env) + # Remove the escapes (we only have one field so this causes no issue) assert tree == stdout.strip() # SMB3.0 CCM |