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

ha: Add DH group to CHILD_ADD message

Browse Source 
References #1267.
This commit is contained in:
Tobias Brunner
2016-02-01 10:50:53 +01:00
parent f1e908837a
commit b5c2ed5016
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/ha/ha_child.c
+4
View File
@@ -91,6 +91,10 @@ METHOD(listener_t, child_keys, bool,
{ {
m->add_attribute(m, HA_ALG_INTEG, alg); m->add_attribute(m, HA_ALG_INTEG, alg);
} }
if (proposal->get_algorithm(proposal, DIFFIE_HELLMAN_GROUP, &alg, NULL))
{
m->add_attribute(m, HA_ALG_DH, alg);
}
if (proposal->get_algorithm(proposal, EXTENDED_SEQUENCE_NUMBERS, &alg, NULL)) if (proposal->get_algorithm(proposal, EXTENDED_SEQUENCE_NUMBERS, &alg, NULL))
{ {
m->add_attribute(m, HA_ESN, alg); m->add_attribute(m, HA_ESN, alg);
src/libcharon/plugins/ha/ha_dispatcher.c
+8 -1
View File
@@ -655,7 +655,7 @@ static void process_child_add(private_ha_dispatcher_t *this,
u_int32_t inbound_spi = 0, outbound_spi = 0; u_int32_t inbound_spi = 0, outbound_spi = 0;
u_int16_t inbound_cpi = 0, outbound_cpi = 0; u_int16_t inbound_cpi = 0, outbound_cpi = 0;
u_int8_t mode = MODE_TUNNEL, ipcomp = 0; u_int8_t mode = MODE_TUNNEL, ipcomp = 0;
u_int16_t encr = 0, integ = 0, len = 0; u_int16_t encr = 0, integ = 0, len = 0, dh_grp = 0;
u_int16_t esn = NO_EXT_SEQ_NUMBERS; u_int16_t esn = NO_EXT_SEQ_NUMBERS;
u_int seg_i, seg_o; u_int seg_i, seg_o;
chunk_t nonce_i = chunk_empty, nonce_r = chunk_empty, secret = chunk_empty; chunk_t nonce_i = chunk_empty, nonce_r = chunk_empty, secret = chunk_empty;
@@ -705,6 +705,9 @@ static void process_child_add(private_ha_dispatcher_t *this,
case HA_ALG_INTEG: case HA_ALG_INTEG:
integ = value.u16; integ = value.u16;
break; break;
case HA_ALG_DH:
dh_grp = value.u16;
break;
case HA_ESN: case HA_ESN:
esn = value.u16; esn = value.u16;
break; break;
@@ -755,6 +758,10 @@ static void process_child_add(private_ha_dispatcher_t *this,
{ {
proposal->add_algorithm(proposal, ENCRYPTION_ALGORITHM, encr, len); proposal->add_algorithm(proposal, ENCRYPTION_ALGORITHM, encr, len);
} }
if (dh_grp)
{
proposal->add_algorithm(proposal, DIFFIE_HELLMAN_GROUP, dh_grp, 0);
}
proposal->add_algorithm(proposal, EXTENDED_SEQUENCE_NUMBERS, esn, 0); proposal->add_algorithm(proposal, EXTENDED_SEQUENCE_NUMBERS, esn, 0);
if (secret.len) if (secret.len)
{ {