diff --git a/src/common/dpp.c b/src/common/dpp.c index 06e70a105..528bdb4a2 100644 --- a/src/common/dpp.c +++ b/src/common/dpp.c @@ -564,6 +564,18 @@ void dpp_bootstrap_info_free(struct dpp_bootstrap_info *info) } +const char * dpp_bootstrap_type_txt(enum dpp_bootstrap_type type) +{ + switch (type) { + case DPP_BOOTSTRAP_QR_CODE: + return "QRCODE"; + case DPP_BOOTSTRAP_PKEX: + return "PKEX"; + } + return "??"; +} + + static int dpp_uri_valid_info(const char *info) { while (*info) { diff --git a/src/common/dpp.h b/src/common/dpp.h index d68cd76b5..8aa78c51c 100644 --- a/src/common/dpp.h +++ b/src/common/dpp.h @@ -210,6 +210,7 @@ struct dpp_introduction { }; void dpp_bootstrap_info_free(struct dpp_bootstrap_info *info); +const char * dpp_bootstrap_type_txt(enum dpp_bootstrap_type type); int dpp_bootstrap_key_hash(struct dpp_bootstrap_info *bi); int dpp_parse_uri_chan_list(struct dpp_bootstrap_info *bi, const char *chan_list); diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c index 74233eb23..6361b17dc 100644 --- a/wpa_supplicant/dpp_supplicant.c +++ b/wpa_supplicant/dpp_supplicant.c @@ -278,18 +278,6 @@ const char * wpas_dpp_bootstrap_get_uri(struct wpa_supplicant *wpa_s, } -static const char * wpas_dpp_bootstrap_type(enum dpp_bootstrap_type type) -{ - switch (type) { - case DPP_BOOTSTRAP_QR_CODE: - return "QRCODE"; - case DPP_BOOTSTRAP_PKEX: - return "PKEX"; - } - return "??"; -} - - int wpas_dpp_bootstrap_info(struct wpa_supplicant *wpa_s, int id, char *reply, int reply_size) { @@ -303,7 +291,7 @@ int wpas_dpp_bootstrap_info(struct wpa_supplicant *wpa_s, int id, "info=%s\n" "num_freq=%u\n" "curve=%s\n", - wpas_dpp_bootstrap_type(bi->type), + dpp_bootstrap_type_txt(bi->type), MAC2STR(bi->mac_addr), bi->info ? bi->info : "", bi->num_freq,