Pass IKEv1 specific keymat to ike_keys hook

src/libcharon/sa/ikev1/phase1.c

@@ -215,9 +215,9 @@ METHOD(phase1_t, derive_keys, bool,
 		DBG1(DBG_IKE, "key derivation for %N failed", auth_method_names, method);
 		return FALSE;
 	}
+	charon->bus->ike_keys(charon->bus, this->ike_sa, this->dh, this->dh_value,
+						  this->nonce_i, this->nonce_r, NULL, shared_key);
 	DESTROY_IF(shared_key);
-	charon->bus->ike_keys(charon->bus, this->ike_sa, this->dh,
-						  this->nonce_i, this->nonce_r, NULL);
 	return TRUE;
 }
 

src/libcharon/sa/ikev2/tasks/ike_init.c

@@ -354,8 +354,8 @@ static bool derive_keys(private_ike_init_t *this,
 	{
 		return FALSE;
 	}
-	charon->bus->ike_keys(charon->bus, this->ike_sa, this->dh,
-						  nonce_i, nonce_r, this->old_sa);
+	charon->bus->ike_keys(charon->bus, this->ike_sa, this->dh, chunk_empty,
+						  nonce_i, nonce_r, this->old_sa, NULL);
 	return TRUE;
 }