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

output of encryption algs with zero key length

Browse Source
This commit is contained in:
Andreas Steffen
2009-05-19 15:45:01 +02:00
parent 597cee84d3
commit f66f534ee9
2 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pluto/alg_info.c
+24 -8
View File
@@ -182,7 +182,7 @@ static void __alg_info_ike_add (struct alg_info_ike *alg_info, int ealg_id,
passert(cnt < countof(alg_info->ike));
/* dont add duplicates */
for (i = 0;i < cnt; i++)
for (i = 0; i < cnt; i++)
{
if (ike_info[i].ike_ealg == ealg_id
&& (!ek_bits || ike_info[i].ike_eklen == ek_bits)
@@ -200,7 +200,7 @@ static void __alg_info_ike_add (struct alg_info_ike *alg_info, int ealg_id,
alg_info->alg_info_cnt++;
DBG(DBG_CRYPT,
DBG_log("ikg alg added: %s_%d/%s/s, cnt=%d",
DBG_log("ikg alg added: %s_%d/%s/%s, cnt=%d",
enum_show(&oakley_enc_names, ealg_id), ek_bits,
enum_show(&oakley_hash_names, aalg_id),
enum_show(&oakley_group_names, modp_id),
@@ -516,9 +516,17 @@ alg_info_snprint(char *buf, int buflen, struct alg_info *alg_info)
ALG_INFO_ESP_FOREACH(alg_info_esp, esp_info, cnt)
{
np = snprintf(ptr, buflen, "%s_%d/%s, ",
enum_show(&esp_transformid_names, esp_info->esp_ealg_id),
(int)esp_info->esp_ealg_keylen,
np = snprintf(ptr, buflen, "%s",
enum_show(&esp_transformid_names, esp_info->esp_ealg_id));
ptr += np;
buflen -= np;
if (esp_info->esp_ealg_keylen)
{
np = snprintf(ptr, buflen, "_%u", esp_info->esp_ealg_keylen);
ptr += np;
buflen -= np;
}
np = snprintf(ptr, buflen, "/%s, ",
enum_show(&auth_alg_names, esp_info->esp_aalg_id));
ptr += np;
buflen -= np;
@@ -540,9 +548,17 @@ alg_info_snprint(char *buf, int buflen, struct alg_info *alg_info)
case PROTO_ISAKMP:
ALG_INFO_IKE_FOREACH((struct alg_info_ike *)alg_info, ike_info, cnt)
{
np = snprintf(ptr, buflen, "%s_%d/%s/%s, ",
enum_show(&oakley_enc_names, ike_info->ike_ealg),
(int)ike_info->ike_eklen,
np = snprintf(ptr, buflen, "%s",
enum_show(&oakley_enc_names, ike_info->ike_ealg));
ptr += np;
buflen -= np;
if (ike_info->ike_eklen)
{
np = snprintf(ptr, buflen, "_%u", ike_info->ike_eklen);
ptr += np;
buflen -= np;
}
np = snprintf(ptr, buflen, "/%s/%s, ",
enum_show(&oakley_hash_names, ike_info->ike_halg),
enum_show(&oakley_group_names, ike_info->ike_modp));
ptr += np;
src/pluto/kernel_alg.c
+23 -16
View File
@@ -477,27 +477,34 @@ void kernel_alg_show_connection(struct connection *c, const char *instance)
if (st && st->st_esp.present)
{
const char *aalg_name;
const char *aalg_name, *pfsgroup_name;
aalg_name = (st->st_ah.present) ?
aalg_name = (c->policy & POLICY_AUTHENTICATE) ?
enum_show(&ah_transformid_names, st->st_ah.attrs.transid):
enum_show(&auth_alg_names, st->st_esp.attrs.transid);
enum_show(&auth_alg_names, st->st_esp.attrs.auth);
whack_log(RC_COMMENT,
"\"%s\"%s: ESP%s proposal: %s_%d/%s/%s",
c->name,
instance,
pfsgroup_name = (c->policy & POLICY_PFS) ?
(c->alg_info_esp->esp_pfsgroup) ?
enum_show(&oakley_group_names,
c->alg_info_esp->esp_pfsgroup) :
"<Phase1>" : "<N/A>";
if (st->st_esp.attrs.key_len)
{
whack_log(RC_COMMENT, "\"%s\"%s: ESP%s proposal: %s_%u/%s/%s",
c->name, instance,
(st->st_ah.present) ? "/AH" : "",
enum_show(&esp_transformid_names, st->st_esp.attrs.transid),
st->st_esp.attrs.key_len,
aalg_name,
c->policy & POLICY_PFS ?
c->alg_info_esp->esp_pfsgroup ?
enum_show(&oakley_group_names,
c->alg_info_esp->esp_pfsgroup)
: "<Phase1>"
: "<N/A>"
);
st->st_esp.attrs.key_len, aalg_name, pfsgroup_name);
}
else
{
whack_log(RC_COMMENT, "\"%s\"%s: ESP%s proposal: %s/%s/%s",
c->name, instance,
(st->st_ah.present) ? "/AH" : "",
enum_show(&esp_transformid_names, st->st_esp.attrs.transid),
aalg_name, pfsgroup_name);
}
}
}