rpms/openswan/devel openswan-2.6.21-gcc44.patch,1.5,1.6

[avesh agarwal]

Author: avesh

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1074

Added Files:
	openswan-2.6.21-gcc44.patch 
Log Message:
* Mon Mar 30 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-1
- new upstream release
- Fix for CVE-2009-0790 DPD crasher
- Fix remaining SADB_EXT_MAX -> K_SADB_EXT_MAX entries
- Fix ipsec setup --status not showing amount of tunnels with netkey


openswan-2.6.21-gcc44.patch:

Index: openswan-2.6.21-gcc44.patch
===================================================================
RCS file: openswan-2.6.21-gcc44.patch
diff -N openswan-2.6.21-gcc44.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openswan-2.6.21-gcc44.patch	30 Mar 2009 18:17:49 -0000	1.6
@@ -0,0 +1,49 @@
+diff -urNp openswan-2.6.21-orig/programs/ikeping/ikeping.c openswan-2.6.21/programs/ikeping/ikeping.c
+--- openswan-2.6.21-orig/programs/ikeping/ikeping.c	2009-03-30 15:11:28.000000000 +0200
++++ openswan-2.6.21/programs/ikeping/ikeping.c	2009-03-30 19:11:27.000000000 +0200
+@@ -254,10 +254,13 @@ receive_ping(int afamily, int s, int rep
+ 	printf("received %d(%s) packet from %s/%d of len: %d\n",
+ 	       ih.isa_xchg, xchg_name, buf, ntohs(rport), n);
+ 
++	u_int32_t tmp_ic, tmp_rc;
++	memcpy(&tmp_ic, ih.isa_icookie, sizeof(u_int32_t));
++	memcpy(&tmp_rc, ih.isa_rcookie, sizeof(u_int32_t));
+ 	printf("\trcookie=%08x_%08x icookie=%08x_%08x msgid=%08x\n",
+-	       *(u_int32_t *)(ih.isa_icookie), 
++	       tmp_ic,
+ 	       *(u_int32_t *)(ih.isa_icookie+4), 
+-	       *(u_int32_t *)(ih.isa_rcookie), 
++	       tmp_rc,
+ 	       *(u_int32_t *)(ih.isa_rcookie+4),
+ 	       ih.isa_msgid);
+ 	printf("\tnp=%03d  version=%d.%d    xchg=%s(%d)\n",
+diff -urNp openswan-2.6.21-orig/programs/rsasigkey/rsasigkey.c openswan-2.6.21/programs/rsasigkey/rsasigkey.c
+--- openswan-2.6.21-orig/programs/rsasigkey/rsasigkey.c	2009-03-30 15:11:28.000000000 +0200
++++ openswan-2.6.21/programs/rsasigkey/rsasigkey.c	2009-03-30 19:33:44.000000000 +0200
+@@ -193,10 +193,13 @@ char *filename;
+ 	int sawpr1 = 0;
+ 	int sawpr2 = 0;
+ 	int nbits;
++	char fsin[2];
++	fsin[0]='-'; /*file stdin*/
++	fsin[1]='\0';
+ 
+ 	nbits = 0;
+  
+-	if (STREQ(filename, "-"))
++	if (STREQ(filename, fsin))
+ 		f = stdin;
+ 	else
+ 		f = fopen(filename, "r");
+diff -urNp openswan-2.6.21-orig/programs/tncfg/tncfg.c openswan-2.6.21/programs/tncfg/tncfg.c
+--- openswan-2.6.21-orig/programs/tncfg/tncfg.c	2009-03-30 15:11:28.000000000 +0200
++++ openswan-2.6.21/programs/tncfg/tncfg.c	2009-03-30 19:10:39.000000000 +0200
+@@ -176,7 +176,7 @@ int
+ main(int argc, char *argv[])
+ {
+ 	struct ifreq ifr;
+-	struct ipsectunnelconf *shc=(struct ipsectunnelconf *)&ifr.ifr_data;
++	struct ipsectunnelconf *shc=(struct ipsectunnelconf *)ifr.ifr_data;
+ 	int s;
+ 	int c, previous = -1;
+ 	int argcount = argc;