Attachment 300892 Details for Bug 439771 – Fix child SA key generation

[patch] Fix child SA key generation

p (text/plain), 1.31 KB, created by Herbert Xu on 2008-04-04 16:30:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Herbert Xu

Created: 2008-04-04 16:30:30 UTC

Size: 1.31 KB

patch

obsolete

>diff -ur openswan-2.6.09.orig/programs/pluto/ikev2_crypto.c openswan-2.6.09/programs/pluto/ikev2_crypto.c
>--- openswan-2.6.09.orig/programs/pluto/ikev2_crypto.c	2008-03-10 23:42:57.000000000 +0800
>+++ openswan-2.6.09/programs/pluto/ikev2_crypto.c	2008-04-05 00:29:39.000000000 +0800
>@@ -74,6 +74,7 @@
> 	childsacalc.spii.len=0;
> 	childsacalc.spir.len=0;
> 	
>+	childsacalc.counter[0] = 1;
> 	childsacalc.skeyseed = &st->st_skey_d;
> 	
> 	st->st_esp.present = TRUE;
>@@ -105,7 +106,7 @@
> 	v2genbytes(&rkeymat, st->st_esp.keymat_len
> 		   , "responder keys", &childsacalc);
> 	
>-	if(role == INITIATOR) {
>+	if(role != INITIATOR) {
> 	    if(DBGP(DBG_CRYPT)) {
> 		DBG_dump_chunk("our  keymat", ikeymat);
> 		DBG_dump_chunk("peer keymat", rkeymat);
>diff -ur openswan-2.6.09.orig/programs/pluto/state.c openswan-2.6.09/programs/pluto/state.c
>--- openswan-2.6.09.orig/programs/pluto/state.c	2008-03-10 23:42:57.000000000 +0800
>+++ openswan-2.6.09/programs/pluto/state.c	2008-04-05 00:17:47.000000000 +0800
>@@ -814,6 +814,8 @@
>     clone_chunk(st_skey_er,  "st_skey_er in duplicate_state");
>     clone_chunk(st_skey_pi,  "st_skey_pi in duplicate_state");
>     clone_chunk(st_skey_pr,  "st_skey_pr in duplicate_state");
>+    clone_chunk(st_ni,       "st_ni in duplicate_state");
>+    clone_chunk(st_nr,       "st_nr in duplicate_state");
> 
> #   undef clone_chunk
>

Actions: View | Diff

Attachments on bug 439771: 299701 | 299702 | 299703 | 299704 | 299705 | 299706 | 300892 | 303405 | 303894 | 303895 | 303896 | 303963 | 303964 | 304445 | 305744 | 305745 | 305940