On Fri, Jul 11, 2014 at 12:57:35AM -0500, Adam Majer wrote: > > You guys may want to know, but your source code is *not* 0.8.2. > > ftp://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ > > As far as I can tell, what you have packaged as 0.8.2 is 0.8.0, 3 > years older. Perhaps that's why you are having some funny diffs?
Correction. Debian orig.tar.gz does not seem to be from upstream or
maybe it was badly generated or something.
The diff between Debian 0.8.2 orig.tar.gz and the above release 0.8.2
is 608kb in size :S
/compile |only
/test-driver |only
rpm/Makefile.in | 289 ++-
rpm/suse/Makefile.in | 117 +
rpm/suse/ipsec-tools.spec | 2
src/Makefile.in | 289 ++-
src/include-glibc/Makefile.am | 2
src/include-glibc/Makefile.in | 119 +
src/include-glibc/net/pfkeyv2.h | 8
src/libipsec/Makefile.in | 338 ++--
src/libipsec/pfkey.c | 37
src/libipsec/policy_parse.c | 657 ++++----
src/libipsec/policy_parse.h | 40
src/libipsec/policy_token.c | 67
src/racoon/Makefile.in | 892 ++++++++---
src/racoon/admin.c | 38
src/racoon/cfparse.c | 2698 ++++++++++++++++------------------
src/racoon/cfparse.h | 42
src/racoon/cfparse.y | 157 +
src/racoon/cftoken.c | 2602 ++++++++++++++++----------------
src/racoon/cftoken.l | 3
src/racoon/crypto_openssl.c | 193 --
src/racoon/grabmyaddr.c | 20
src/racoon/handler.c | 20
src/racoon/ipsec_doi.c | 3
src/racoon/isakmp.c | 6
src/racoon/isakmp_cfg.c | 5
src/racoon/isakmp_inf.c | 18
src/racoon/isakmp_unity.c | 8
src/racoon/isakmp_xauth.c | 10
src/racoon/main.c | 6
src/racoon/missing/crypto/sha2/sha2.c | 4
src/racoon/oakley.c | 21
src/racoon/privsep.c | 11
src/racoon/prsa_par.c | 654 ++++----
src/racoon/prsa_par.h | 40
src/racoon/prsa_tok.c | 67
src/racoon/racoon.conf.5 | 6
src/setkey/Makefile.in | 337 ++--
src/setkey/parse.c | 789 ++++-----
src/setkey/parse.h | 40
src/setkey/token.c | 65
42 files changed, 5747 insertions(+), 4973 deletions(-)
Most of these changes tend to be using wrong tags, like,
--- a/ipsec-tools-0.8.2/src/racoon/crypto_openssl.c 2014-04-23
00:23:42.000000000 -0500
+++ b/ipsec-tools-0.8.2/src/racoon/crypto_openssl.c 2012-12-24
08:50:39.000000000 -0600
@@ -1,4 +1,4 @@
-/* $NetBSD: crypto_openssl.c,v 1.20 2010/10/20 13:40:02 tteras Exp $
*/
+/* $NetBSD: crypto_openssl.c,v 1.20.4.3 2012/12/24 14:50:39 tteras Exp
$ */
- is Debian
+ is upstream
Probably not too good.. because there are off-by-1 overflows in there
too,
--- a/ipsec-tools-0.8.2/src/racoon/isakmp_unity.c 2014-04-23
00:23:42.000000000 -0500
+++ b/ipsec-tools-0.8.2/src/racoon/isakmp_unity.c 2012-08-23
06:10:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_unity.c,v 1.9 2007/10/19 03:37:19 manu Exp $ */
+/* $NetBSD: isakmp_unity.c,v 1.9.18.1 2012/01/01 17:32:04 tteras Exp $
*/
/* Id: isakmp_unity.c,v 1.10 2006/07/31 04:49:23 manubsd Exp */
@@ -387,8 +387,9 @@
netentry = netentry->next;
}
- /* allocate network list string */
- str = racoon_malloc(len);
+ /* allocate network list string; we need the extra byte temporarily
+ * as sprintf() will write trailing 0-byte after the space. */
+ str = racoon_malloc(len + 1);
if (str == NULL)
return NULL;
- Adam
--
Adam Majer
[email protected]
signature.asc
Description: Digital signature
