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

proposal: Add selection flags to clone() method

Browse Source 
This avoids having to call strip_dh() in child_cfg_t::get_proposals().
It also inverts the ALLOW_PRIVATE flag (i.e. makes it SKIP_PRIVATE) so
nothing has to be supplied to clone complete proposals.
This commit is contained in:
Tobias Brunner
2019-10-24 17:43:21 +02:00
parent 3187293e3d
commit a2cb2c9cc8
13 changed files with 84 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/crypto/proposal/proposal.c
+11 -9
View File
@@ -390,7 +390,7 @@ static bool select_algo(private_proposal_t *this, proposal_t *other,
{
if (alg1 == alg2 && ks1 == ks2)
{
if (!(flags & PROPOSAL_ALLOW_PRIVATE) && alg1 >= 1024)
if ((flags & PROPOSAL_SKIP_PRIVATE) && alg1 >= 1024)
{
if (log)
{
@@ -604,25 +604,27 @@ METHOD(proposal_t, equals, bool,
}
METHOD(proposal_t, clone_, proposal_t*,
private_proposal_t *this)
private_proposal_t *this, proposal_selection_flag_t flags)
{
private_proposal_t *clone;
enumerator_t *enumerator;
entry_t *entry;
transform_type_t *type;
clone = (private_proposal_t*)proposal_create(this->protocol, 0);
enumerator = array_create_enumerator(this->transforms);
while (enumerator->enumerate(enumerator, &entry))
{
if (entry->alg >= 1024 && (flags & PROPOSAL_SKIP_PRIVATE))
{
continue;
}
if (entry->type == DIFFIE_HELLMAN_GROUP && (flags & PROPOSAL_SKIP_DH))
{
continue;
}
array_insert(clone->transforms, ARRAY_TAIL, entry);
}
enumerator->destroy(enumerator);
enumerator = array_create_enumerator(this->types);
while (enumerator->enumerate(enumerator, &type))
{
array_insert(clone->types, ARRAY_TAIL, type);
add_type(clone->types, entry->type);
}
enumerator->destroy(enumerator);
src/libstrongswan/crypto/proposal/proposal.h
+5 -4
View File
@@ -56,10 +56,10 @@ extern enum_name_t *protocol_id_names;
* Flags for selecting proposals
*/
enum proposal_selection_flag_t {
/** Accept algorithms from a private range. */
PROPOSAL_ALLOW_PRIVATE = (1<<0),
/** Whether to prefer configured (default) or supplied proposals. */
PROPOSAL_PREFER_SUPPLIED = (1<<1),
PROPOSAL_PREFER_SUPPLIED = (1<<0),
/** Whether to skip and ignore algorithms from a private range. */
PROPOSAL_SKIP_PRIVATE = (1<<1),
/** Whether to skip and ignore diffie hellman groups. */
PROPOSAL_SKIP_DH = (1<<2),
};
@@ -207,9 +207,10 @@ struct proposal_t {
/**
* Clone a proposal.
*
* @param flags flags to consider during cloning
* @return clone of proposal
*/
proposal_t *(*clone) (proposal_t *this);
proposal_t *(*clone)(proposal_t *this, proposal_selection_flag_t flags);
/**
* Destroys the proposal object.