about summary refs log tree commit diff
path: root/blacklisting/blacklist.xml
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2005-03-04T11·12+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2005-03-04T11·12+0000
commit9a7f95882c5e32ad5c41799016f749964221cad4 (patch)
tree68fb80a880befac8c6507db60828fc9e45769a43 /blacklisting/blacklist.xml
parent4bbdcfbb45112fc3b025f0feff7b995ee373b091 (diff)
* Basic blacklist checker. Each element in a user environment is
  checked against every item in a blacklist.

Diffstat (limited to 'blacklisting/blacklist.xml')
-rw-r--r--blacklisting/blacklist.xml18
1 files changed, 15 insertions, 3 deletions
diff --git a/blacklisting/blacklist.xml b/blacklisting/blacklist.xml
index 7c8c61733fb8..0ae2b21d2c5b 100644
--- a/blacklisting/blacklist.xml
+++ b/blacklisting/blacklist.xml
@@ -16,13 +16,25 @@
 
 <item id='zlib-1.2.1-security'>
   <condition>
+    <containsSource
+        hash="sha256:0yp7z8ask4b8m2ia253apnnxdk0z0zrs70yr079m2rjd4297chgv"
+        origin="zlib-1.2.1.tar.gz" />
+<!--
     <or>
-      <containsSource
-          hash="sha256:0yp7z8ask4b8m2ia253apnnxdk0z0zrs70yr079m2rjd4297chgv"
-          origin="zlib-1.2.1.tar.gz" />
+      <and>
+        <containsSource
+            hash="sha256:0yp7z8ask4b8m2ia253apnnxdk0z0zrs70yr079m2rjd4297chgv"
+            origin="zlib-1.2.1.tar.gz" />
+        <not>
+          <containsSource
+              hash="..."
+              origin="zlib-1.2.1-dos.patch" />
+        </not>
+      </and>
       <containsOutput
           name="/nix/store/gxbdsvlwz6ixin94jhdw7rwdbb5mxxq3-zlib-1.2.1" />
     </or>
+    -->
   </condition>
   <reason>
     Zlib 1.2.1 is vulnerable to a denial-of-service condition.  See