From: Adrian-Ken Rueegsegger <ken@codelabs.ch>
Date: Mon, 17 Dec 2012 16:21:47 +0000 (+0100)
Subject: Set sp_id to reqid when creating ESA
X-Git-Tag: 5.0.3rc1~39^2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=722d68803ee65c41585cbdd075817d6b6a280ae6;p=thirdparty%2Fstrongswan.git

Set sp_id to reqid when creating ESA

The reqid corresponds to the sp_id (security policy id) on the TKM side.
---

diff --git a/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c b/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
index 623942b620..d60b8e5aeb 100644
--- a/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
+++ b/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
@@ -134,7 +134,7 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
 	 */
 	if (nonce_loc_id == 0 && esa.dh_id == 0)
 	{
-		if (ike_esa_create_first(esa_id, esa.isa_id, 1, 1, ntohl(spi_loc),
+		if (ike_esa_create_first(esa_id, esa.isa_id, reqid, 1, ntohl(spi_loc),
 								 ntohl(spi_rem)) != TKM_OK)
 		{
 			DBG1(DBG_KNL, "child SA (%llu, first) creation failed", esa_id);
@@ -146,7 +146,7 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
 	{
 		nonce_type nc_rem;
 		chunk_to_sequence(nonce_rem, &nc_rem, sizeof(nonce_type));
-		if (ike_esa_create_no_pfs(esa_id, esa.isa_id, 1, 1, nonce_loc_id,
+		if (ike_esa_create_no_pfs(esa_id, esa.isa_id, reqid, 1, nonce_loc_id,
 								  nc_rem, initiator, ntohl(spi_loc),
 								  ntohl(spi_rem)) != TKM_OK)
 		{
@@ -160,7 +160,7 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
 	{
 		nonce_type nc_rem;
 		chunk_to_sequence(nonce_rem, &nc_rem, sizeof(nonce_type));
-		if (ike_esa_create(esa_id, esa.isa_id, 1, 1, esa.dh_id, nonce_loc_id,
+		if (ike_esa_create(esa_id, esa.isa_id, reqid, 1, esa.dh_id, nonce_loc_id,
 						   nc_rem, initiator, ntohl(spi_loc),
 						   ntohl(spi_rem)) != TKM_OK)
 		{