Commit 6694f42688 for strongswan.org

commit 6694f4268828a09c770eaeb44af3c1361c532a8b
Author: Tobias Brunner <tobias@strongswan.org>
Date:   Thu Aug 27 14:09:48 2026 +0200

    charon-tkm: Use proper type to pass initiator flag

diff --git a/src/charon-tkm/src/tkm/tkm_keymat.c b/src/charon-tkm/src/tkm/tkm_keymat.c
index 582e7dea48..b10b27a3b0 100644
--- a/src/charon-tkm/src/tkm/tkm_keymat.c
+++ b/src/charon-tkm/src/tkm/tkm_keymat.c
@@ -177,25 +177,28 @@ METHOD(keymat_v2_t, derive_ike_keys, bool,
 	block_len_type block_len;
 	icv_len_type icv_len;
 	iv_len_type iv_len;
+	isa_flags_type flags;

 	if (!concat_ke_ids(kes, &ke_ids))
 	{
 		return FALSE;
 	}

-	nonce = this->initiator ? &nonce_i : &nonce_r;
-
 	if (this->initiator)
 	{
+		nonce = &nonce_i;
 		chunk_to_sequence(&nonce_r, &nonce_rem, sizeof(nonce_type));
 		spi_loc = id->get_initiator_spi(id);
 		spi_rem = id->get_responder_spi(id);
+		flags = TKM_ISA_INITIATOR;
 	}
 	else
 	{
+		nonce = &nonce_r;
 		chunk_to_sequence(&nonce_i, &nonce_rem, sizeof(nonce_type));
 		spi_loc = id->get_responder_spi(id);
 		spi_rem = id->get_initiator_spi(id);
+		flags = 0;
 	}

 	ia_id = get_proposal_id(proposal);
@@ -225,7 +228,7 @@ METHOD(keymat_v2_t, derive_ike_keys, bool,
 			 "spi_loc: %llx, spi_rem: %llx)", nc_id, ia_id, ke_ids.data[0],
 			 spi_loc, spi_rem);
 		res = ike_isa_create(this->isa_ctx_id, this->ae_ctx_id, ia_id,
-							 ke_ids.data[0], nc_id, nonce_rem, this->initiator,
+							 ke_ids.data[0], nc_id, nonce_rem, flags,
 							 spi_loc, spi_rem, &block_len, &icv_len, &iv_len);
 	}
 	else
@@ -269,7 +272,7 @@ METHOD(keymat_v2_t, derive_ike_keys, bool,
 			this->ae_ctx_id = isa_info.ae_id;
 			res = ike_isa_create_child(this->isa_ctx_id, isa_info.parent_isa_id,
 									   ia_id, ke_ids, nc_id, nonce_rem,
-									   this->initiator, spi_loc, spi_rem,
+									   flags, spi_loc, spi_rem,
 									   &block_len, &icv_len, &iv_len);
 		}