denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not destroy xauth_id if phase2 equals phase1 connection

Browse Source
This commit is contained in:
Andreas Steffen
2010-06-08 23:18:00 +02:00
parent 964f6372cc
commit 611368339b
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pluto/ipsec_doi.c
+4 -7
View File
@@ -1964,12 +1964,11 @@ stf_status quick_outI1(int whack_sock, struct state *isakmp_sa,
} }
if (ph1_c->policy & (POLICY_XAUTH_RSASIG | POLICY_XAUTH_PSK) && if (ph1_c->policy & (POLICY_XAUTH_RSASIG | POLICY_XAUTH_PSK) &&
ph1_c->xauth_identity) ph1_c->xauth_identity && !c->xauth_identity)
{ {
DBG(DBG_CONTROL, DBG(DBG_CONTROL,
DBG_log("inheriting XAUTH identity %Y", ph1_c->xauth_identity) DBG_log("inheriting XAUTH identity %Y", ph1_c->xauth_identity)
) )
DESTROY_IF(c->xauth_identity);
c->xauth_identity = ph1_c->xauth_identity->clone(ph1_c->xauth_identity); c->xauth_identity = ph1_c->xauth_identity->clone(ph1_c->xauth_identity);
} }
@@ -4897,7 +4896,6 @@ static stf_status quick_inI1_outR1_tail(struct verify_oppo_bundle *b,
* instantiate, carrying over authenticated peer ID * instantiate, carrying over authenticated peer ID
*/ */
host_t *vip = c->spd.that.host_srcip; host_t *vip = c->spd.that.host_srcip;
identification_t *xauth_id = c->xauth_identity;
p = rw_instantiate(p, &c->spd.that.host_addr, md->sender_port p = rw_instantiate(p, &c->spd.that.host_addr, md->sender_port
, his_net, c->spd.that.id); , his_net, c->spd.that.id);
@@ -4916,13 +4914,12 @@ static stf_status quick_inI1_outR1_tail(struct verify_oppo_bundle *b,
} }
if (c->policy & (POLICY_XAUTH_RSASIG | POLICY_XAUTH_PSK) && if (c->policy & (POLICY_XAUTH_RSASIG | POLICY_XAUTH_PSK) &&
xauth_id) c->xauth_identity && !p->xauth_identity)
{ {
DBG(DBG_CONTROL, DBG(DBG_CONTROL,
DBG_log("inheriting XAUTH identity %Y", xauth_id) DBG_log("inheriting XAUTH identity %Y", c->xauth_identity)
) )
DESTROY_IF(p->xauth_identity); p->xauth_identity = c->xauth_identity->clone(c->xauth_identity);
p->xauth_identity = xauth_id->clone(xauth_id);
} }
} }
} }