fix to really support non DSA/DTSA cross references, also fixes some missing 'TODO: check' entries

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

1 files changed, 8 insertions, 7 deletions

diff --git a/bin/updatelist b/bin/updatelist
index 70b5749d21..4a794225ab 100755
--- a/bin/updatelist
+++ b/bin/updatelist
@@ -20,7 +20,7 @@ sub read_dsa {
 			foreach my $cve (split ' ', $cvelist) {
 				next unless $cve=~/^CVE-\d+/;
 				$cves{$cve}{cve}=$cve;
-				push @{$cves{$cve}{dsa}}, $dsa;
+				push @{$cves{$cve}{xref}}, $dsa;
 			}
 		}
 	}
@@ -72,8 +72,8 @@ sub docve {
 	if ($cves{$cve}{rejected}) {
 		push @out, "\tREJECTED\n";
 	}
-	if ($cves{$cve}{dsa}) {
-		push @out, "\t{".join(" ", @{$cves{$cve}{dsa}})."}\n";
+	if ($cves{$cve}{xref}) {
+		push @out, "\t{".join(" ", @{$cves{$cve}{xref}})."}\n";
 	}
 	if ($cves{$cve}{notes}) {
 		foreach (@{$cves{$cve}{notes}}) {
@@ -114,8 +114,9 @@ while (<IN>) {
 	elsif (/^\s+NOTE: covered by DT?SA.*/) {
 		# skip it (old form)
 	}
-	elsif (/^\s+{DT?SA.*/) {
-		# skip
+	elsif (/^\s+{\s*(.+?)\s*}/) {
+		my @xrefs=split('\s+', $1);
+		push @{$cves{$cve}{xref}}, grep(!/^DT?SA/, @xrefs);
 	}
 	elsif (/^\s+(.*)/ && $cve) {
 		push @{$cves{$cve}{notes}}, $1;
@@ -144,8 +145,8 @@ foreach my $cve (reverse sort { $cves{$a}{cve} cmp $cves{$b}{cve} } keys %cves)
 	if ($cves{$cve}{rejected}) {
 		print "\tREJECTED\n";
 	}
-	if ($cves{$cve}{dsa}) {
-		print "\t{".join(" ", @{$cves{$cve}{dsa}})."}\n";
+	if ($cves{$cve}{xref}) {
+		print "\t{".join(" ", @{$cves{$cve}{xref}})."}\n";
 	}
 	if (!$cves{$cve}{reserved} || $cves{$cve}{rejected} ) {
 		print "\tTODO: check\n";