[Pkg-sks-commit] r168 - in sks/trunk/sks/debian: . patches

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 15:15:43 +0000 (Thu, 19 Jun 2008)
New Revision: 168

Added:
   sks/trunk/sks/debian/patches/212_do_not_export_zerolen_packets
Modified:
   sks/trunk/sks/debian/changelog
Log:
[project @ 170]
Add 212_do_not_export_zerolen_packets by jharris

Original author: weasel
Date: 2005-08-18 01:20:17.863588+00:00

Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog	2008-06-19 15:15:37 UTC (rev 167)
+++ sks/trunk/sks/debian/changelog	2008-06-19 15:15:43 UTC (rev 168)
@@ -1,3 +1,9 @@
+sks (1.0.9-0.6) UNRELEASED; urgency=low
+
+  * Add 212_do_not_export_zerolen_packets.
+
+ -- Peter Palfrader <weasel at debian.org>  Thu, 18 Aug 2005 03:02:48 +0200
+
 sks (1.0.9-0.5) UNRELEASED; urgency=low
 
   * Fix 500_debian_fhs again.

Added: sks/trunk/sks/debian/patches/212_do_not_export_zerolen_packets
===================================================================
--- sks/trunk/sks/debian/patches/212_do_not_export_zerolen_packets	                        (rev 0)
+++ sks/trunk/sks/debian/patches/212_do_not_export_zerolen_packets	2008-06-19 15:15:43 UTC (rev 168)
@@ -0,0 +1,19 @@
+diff -Nur sks-1.0.9/parsePGP.ml sks-1.0.9.new/parsePGP.ml
+--- sks-1.0.9/parsePGP.ml	2004-10-21 04:56:03.000000000 +0200
++++ sks-1.0.9.new/parsePGP.ml	2005-08-18 03:00:11.993107131 +0200
+@@ -23,6 +23,7 @@
+ open Printf
+ 
+ exception Overlong_mpi
++exception Zerolen_mpi
+ exception Partial_body_length of int
+ 
+ (********************************************************)
+@@ -109,6 +110,7 @@
+   try
+     let byte2 = cin#read_byte in
+     let length = (byte1 lsl 8) + byte2 in
++    if length <= 0 then raise Zerolen_mpi;
+     let data = cin#read_string 
+ 		 ((length + 7)/8)
+     in