d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit was generated by cvs2svn to compensate for changes in r157181,

Browse Source 
which included commits to RCS files with non-trunk default branches.
This commit is contained in:
Sam Leffler 2006-03-27 18:15:24 +00:00
commit ad90494725
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=157182
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/hostapd/config.c
View File

@ -29,6 +29,7 @@
#include "sha1.h"
#include "eap.h"
#include "radius_client.h"
#include "ieee802_1x.h" /* XXX for EAPOL_VERSION */
static struct hostapd_config *hostapd_config_defaults(void)
@ -60,6 +61,7 @@ static struct hostapd_config *hostapd_config_defaults(void)
conf->logger_stdout = (unsigned int) -1;
conf->auth_algs = HOSTAPD_AUTH_OPEN | HOSTAPD_AUTH_SHARED_KEY;
conf->eapol_version = EAPOL_VERSION; /* NB: default version */
conf->wpa_group_rekey = 600;
conf->wpa_gmk_rekey = 86400;
@ -855,6 +857,17 @@ struct hostapd_config * hostapd_config_read(const char *fname)
}
} else if (strcmp(buf, "eapol_key_index_workaround") == 0) {
conf->eapol_key_index_workaround = atoi(pos);
} else if (strcmp(buf, "eapol_version") == 0) {
conf->eapol_version = atoi(pos);
if (conf->eapol_version < 1 ||
conf->eapol_version > 2) {
printf("Line %d: invalid EAPOL "
"version (%d): '%s'.\n",
line, conf->eapol_version, pos);
errors++;
} else
wpa_printf(MSG_DEBUG, "eapol_version=%d",
conf->eapol_version);
#ifdef CONFIG_IAPP
} else if (strcmp(buf, "iapp_interface") == 0) {
conf->ieee802_11f = 1;

1
contrib/hostapd/config.h
View File

@ -73,6 +73,7 @@ struct hostapd_config {
* EAP Request-Identity */
size_t eap_req_id_text_len;
int eapol_key_index_workaround;
int eapol_version;
size_t default_wep_key_len;
int individual_wep_key_len;

8
contrib/hostapd/hostapd.conf
View File

@ -106,6 +106,14 @@ auth_algs=3
# Require IEEE 802.1X authorization
#ieee8021x=1
# IEEE 802.1X/EAPOL version
# hostapd is implemented based on IEEE Std 802.1X-2004 which defines EAPOL
# version 2. However, there are some clients that do not handle
# the new version number correctly (they seem to drop the frames completely).
# In order to make hostapd interoperate with these clients, the version number
# can be set to the older version (1) with this configuration value.
#eapol_version=2
# Optional displayable message sent with EAP Request-Identity. The first \0
# in this string will be converted to ASCII-0 (nul). This can be used to
# separate network info (comma separated list of attribute=value pairs); see,