From 75e3c6a67eda8317f5c85fc681568660e54ca6d4 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Tue, 1 Dec 2020 13:27:36 +0100 Subject: sectracker.parsers: do not uniquify CVE names We need the original name (basically the year) in order to write it back later. Besides the function was taking the line number rather than a hash of the description, so it was buggy anyway. If something needs the unique name at some point, we can add it in an additional field. --- lib/python/sectracker/parsers.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'lib') diff --git a/lib/python/sectracker/parsers.py b/lib/python/sectracker/parsers.py index 8963a80df6..1b84796f08 100644 --- a/lib/python/sectracker/parsers.py +++ b/lib/python/sectracker/parsers.py @@ -250,22 +250,9 @@ def cvelist(path, f): if desc[-1] != ']': diag.error("missing ']'") return (name, desc) - def cveuniquename(line, anns): - bug = 0 - for ann in anns: - if ann.type == "package": - bugs = [f for f in ann.flags if isinstance(f, PackageBugAnnotation)] - if bugs: - bug = bugs[0].bug - break - return "TEMP-%07d-%06d" % (bug, line) def finish(header, headerlineno, anns, diag): name, desc = header - if name[-1] == "X": - name1 = cveuniquename(headerlineno, anns) - else: - name1 = name - return Bug(path, Header(headerlineno, name1, desc), tuple(anns)) + return Bug(path, Header(headerlineno, name, desc), tuple(anns)) return _parselist(path, f, parseheader, finish) def _checkrelease(anns, diag, kind): -- cgit v1.2.3