prepare for new CVE format

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@24590 e39458fd-73e7-0310-bf30-c45bca0a0e42

4 files changed, 4 insertions, 4 deletions

diff --git a/bin/check-new-issues b/bin/check-new-issues
index 384c083ae8..bef44e8d36 100755
--- a/bin/check-new-issues
+++ b/bin/check-new-issues
@@ -141,7 +141,7 @@ if ($opts{u} || $opts{U}) {
 
 foreach my $entry (@{$entries}) {
 	my $name;
-	if ( $entry =~ /^(CVE-....-\d\d\d\d)/ ) {
+	if ( $entry =~ /^(CVE-....-\d{4,})/ ) {
 		$name=$1;
 	}
 	elsif ( $entry =~ /^(CVE-....-XXXX.*)\n/ ){
diff --git a/bin/compare-testing-status b/bin/compare-testing-status
index 82b7af6dd6..3ce4afad8a 100755
--- a/bin/compare-testing-status
+++ b/bin/compare-testing-status
@@ -181,7 +181,7 @@ sub issue2string {
 	my $result = $sth_desc->fetchall_arrayref();
 	$desc = $result->[0]->[0];
 
-	if ( $issue =~ /^CVE-\d{4}-\d{4}/ ) {
+	if ( $issue =~ /^CVE-\d{4}-\d{4,}/ ) {
 		$url = "http://cve.mitre.org/cgi-bin/cvename.cgi?name=" . $issue ;
 		return "$issue: $url\n";
 	}
diff --git a/bin/dsa2list b/bin/dsa2list
index 1c9188b277..61f85f79a8 100755
--- a/bin/dsa2list
+++ b/bin/dsa2list
@@ -61,7 +61,7 @@ def fetch_dsc(url):
 re_title = re.compile(r'^Subject: .*\[DSA[ -](\d+-\d+)\] .* fix(?:es)? (.*)$')
 re_date = re.compile(r'^([A-Z][a-z][a-z])[a-z]* (\d+)[a-z]*, (\d+)\s+http://.*')
 
-re_cve = re.compile('(CVE-\d{4}-\d{4})')
+re_cve = re.compile('(CVE-\d{4}-\d{4,})')
 release_headline_re = re.compile(
     r'^Debian GNU/Linux [0-9.]+ (?:\(|alias) ([a-z]+).*')
 release_headline_re_s = re.compile(r'^Debian \((\w+)\)')
diff --git a/bin/report-vuln b/bin/report-vuln
index bd68dae694..a38fbe371d 100755
--- a/bin/report-vuln
+++ b/bin/report-vuln
@@ -181,7 +181,7 @@ def main():
 
 	# check for valid parameters
 	p = re.compile('^[a-z].*')
-	c = re.compile('(CVE|cve)\-[0-9]{4}-[0-9]{4}')
+	c = re.compile('(CVE|cve)\-[0-9]{4}-[0-9]{4,}')
 
 	if not p.match(pkg):
 		error(pkg + ' does not seem to be a valid source package name')