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

normalized pts_dh_group function names

Browse Source
This commit is contained in:
Andreas Steffen
2011-11-28 14:39:49 +01:00
parent 3be8995c3e
commit 2a415e77c7
2 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libpts/pts/pts_dh_group.c
+17 -19
View File
@@ -20,7 +20,7 @@
/**
* Described in header.
*/
bool pts_probe_dh_groups(pts_dh_group_t *groups)
bool pts_dh_group_probe(pts_dh_group_t *dh_groups)
{
enumerator_t *enumerator;
diffie_hellman_group_t dh_group;
@@ -28,45 +28,45 @@ bool pts_probe_dh_groups(pts_dh_group_t *groups)
char format1[] = " %s PTS DH group %N[%s] available";
char format2[] = " %s PTS DH group %N not available";
*groups = 0;
*dh_groups = PTS_DH_GROUP_NONE;
enumerator = lib->crypto->create_dh_enumerator(lib->crypto);
while (enumerator->enumerate(enumerator, &dh_group, &plugin_name))
{
if (dh_group == MODP_1024_BIT)
{
*groups |= PTS_DH_GROUP_IKE2;
DBG2(DBG_PTS, format1, "optional ", diffie_hellman_group_names, dh_group,
plugin_name);
*dh_groups |= PTS_DH_GROUP_IKE2;
DBG2(DBG_PTS, format1, "optional ", diffie_hellman_group_names,
dh_group, plugin_name);
}
else if (dh_group == MODP_1536_BIT)
{
*groups |= PTS_DH_GROUP_IKE5;
*dh_groups |= PTS_DH_GROUP_IKE5;
DBG2(DBG_PTS, format1, "optional ", diffie_hellman_group_names,
dh_group, plugin_name);
}
else if (dh_group == MODP_2048_BIT)
{
*groups |= PTS_DH_GROUP_IKE14;
*dh_groups |= PTS_DH_GROUP_IKE14;
DBG2(DBG_PTS, format1, "optional ", diffie_hellman_group_names,
dh_group, plugin_name);
}
else if (dh_group == ECP_256_BIT)
{
*groups |= PTS_DH_GROUP_IKE19;
*dh_groups |= PTS_DH_GROUP_IKE19;
DBG2(DBG_PTS, format1, "mandatory", diffie_hellman_group_names,
dh_group, plugin_name);
}
else if (dh_group == ECP_384_BIT)
{
*groups |= PTS_DH_GROUP_IKE20;
*dh_groups |= PTS_DH_GROUP_IKE20;
DBG2(DBG_PTS, format1, "optional ", diffie_hellman_group_names,
dh_group, plugin_name);
}
}
enumerator->destroy(enumerator);
if (*groups & PTS_DH_GROUP_IKE19)
if (*dh_groups & PTS_DH_GROUP_IKE19)
{
return TRUE;
}
@@ -75,14 +75,13 @@ bool pts_probe_dh_groups(pts_dh_group_t *groups)
DBG1(DBG_PTS, format2, "mandatory", diffie_hellman_group_names,
ECP_256_BIT);
}
return FALSE;
}
/**
* Described in header.
*/
bool pts_update_supported_dh_groups(char *dh_group, pts_dh_group_t *groups)
bool pts_dh_group_update(char *dh_group, pts_dh_group_t *dh_groups)
{
if (strcaseeq(dh_group, "ecp384"))
{
@@ -92,30 +91,29 @@ bool pts_update_supported_dh_groups(char *dh_group, pts_dh_group_t *groups)
else if (strcaseeq(dh_group, "ecp256"))
{
/* remove DH group 20 */
*groups &= ~PTS_DH_GROUP_IKE20;
*dh_groups &= ~PTS_DH_GROUP_IKE20;
return TRUE;
}
else if (strcaseeq(dh_group, "modp2048"))
{
/* remove DH groups 19 and 20 */
*groups &= ~(PTS_DH_GROUP_IKE20 | PTS_DH_GROUP_IKE19);
*dh_groups &= ~(PTS_DH_GROUP_IKE20 | PTS_DH_GROUP_IKE19);
return TRUE;
}
else if (strcaseeq(dh_group, "modp1536"))
{
/* remove DH groups 14, 19 and 20 */
*groups &= ~(PTS_DH_GROUP_IKE20 | PTS_DH_GROUP_IKE19 |
PTS_DH_GROUP_IKE14);
*dh_groups &= ~(PTS_DH_GROUP_IKE20 | PTS_DH_GROUP_IKE19 |
PTS_DH_GROUP_IKE14);
return TRUE;
}
else if (strcaseeq(dh_group, "modp1024"))
{
/* remove DH groups 5, 14, 19 and 20 */
*groups &= ~(PTS_DH_GROUP_IKE20 | PTS_DH_GROUP_IKE19 |
PTS_DH_GROUP_IKE14 | PTS_DH_GROUP_IKE5);
*dh_groups &= ~(PTS_DH_GROUP_IKE20 | PTS_DH_GROUP_IKE19 |
PTS_DH_GROUP_IKE14 | PTS_DH_GROUP_IKE5);
return TRUE;
}
DBG1(DBG_PTS, "unknown DH group: %s configured", dh_group);
return FALSE;
}
src/libpts/pts/pts_dh_group.h
+10 -10
View File
@@ -57,24 +57,24 @@ enum pts_dh_group_t {
*/
/**
* Probe available PTS measurement algorithms
* Probe available PTS Diffie-Hellman groups
*
* @param groups set of available groups
* @return TRUE if mandatory group PTS_DH_GROUP_IKE19 is available
* @param dh_groups returns set of available DH groups
* @return TRUE if mandatory DH groups are available
*/
bool pts_probe_dh_groups(pts_dh_group_t *groups);
bool pts_dh_group_probe(pts_dh_group_t *dh_groups);
/**
* Update supported Diffie-Hellman groups according to configuration
*
* @param dh_group configured Diffie-Hellman group
* @param groups set of available groups
* @param dh_group configured DH group
* @param dh_groups returns set of available DH groups
*/
bool pts_update_supported_dh_groups(char *dh_group, pts_dh_group_t *groups);
bool pts_dh_group_update(char *dh_group, pts_dh_group_t *dh_groups);
/**
* Select the strongest supported Diffie-Hellman group
* among a set of offered Diffie-Hellman groups
* among a set of offered DH groups
*
* @param dh_group set of supported DH groups
* @param groups set of offered DH groups
@@ -86,8 +86,8 @@ pts_dh_group_t pts_dh_group_select(pts_dh_group_t supported_dh_groups,
/**
* Convert pts_dh_group_t to diffie_hellman_group_t
*
* @param dh_group PTS Diffie-Hellman group type
* @return libstrongswan diffie hellman group type
* @param dh_group PTS DH group type
* @return libstrongswan DH group type
*/
diffie_hellman_group_t pts_dh_group_to_strongswan_dh_group(pts_dh_group_t dh_group);