Ticket #8850: 0002-eap-Drop-802_1X-naming.-Use-EAP.patch

File 0002-eap-Drop-802_1X-naming.-Use-EAP.patch, 2.0 KB (added by kallisti5, 11 years ago)

wpa_supplicant change v1

  • wpa_supplicant/main_haiku.cpp 

    From 190ede733713d2919d18f60795ad8017d4f1ec3d Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Wed, 17 Jul 2013 17:21:19 +0000
Subject: [PATCH 2/4] eap: Drop 802_1X naming. Use EAP

* Could conflict with another wpa_supplicant setting.
---
 wpa_supplicant/main_haiku.cpp |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/wpa_supplicant/main_haiku.cpp b/wpa_supplicant/main_haiku.cpp
index 2ab6ef7..0f3cf1e 100644
    a b WPASupplicantApp::_JoinNetwork(BMessage *message)  
    460460        return status;
    461461
    462462    uint32 encapMode = B_NETWORK_ENCAP_NONE;
    463     if (authMode == B_NETWORK_AUTHENTICATION_802_1X)
     463    if (authMode == B_NETWORK_AUTHENTICATION_EAP)
    464464        message->FindUInt32("encapsulation", &encapMode);
    465465
    466466    const char *username = NULL;
    … … WPASupplicantApp::_JoinNetwork(BMessage *message)  
    502502        if (result == 0)
    503503            result = wpa_config_set(network, "proto", "WPA RSN", 2);
    504504        if (result == 0) {
    505             if (authMode == B_NETWORK_AUTHENTICATION_802_1X)
    506                 result = wpa_config_set(network, "key_mgmt", "WPA-EAP", 3);
    507             else
    508                 result = wpa_config_set(network, "key_mgmt", "WPA-PSK", 3);
     505            switch (authMode) {
     506                case B_NETWORK_AUTHENTICATION_WPA:
     507                case B_NETWORK_AUTHENTICATION_WPA2:
     508                default:
     509                    result = wpa_config_set(network, "key_mgmt", "WPA-PSK", 3);
     510                    break;
     511                case B_NETWORK_AUTHENTICATION_EAP:
     512                    result = wpa_config_set(network, "key_mgmt", "WPA-EAP", 3);
     513                    break;
     514            }
    509515        }
    510516        if (result == 0)
    511517            result = wpa_config_set(network, "pairwise", "CCMP TKIP NONE", 4);
    … … WPASupplicantApp::_JoinNetwork(BMessage *message)  
    546552
    547553            if (result == 0)
    548554                result = wpa_config_set(network, "wep_tx_keyidx", "0", 9);
    549         } else if (authMode == B_NETWORK_AUTHENTICATION_802_1X) {
     555        } else if (authMode == B_NETWORK_AUTHENTICATION_EAP) {
    550556            // EAP
    551557            value = "\"";
    552558            value += password;