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

Remove useless NULL comparison for an array

Browse source 
Now that the TLS peer_cert information is provided as a full struct to
handler functions, the altsubject pointer shows up as an array and
causes static analyzers to warn about unnecessary NULL comparison. Get
rid of that comparison now that it is clearly not needed anymore.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-07-07 09:58:46 +03:00
parent cd803299ca
commit d3a035169b
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
wpa_supplicant/eapol_test.c
View file

@ -502,6 +502,7 @@ static void eapol_test_cert_cb(void *ctx, struct tls_cert_data *cert,
const char *cert_hash) const char *cert_hash)
{ {
struct eapol_test_data *e = ctx; struct eapol_test_data *e = ctx;
int i;
wpa_msg(e->wpa_s, MSG_INFO, WPA_EVENT_EAP_PEER_CERT wpa_msg(e->wpa_s, MSG_INFO, WPA_EVENT_EAP_PEER_CERT
"depth=%d subject='%s'%s%s", "depth=%d subject='%s'%s%s",
@ -528,14 +529,9 @@ static void eapol_test_cert_cb(void *ctx, struct tls_cert_data *cert,
cert->subject, cert->cert); cert->subject, cert->cert);
} }
if (cert->altsubject) { for (i = 0; i < cert->num_altsubject; i++)
int i; wpa_msg(e->wpa_s, MSG_INFO, WPA_EVENT_EAP_PEER_ALT
"depth=%d %s", cert->depth, cert->altsubject[i]);
for (i = 0; i < cert->num_altsubject; i++)
wpa_msg(e->wpa_s, MSG_INFO, WPA_EVENT_EAP_PEER_ALT
"depth=%d %s", cert->depth,
cert->altsubject[i]);
}
} }

13
wpa_supplicant/notify.c
View file

@ -791,6 +791,8 @@ void wpas_notify_certification(struct wpa_supplicant *wpa_s,
struct tls_cert_data *cert, struct tls_cert_data *cert,
const char *cert_hash) const char *cert_hash)
{ {
int i;
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_EAP_PEER_CERT wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_EAP_PEER_CERT
"depth=%d subject='%s'%s%s%s", "depth=%d subject='%s'%s%s%s",
cert->depth, cert->subject, cert_hash ? " hash=" : "", cert->depth, cert->subject, cert_hash ? " hash=" : "",
@ -812,14 +814,9 @@ void wpas_notify_certification(struct wpa_supplicant *wpa_s,
} }
} }
if (cert->altsubject) { for (i = 0; i < cert->num_altsubject; i++)
int i; wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_EAP_PEER_ALT
"depth=%d %s", cert->depth, cert->altsubject[i]);
for (i = 0; i < cert->num_altsubject; i++)
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_EAP_PEER_ALT
"depth=%d %s", cert->depth,
cert->altsubject[i]);
}
/* notify the new DBus API */ /* notify the new DBus API */
wpas_dbus_signal_certification(wpa_s, cert->depth, cert->subject, wpas_dbus_signal_certification(wpa_s, cert->depth, cert->subject,