From cac44d3ca793d8714e7f5495e0426043a797fbe1 Mon Sep 17 00:00:00 2001
From: Raphael Geissert <geissert@debian.org>
Date: Tue, 14 Dec 2010 19:44:57 +0000
Subject: Fix a few RESERVED false positives

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@15709 e39458fd-73e7-0310-bf30-c45bca0a0e42
---
 check-external/lookup.sh | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'check-external')

diff --git a/check-external/lookup.sh b/check-external/lookup.sh
index 7279ebb4b7..a0dcd14ebb 100755
--- a/check-external/lookup.sh
+++ b/check-external/lookup.sh
@@ -87,8 +87,19 @@ for cve in $(< $source); do
     fi
 
     # Permanent exclusions can be added below
-    o="$(grep -m1 -A1 ^$cve ../data/CVE/list | sed '1{d;q}' |
-	    grep -E 'TODO|NOT-FOR-US|RESERVED')" || continue
+    o="$(grep -m1 -A2 ^$cve ../data/CVE/list | sed '1{d;q}')" || continue
+
+    extra=empty
+    while read line; do
+	if [[ $extra = empty ]]; then
+	    [[ $line =~ TODO|NOT-FOR-US|RESERVED ]] || continue 2
+	    o="$line"
+	    extra=
+	else
+	    extra="$line"
+	fi
+    done <<< "$o"
+
     case $o in
 	*NOT-FOR-US*)
 	    tr "[:upper:]" "[:lower:]" <<< "${o#*NOT-FOR-US:}" |
@@ -97,7 +108,11 @@ for cve in $(< $source); do
 	    grep -v adobe | grep -v acrobat | grep -vw opera |
 	    grep -v 'real player' >/dev/null && echo "$cve: $o" || :
 	;;
-	*TODO:*|*RESERVED*)
+	*TODO:*)
+	    echo "$cve: $o"
+	;;
+	*RESERVED*)
+	    [[ $extra ]] && grep -qv ^CVE <<< "$extra" || \
 	    echo "$cve: $o"
 	;;
 	*)
-- 
cgit v1.2.3