diff options
Diffstat (limited to 'contrib/wpa/wpa_supplicant/eapol_test.c')
| -rw-r--r-- | contrib/wpa/wpa_supplicant/eapol_test.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/contrib/wpa/wpa_supplicant/eapol_test.c b/contrib/wpa/wpa_supplicant/eapol_test.c index 524724f19735..e256ac50eec4 100644 --- a/contrib/wpa/wpa_supplicant/eapol_test.c +++ b/contrib/wpa/wpa_supplicant/eapol_test.c @@ -439,7 +439,7 @@ static void eapol_sm_cb(struct eapol_sm *eapol, enum eapol_supp_result result, static void eapol_test_write_cert(FILE *f, const char *subject, const struct wpabuf *cert) { - unsigned char *encoded; + char *encoded; encoded = base64_encode(wpabuf_head(cert), wpabuf_len(cert), NULL); if (encoded == NULL) @@ -644,9 +644,9 @@ static int test_eapol(struct eapol_test_data *e, struct wpa_supplicant *wpa_s, eapol_sm_register_scard_ctx(wpa_s->eapol, wpa_s->scard); - eapol_sm_notify_portValid(wpa_s->eapol, FALSE); + eapol_sm_notify_portValid(wpa_s->eapol, false); /* 802.1X::portControl = Auto */ - eapol_sm_notify_portEnabled(wpa_s->eapol, TRUE); + eapol_sm_notify_portEnabled(wpa_s->eapol, true); return 0; } @@ -674,10 +674,8 @@ static void test_eapol_clean(struct eapol_test_data *e, os_free(e->radius_conf); e->radius_conf = NULL; scard_deinit(wpa_s->scard); - if (wpa_s->ctrl_iface) { - wpa_supplicant_ctrl_iface_deinit(wpa_s->ctrl_iface); - wpa_s->ctrl_iface = NULL; - } + wpa_supplicant_ctrl_iface_deinit(wpa_s, wpa_s->ctrl_iface); + wpa_s->ctrl_iface = NULL; ext_password_deinit(wpa_s->ext_pw); wpa_s->ext_pw = NULL; @@ -1025,6 +1023,7 @@ static void wpa_init_conf(struct eapol_test_data *e, *pos++ = a[1]; *pos++ = a[2]; *pos++ = a[3]; + as->addr.af = AF_INET; } #else /* CONFIG_NATIVE_WINDOWS or CONFIG_ANSI_C_EXTRA */ if (hostapd_parse_ip_addr(authsrv, &as->addr) < 0) { @@ -1390,7 +1389,7 @@ int main(int argc, char *argv[]) eapol_test.ctrl_iface = 1; break; case 'v': - printf("eapol_test v" VERSION_STR "\n"); + printf("eapol_test v%s\n", VERSION_STR); return 0; case 'W': wait_for_monitor++; |