DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

DPP: Remove C-sign-key expiry

Browse source 
This was removed in DPP tech spec v0.2.3.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2017-10-10 01:17:33 +03:00 • committed by Jouni Malinen
parent 6254045a51
commit c77e2ff096
9 changed files with 6 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/common/dpp.c
View file

@ -3156,19 +3156,6 @@ skip_groups:
wpa_printf(MSG_DEBUG, "DPP: Failed to build csign JWK");
goto fail;
}
if (auth->conf->csign_expiry) {
struct os_tm tm;
if (os_gmtime(auth->conf->csign_expiry, &tm) < 0) {
wpa_printf(MSG_DEBUG,
"DPP: Failed to generate expiry string");
goto fail;
}
wpabuf_printf(buf,
",\"expiry\":\"%04u-%02u-%02uT%02u:%02u:%02uZ\"",
tm.year, tm.month, tm.day,
tm.hour, tm.min, tm.sec);
}
wpabuf_put_str(buf, "}}");
@ -4078,18 +4065,6 @@ static int dpp_parse_cred_dpp(struct dpp_authentication *auth,
}
dpp_debug_print_key("DPP: Received C-sign-key", csign_pub);
token = json_get_member(cred, "expiry");
if (!token || token->type != JSON_STRING) {
wpa_printf(MSG_DEBUG,
"DPP: No expiry string found - C-sign-key does not expire");
} else {
wpa_printf(MSG_DEBUG, "DPP: expiry = %s", token->string);
if (dpp_key_expired(token->string, &auth->c_sign_key_expiry)) {
wpa_printf(MSG_DEBUG, "DPP: C-sign-key has expired");
goto fail;
}
}
token = json_get_member(cred, "signedConnector");
if (!token || token->type != JSON_STRING) {
wpa_printf(MSG_DEBUG, "DPP: No signedConnector string found");

2
src/common/dpp.h
View file

@ -178,7 +178,6 @@ struct dpp_authentication {
struct wpabuf *net_access_key;
os_time_t net_access_key_expiry;
struct wpabuf *c_sign_key;
os_time_t c_sign_key_expiry;
#ifdef CONFIG_TESTING_OPTIONS
char *config_obj_override;
char *discovery_override;
@ -194,7 +193,6 @@ struct dpp_configurator {
EVP_PKEY *csign;
char *kid;
const struct dpp_curve_params *curve;
os_time_t csign_expiry;
};
struct dpp_introduction {