diff options
| author | Thijs Kinkhorst <thijs@debian.org> | 2013-12-05 12:16:57 +0000 |
|---|---|---|
| committer | Thijs Kinkhorst <thijs@debian.org> | 2013-12-05 12:16:57 +0000 |
| commit | 0ebd78f8eef0900a485626e0b483bab26d04c138 (patch) | |
| tree | 3bd8b9221192abe8734012679b3ab0f466018283 /lib/python/bugs.py | |
| parent | 4ba901297dcdb6106f893217ae58a0b0ecde6f9d (diff) | |
prepare for new CVE format
git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@24590 e39458fd-73e7-0310-bf30-c45bca0a0e42
Diffstat (limited to 'lib/python/bugs.py')
| -rw-r--r-- | lib/python/bugs.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/python/bugs.py b/lib/python/bugs.py index 92c177b368..49ccf04ab4 100644 --- a/lib/python/bugs.py +++ b/lib/python/bugs.py @@ -186,7 +186,7 @@ class PackageNoteNoDSA: class BugBase: "Base class for entries in the bug list.""" - re_cve_name = re.compile(r'^CVE-\d{4}-\d{4}$') + re_cve_name = re.compile(r'^CVE-\d{4}-\d{4,}$') def __init__(self, fname, lineno, date, name, description, comments): assert type(fname) in types.StringTypes @@ -416,11 +416,11 @@ class FileBase(debian_support.PackageFile): re_xref_required = re.compile(r'^\{') re_xref = re.compile(r'^\{\s*([^\}]+?)\s*\}$') re_whitespace = re.compile(r'\s+') - re_xref_entry = re.compile('^(?:CVE-\d{4}-\d{4}' + re_xref_entry = re.compile('^(?:CVE-\d{4}-\d{4,}' + r'|VU#\d{6}' + r'|DSA-\d+(?:-\d+)?|DTSA-\d+-\d+)$') re_xref_entry_own = re.compile( - '^(?:CVE-\d{4}-\d{4}|DSA-\d+(?:-\d+)?|DTSA-\d+-\d+)$') + '^(?:CVE-\d{4}-\d{4,}|DSA-\d+(?:-\d+)?|DTSA-\d+-\d+)$') re_package_required = re.compile(r'^(?:\[.*\]\s*)?-') re_package_version = re.compile( @@ -735,7 +735,7 @@ class FileBase(debian_support.PackageFile): class CVEFile(FileBase): """A CVE file, as used by the Debian testing security team.""" - re_cve = re.compile(r'^(CVE-\d{4}-(?:\d{4}|XXXX))\s+(.*?)\s*$') + re_cve = re.compile(r'^(CVE-\d{4}-(?:\d{4,}|XXXX))\s+(.*?)\s*$') def __init__(self, name, fileObj=None): FileBase.__init__(self, name, fileObj) |