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

Fix and work around some MinGW compilation issues

Browse source 
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-11-20 23:12:03 +02:00 committed by Jouni Malinen
parent 81cbc046fe
commit 461e3ebe43
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ap/hostapd.h
View file

@ -44,7 +44,9 @@ struct hapd_interfaces {
int global_ctrl_sock; int global_ctrl_sock;
char *global_iface_path; char *global_iface_path;
char *global_iface_name; char *global_iface_name;
#ifndef CONFIG_NATIVE_WINDOWS
gid_t ctrl_iface_group; gid_t ctrl_iface_group;
#endif /* CONFIG_NATIVE_WINDOWS */
struct hostapd_iface **iface; struct hostapd_iface **iface;
struct hostapd_dynamic_iface **dynamic_iface; struct hostapd_dynamic_iface **dynamic_iface;

7
src/crypto/tls_openssl.c
View file

@ -1136,6 +1136,7 @@ static int tls_match_altsubject(X509 *cert, const char *match)
} }
#ifndef CONFIG_NATIVE_WINDOWS
static int domain_suffix_match(const u8 *val, size_t len, const char *match) static int domain_suffix_match(const u8 *val, size_t len, const char *match)
{ {
size_t i, match_len; size_t i, match_len;
@ -1165,10 +1166,15 @@ static int domain_suffix_match(const u8 *val, size_t len, const char *match)
wpa_printf(MSG_DEBUG, "TLS: Reject due to incomplete label match"); wpa_printf(MSG_DEBUG, "TLS: Reject due to incomplete label match");
return 0; return 0;
} }
#endif /* CONFIG_NATIVE_WINDOWS */
static int tls_match_suffix(X509 *cert, const char *match) static int tls_match_suffix(X509 *cert, const char *match)
{ {
#ifdef CONFIG_NATIVE_WINDOWS
/* wincrypt.h has conflicting X509_NAME definition */
return -1;
#else /* CONFIG_NATIVE_WINDOWS */
GENERAL_NAME *gen; GENERAL_NAME *gen;
void *ext; void *ext;
int i; int i;
@ -1224,6 +1230,7 @@ static int tls_match_suffix(X509 *cert, const char *match)
wpa_printf(MSG_DEBUG, "TLS: No CommonName suffix match found"); wpa_printf(MSG_DEBUG, "TLS: No CommonName suffix match found");
return 0; return 0;
#endif /* CONFIG_NATIVE_WINDOWS */
} }