[kernel] r22880 - in dists/squeeze-security/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sat Aug  1 17:30:02 2015
New Revision: 22880

Log:
crypto: testmgr - update LZO compression test vectors (regression in 2.6.32.64)

Added:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/crypto-testmgr-update-lzo-compression-test-vectors.patch
Modified:
   dists/squeeze-security/linux-2.6/debian/changelog
   dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze14

Modified: dists/squeeze-security/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/changelog	Sat Aug  1 17:27:55 2015	(r22879)
+++ dists/squeeze-security/linux-2.6/debian/changelog	Sat Aug  1 17:30:02 2015	(r22880)
@@ -3,6 +3,8 @@
   [ Ben Hutchings ]
   * udp: fix behavior of wrong checksums (CVE-2015-5364, CVE-2015-5366)
   * sg_start_req(): make sure that there's not too many elements in iovec
+  * crypto: testmgr - update LZO compression test vectors
+    (regression in 2.6.32.64)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 28 Jun 2015 23:23:19 +0100
 

Added: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/crypto-testmgr-update-lzo-compression-test-vectors.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/crypto-testmgr-update-lzo-compression-test-vectors.patch	Sat Aug  1 17:30:02 2015	(r22880)
@@ -0,0 +1,76 @@
+From: "Markus F.X.J. Oberhumer" <markus at oberhumer.com>
+Date: Sun, 14 Oct 2012 15:39:04 +0200
+Subject: crypto: testmgr - update LZO compression test vectors
+Origin: https://git.kernel.org/linus/0ec7382036922be063b515b2a3f1d6f7a607392c
+
+Update the LZO compression test vectors according to the latest compressor
+version.
+
+Signed-off-by: Markus F.X.J. Oberhumer <markus at oberhumer.com>
+---
+ crypto/testmgr.h | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/crypto/testmgr.h b/crypto/testmgr.h
+index b5721e0..3db1b75 100644
+--- a/crypto/testmgr.h
++++ b/crypto/testmgr.h
+@@ -9237,38 +9237,40 @@ static struct pcomp_testvec zlib_decomp_tv_template[] = {
+ static struct comp_testvec lzo_comp_tv_template[] = {
+ 	{
+ 		.inlen	= 70,
+-		.outlen	= 46,
++		.outlen	= 57,
+ 		.input	= "Join us now and share the software "
+ 			"Join us now and share the software ",
+ 		.output	= "\x00\x0d\x4a\x6f\x69\x6e\x20\x75"
+-			"\x73\x20\x6e\x6f\x77\x20\x61\x6e"
+-			"\x64\x20\x73\x68\x61\x72\x65\x20"
+-			"\x74\x68\x65\x20\x73\x6f\x66\x74"
+-			"\x77\x70\x01\x01\x4a\x6f\x69\x6e"
+-			"\x3d\x88\x00\x11\x00\x00",
++			  "\x73\x20\x6e\x6f\x77\x20\x61\x6e"
++			  "\x64\x20\x73\x68\x61\x72\x65\x20"
++			  "\x74\x68\x65\x20\x73\x6f\x66\x74"
++			  "\x77\x70\x01\x32\x88\x00\x0c\x65"
++			  "\x20\x74\x68\x65\x20\x73\x6f\x66"
++			  "\x74\x77\x61\x72\x65\x20\x11\x00"
++			  "\x00",
+ 	}, {
+ 		.inlen	= 159,
+-		.outlen	= 133,
++		.outlen	= 131,
+ 		.input	= "This document describes a compression method based on the LZO "
+ 			"compression algorithm.  This document defines the application of "
+ 			"the LZO algorithm used in UBIFS.",
+-		.output	= "\x00\x2b\x54\x68\x69\x73\x20\x64"
++		.output	= "\x00\x2c\x54\x68\x69\x73\x20\x64"
+ 			  "\x6f\x63\x75\x6d\x65\x6e\x74\x20"
+ 			  "\x64\x65\x73\x63\x72\x69\x62\x65"
+ 			  "\x73\x20\x61\x20\x63\x6f\x6d\x70"
+ 			  "\x72\x65\x73\x73\x69\x6f\x6e\x20"
+ 			  "\x6d\x65\x74\x68\x6f\x64\x20\x62"
+ 			  "\x61\x73\x65\x64\x20\x6f\x6e\x20"
+-			  "\x74\x68\x65\x20\x4c\x5a\x4f\x2b"
+-			  "\x8c\x00\x0d\x61\x6c\x67\x6f\x72"
+-			  "\x69\x74\x68\x6d\x2e\x20\x20\x54"
+-			  "\x68\x69\x73\x2a\x54\x01\x02\x66"
+-			  "\x69\x6e\x65\x73\x94\x06\x05\x61"
+-			  "\x70\x70\x6c\x69\x63\x61\x74\x76"
+-			  "\x0a\x6f\x66\x88\x02\x60\x09\x27"
+-			  "\xf0\x00\x0c\x20\x75\x73\x65\x64"
+-			  "\x20\x69\x6e\x20\x55\x42\x49\x46"
+-			  "\x53\x2e\x11\x00\x00",
++			  "\x74\x68\x65\x20\x4c\x5a\x4f\x20"
++			  "\x2a\x8c\x00\x09\x61\x6c\x67\x6f"
++			  "\x72\x69\x74\x68\x6d\x2e\x20\x20"
++			  "\x2e\x54\x01\x03\x66\x69\x6e\x65"
++			  "\x73\x20\x74\x06\x05\x61\x70\x70"
++			  "\x6c\x69\x63\x61\x74\x76\x0a\x6f"
++			  "\x66\x88\x02\x60\x09\x27\xf0\x00"
++			  "\x0c\x20\x75\x73\x65\x64\x20\x69"
++			  "\x6e\x20\x55\x42\x49\x46\x53\x2e"
++			  "\x11\x00\x00",
+ 	},
+ };
+ 

Modified: dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze14
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze14	Sat Aug  1 17:27:55 2015	(r22879)
+++ dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze14	Sat Aug  1 17:30:02 2015	(r22880)
@@ -1,2 +1,3 @@
 + bugfix/all/udp-fix-behavior-of-wrong-checksums.patch
 + bugfix/all/sg_start_req-make-sure-that-there-s-not-too-many-ele.patch
++ bugfix/all/crypto-testmgr-update-lzo-compression-test-vectors.patch