jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

HS 2.0: Reject PPS MO if polupd or AAA trust root is invalid

Browse source 
Previously, this was done only for the subscription remediation/update
trust root. The other downloaded files were also verified, but the OSU
server was not notified if the files were found to be invalid.

Modify hs20-osu-client behavior to explicitly notify the OSU server if
any of the three trust root types cannot be successfully downloaded.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2018-10-17 19:03:18 +03:00 committed by Jouni Malinen
parent 2cbaf0de22
commit de7bcb9bc9
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
hs20/client/osu_client.c
View file

@ -436,7 +436,7 @@ static int cmd_dl_polupd_ca(struct hs20_osu_client *ctx, const char *pps_fname,
if (node == NULL) { if (node == NULL) {
wpa_printf(MSG_INFO, "No Policy/PolicyUpdate/TrustRoot/CertURL found from PPS"); wpa_printf(MSG_INFO, "No Policy/PolicyUpdate/TrustRoot/CertURL found from PPS");
xml_node_free(ctx->xml, pps); xml_node_free(ctx->xml, pps);
return -1; return -2;
} }
ret = download_cert(ctx, node, ca_fname); ret = download_cert(ctx, node, ca_fname);
@ -463,7 +463,7 @@ static int cmd_dl_aaa_ca(struct hs20_osu_client *ctx, const char *pps_fname,
if (node == NULL) { if (node == NULL) {
wpa_printf(MSG_INFO, "No AAAServerTrustRoot/CertURL found from PPS"); wpa_printf(MSG_INFO, "No AAAServerTrustRoot/CertURL found from PPS");
xml_node_free(ctx->xml, pps); xml_node_free(ctx->xml, pps);
return -1; return -2;
} }
aaa = xml_node_first_child(ctx->xml, node); aaa = xml_node_first_child(ctx->xml, node);
@ -485,7 +485,7 @@ static int download_trust_roots(struct hs20_osu_client *ctx,
{ {
char *dir, *pos; char *dir, *pos;
char fname[300]; char fname[300];
int ret; int ret, ret1;
dir = os_strdup(pps_fname); dir = os_strdup(pps_fname);
if (dir == NULL) if (dir == NULL)
@ -500,9 +500,13 @@ static int download_trust_roots(struct hs20_osu_client *ctx,
snprintf(fname, sizeof(fname), "%s/ca.pem", dir); snprintf(fname, sizeof(fname), "%s/ca.pem", dir);
ret = cmd_dl_osu_ca(ctx, pps_fname, fname); ret = cmd_dl_osu_ca(ctx, pps_fname, fname);
snprintf(fname, sizeof(fname), "%s/polupd-ca.pem", dir); snprintf(fname, sizeof(fname), "%s/polupd-ca.pem", dir);
cmd_dl_polupd_ca(ctx, pps_fname, fname); ret1 = cmd_dl_polupd_ca(ctx, pps_fname, fname);
if (ret == 0 && ret1 == -1)
ret = -1;
snprintf(fname, sizeof(fname), "%s/aaa-ca.pem", dir); snprintf(fname, sizeof(fname), "%s/aaa-ca.pem", dir);
cmd_dl_aaa_ca(ctx, pps_fname, fname); ret1 = cmd_dl_aaa_ca(ctx, pps_fname, fname);
if (ret == 0 && ret1 == -1)
ret = -1;
os_free(dir); os_free(dir);