Attachment 304844 Details for Bug 442956 – Allow NULL encryption with ESP

[patch] Allow NULL encryption with ESP

openswan-null-encr-esp.patch (text/plain), 1.68 KB, created by Herbert Xu on 2008-05-08 08:46:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Herbert Xu

Created: 2008-05-08 08:46:31 UTC

Size: 1.68 KB

patch

obsolete

>Only in openswan-2.6.12: OBJ.linux.x86_64
>Only in openswan-2.6.12/programs/pluto: core
>diff -ur openswan-2.6.12.orig/programs/pluto/kernel_netlink.c openswan-2.6.12/programs/pluto/kernel_netlink.c
>--- openswan-2.6.12.orig/programs/pluto/kernel_netlink.c	2008-04-22 11:55:38.000000000 +0800
>+++ openswan-2.6.12/programs/pluto/kernel_netlink.c	2008-05-08 16:40:35.000000000 +0800
>@@ -640,7 +640,6 @@
> 	attr = (struct rtattr *)((char *)attr + attr->rta_len);
>     }
> 
>-    if (sa->enckeylen)
>     {
> 	struct xfrm_algo algo;
> 	const char *name;
>diff -ur openswan-2.6.12.orig/programs/pluto/spdb_v2_struct.c openswan-2.6.12/programs/pluto/spdb_v2_struct.c
>--- openswan-2.6.12.orig/programs/pluto/spdb_v2_struct.c	2008-05-03 16:58:02.000000000 +0800
>+++ openswan-2.6.12/programs/pluto/spdb_v2_struct.c	2008-05-08 16:33:49.000000000 +0800
>@@ -801,7 +801,7 @@
>     if(!out_struct(&r_trans, &ikev2_trans_desc
> 		   , &r_proposal_pbs, &r_trans_pbs))
> 	impossible();
>-    if (ta.encrypter->keyminlen != ta.encrypter->keymaxlen)
>+    if (ta.encrypter && ta.encrypter->keyminlen != ta.encrypter->keymaxlen)
> 	out_attr(IKEv2_KEY_LENGTH, ta.enckeylen
> 		 , &isakmp_ikev2_attribute_desc, ikev2_attr_val_descs
> 		 , &r_trans_pbs);
>@@ -1311,9 +1311,12 @@
>     ta.encrypter = (struct encrypt_desc *)ike_alg_ikev2_find(IKE_ALG_ENCRYPT
> 							     , ta.encrypt
> 							     , ta.enckeylen);
>-    passert(ta.encrypter != NULL);
>-    if (!ta.enckeylen)
>-	ta.enckeylen = ta.encrypter->keydeflen;
>+    if (ta.encrypter)
>+    {
>+	if (!ta.enckeylen)
>+	    ta.enckeylen = ta.encrypter->keydeflen;
>+    } else
>+	passert(ta.encrypt == IKEv2_ENCR_NULL);
> 
>     /* this is really a mess having so many different numbers for auth
>      * algorithms.

Actions: View | Diff

Attachments on bug 442956: 304844