[Secure-testing-commits] r166 - in sarge-checks: . CAN
Joey Hess
joeyh@haydn.debian.org
Fri, 03 Dec 2004 13:23:02 -0700
Author: joeyh
Date: 2004-12-03 13:22:58 -0700 (Fri, 03 Dec 2004)
New Revision: 166
Added:
sarge-checks/Makefile
sarge-checks/update.pl
Removed:
sarge-checks/CAN/update.pl
Modified:
sarge-checks/CAN/Makefile
sarge-checks/CAN/list
Log:
- remove old CAN claim
- update CVEs too
Modified: sarge-checks/CAN/Makefile
===================================================================
--- sarge-checks/CAN/Makefile 2004-12-03 20:17:47 UTC (rev 165)
+++ sarge-checks/CAN/Makefile 2004-12-03 20:22:58 UTC (rev 166)
@@ -1,5 +1,5 @@
update:
rm -f full-can.html
wget --quiet http://www.cve.mitre.org/cve/candidates/downloads/full-can.html
- ./update.pl full-can.html ../DSA/list list > list.new
+ ../update.pl full-can.html ../DSA/list list > list.new
mv -f list.new list
Modified: sarge-checks/CAN/list
===================================================================
--- sarge-checks/CAN/list 2004-12-03 20:17:47 UTC (rev 165)
+++ sarge-checks/CAN/list 2004-12-03 20:22:58 UTC (rev 166)
@@ -1560,7 +1560,6 @@
CAN-2004-0399
{DSA-502 DSA-501}
- exim 3.36-11
-begin claimed by greuff-guest (due 31 Oct)
CAN-2004-0398
{DSA-507 DSA-506}
@@ -1622,7 +1621,6 @@
{DSA-477}
CAN-2004-0371
{DSA-476}
-end claimed by greuff-guest
CAN-2004-0370
NOTE: not-for-us (KAME)
CAN-2004-0369
@@ -1751,7 +1749,6 @@
NOTE: not-for-us (OWLS 1.0)
CAN-2004-0301
NOTE: not-for-us (Online Store Kit)
-begin claimed by greuff-guest
CAN-2004-0300
NOTE: not-for-us (Online Store Kit)
CAN-2004-0299
@@ -2272,8 +2269,6 @@
CAN-2004-0003
{DSA-495 DSA-491 DSA-489 DSA-482 DSA-481 DSA-480 DSA-479}
NOTE: fixed in 2.4.26-rc4
-end claimed by greuff-guest
-begin claimed by pdwerryh-guest
CAN-2004-0002
NOTE: not-for-us (FreeBSD netinet)
CAN-2003-1565
@@ -2376,7 +2371,6 @@
NOTE: not-for-us (Apple)
CAN-2003-1005
NOTE: reserved
-end claimed by pdwerryh-guest
CAN-2003-1004
NOTE: not-for-us (Cisco)
CAN-2003-1003
@@ -2580,7 +2574,6 @@
{DSA-402}
CAN-2003-0901
{DSA-397}
-begin claimed by pdwerryh-guest
CAN-2003-0900
NOTE: reserved
CAN-2003-0899
@@ -2798,7 +2791,6 @@
NOTE: not-for-us (Nokia)
CAN-2003-0801
NOTE: not-for-us (Nokia)
-end claimed by pdwerryh-guest
CAN-2003-0800
NOTE: reserved
CAN-2003-0799
@@ -4357,7 +4349,6 @@
NOTE: reserved
CAN-2003-0005
NOTE: reserved
-begin claimed by pdwerryh-guest
CAN-2003-0001
{DSA-442 DSA-423 DSA-336 DSA-332 DSA-312 DSA-311}
CAN-2002-1583
@@ -4833,7 +4824,6 @@
NOTE: reserved
CAN-2002-1301
NOTE: reserved
-end claimed by pdwerryh-guest
CAN-2002-1300
NOTE: reserved
CAN-2002-1299
Deleted: sarge-checks/CAN/update.pl
===================================================================
--- sarge-checks/CAN/update.pl 2004-12-03 20:17:47 UTC (rev 165)
+++ sarge-checks/CAN/update.pl 2004-12-03 20:22:58 UTC (rev 166)
@@ -1,137 +0,0 @@
-#!/usr/bin/perl
-my $full_can_html=shift;
-my $dsa_list=shift;
-my $our_list=shift;
-
-my %cans;
-
-open (DSA, "<$dsa_list") || die "$dsa_list: $!\n";
-my $dsa;
-while (<DSA>) {
- if (/^\[/) {
- ($dsa)=m/(DSA-.*?) /;
- }
- if (/\{(CAN|CVE)/) {
- my ($canlist)=m/\{(.*)\}/;
- foreach my $can (split ' ', $canlist) {
- $can=~s/CVE-/CAN-/g;
- next unless $can=~/^CAN-\d+/;
- $cans{$can}{can}=$can;
- push @{$cans{$can}{dsa}}, $dsa;
- $can=~s/CAN-/CVE-/g;
- $cans{$can}{can}=$can;
- push @{$cans{$can}{dsa}}, $dsa;
- }
- }
-}
-close DSA;
-
-my %listedcans;
-
-open (FULL_CAN, "<$full_can_html") || die "$full_can_html: $!\n";
-my $can;
-while (<FULL_CAN>) {
- if (m!<b>(CAN-\d+-\d+)</b>!) {
- $can=$1;
- $cans{$can}{can}=$can;
- $listedcans{$can}=1;
- }
- elsif (m!<b>(CVE-\d+-\d+)</b>!) {
- $can=$1;
- $cans{$can}{can}=$can;
- $listedcans{$can}=1;
- }
- if (m!\*\*\s+RESERVED\s+\*\*!) {
- $cans{$can}{reserved}=1;
-
- }
- if (m!\*\*\s+REJECT\s+\*\*!) {
- $cans{$can}{rejected}=1;
- }
-}
-close FULL_CAN;
-
-my $stopped=0;
-my @out;
-
-sub docan {
- my $can=shift;
-
- push @out, "$can".(length $cans{$can}{description} ? " ".$cans{$can}{description} : "")."\n";
- if ($cans{$can}{reserved}) {
- push @out, "\tNOTE: reserved\n";
- }
- if ($cans{$can}{rejected}) {
- push @out, "\tNOTE: rejected\n";
- }
- if ($cans{$can}{dsa}) {
- push @out, "\t{".join(" ", @{$cans{$can}{dsa}})."}\n";
- }
- if ($cans{$can}{notes}) {
- foreach (@{$cans{$can}{notes}}) {
- push @out, "\t$_\n";
- }
- }
- if (! $cans{$can}{reserved} && ! $cans{$can}{rejected} &&
- ! $cans{$can}{dsa} && ! $cans{$can}{notes} &&
- ! $stopped) {
- push @out, "\tTODO: check\n";
- }
-
- delete $cans{$can};
-}
-
-open (IN, "<$our_list") || die "$our_list: $!\n";
-my $can;
-while (<IN>) {
- chomp;
- if (/^((?:CAN|CVE)-[-0-9]*)\s*(.*)/) {
- docan($can) if $can;
- $can=$1;
- $cans{$can}{description}=$2 if length $2;
- }
- elsif (/^\s+NOTE:\s*(reserved|rejected)\s*$/) {
- # skip it
- }
- elsif (/^\s+NOTE: covered by DSA.*/) {
- # skip it (old form)
- }
- elsif (/^\s+{DSA.*/) {
- # skip
- }
- elsif (/^\s+(.*)/ && $can) {
- push @{$cans{$can}{notes}}, $1;
- }
- elsif (/^STOP/) {
- docan($can) if $can;
- push @out, "$_\n";
- $stopped=1;
- $can='';
- }
- else {
- docan($can) if $can;
- push @out, "$_\n" if length $_;
- $can='';
- }
-}
-close IN;
-docan($can) if $can;
-
-foreach my $can (reverse sort { $cans{$a}{can} cmp $cans{$b}{can} } keys %cans) {
- next unless $listedcans{$can};
- print "$can\n";
- if ($cans{$can}{reserved}) {
- print "\tNOTE: reserved\n";
- }
- if ($cans{$can}{rejected}) {
- print "\tNOTE: rejected\n";
- }
- if ($cans{$can}{dsa}) {
- print "\t{".join(" ", @{$cans{$can}{dsa}})."}\n";
- }
- if (!$cans{$can}{reserved} || $cans{$can}{rejected} || $cans{$can}{dsa}) {
- print "\tTODO: check\n";
- }
-}
-
-print @out;
Added: sarge-checks/Makefile
===================================================================
--- sarge-checks/Makefile 2004-12-03 20:17:47 UTC (rev 165)
+++ sarge-checks/Makefile 2004-12-03 20:22:58 UTC (rev 166)
@@ -0,0 +1,3 @@
+update:
+ $(MAKE) -C CVE update
+ $(MAKE) -C CAN update
Copied: sarge-checks/update.pl (from rev 162, sarge-checks/CAN/update.pl)