Mbed-TLS/mbedtls-framework
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls-framework.git synced 2026-09-20 00:47:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix spurious match of data in DUMP_CHUNK_RE

Browse Source 
If the data from `MBEDTLS_SSL_DEBUG_BUF` that's listed in text form after
the hex digits starts with two bytes that happen to be hex digits, this
could be interpreted as an extra pair of hex digits. Fix this.

Signed-off-by: Gilles Peskine <[email protected]>
This commit is contained in:
Gilles Peskine
2026-04-01 09:45:50 +02:00
parent f911af9fc1
commit dd683324d8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/mbedtls_framework/ssl_log_parser.py
+5 -3
View File
@@ -17,13 +17,13 @@ class Info:
r'dumping \'(?P<what>.*?)\' \((?P<length>[0-9]+) bytes\)')
DUMP_CHUNK_RE = re.compile(
PREFIX_RE_S +
r'[0-9a-f]+: +(?P<data>(?:[0-9a-f]{2} *){1,16})')
r'[0-9a-f]+: *(?P<data>(?: [0-9a-f]{2}){1,16})')
VALUE_OF_RE = re.compile(
PREFIX_RE_S +
r'value of \'(?P<what>.*?)\' \((?P<length>[0-9]+) bits\)')
VALUE_CHUNK_RE = re.compile(
PREFIX_RE_S +
r'(?P<data>(?:[0-9a-f]{2} *){1,16})')
r'(?P<data>(?:[0-9a-f]{2}(?:$| )){1,16})')
def __init__(self) -> None:
"""Create an empty log info object."""
@@ -51,7 +51,9 @@ class Info:
acc += m.group('data')
remaining -= 16
plain = acc.replace(' ', '')
assert len(plain) == length * 2
if len(plain) != length * 2:
raise Exception(f'{filename}:{lineno}: '
f'found {len(plain)} hex digits but expected {length * 2}')
return plain
def read_file_contents(self,