whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QCoreWlanEngine: Remove calls to deprecated API in macOS 

Change-Id: I606c865e980b8ab8a8027c4b6d322c0bbd05c992
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Reviewed-by: Lorn Potter <lorn.potter@canonical.com>
bb10
Gabriel de Dietrich 2016-06-29 16:33:21 -07:00 committed by Timur Pocheptsov
parent 2e176e3d10
commit d737a8ed54
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/bearer/corewlan/qcorewlanengine.mm
View File

@ -502,27 +502,27 @@ void QCoreWlanEngine::connectToId(const QString &id)
if(!err) {
for (CWNetwork *apNetwork in scanSet) {
CFDataRef ssidData = (CFDataRef)[apNetwork ssidData];
NSData *ssidData = [apNetwork ssidData];
bool result = false;
SecIdentityRef identity = 0;
// Check first whether we require IEEE 802.1X authentication for the wanted SSID
if (CWKeychainCopyEAPIdentity(ssidData, &identity) == errSecSuccess) {
CFStringRef username = 0;
CFStringRef password = 0;
if (CWKeychainCopyEAPUsernameAndPassword(ssidData, &username, &password) == errSecSuccess) {
if (CWKeychainCopyWiFiEAPIdentity(kCWKeychainDomainSystem, ssidData, &identity) == errSecSuccess) {
NSString *username = nil;
NSString *password = nil;
if (CWKeychainFindWiFiEAPUsernameAndPassword(kCWKeychainDomainSystem, ssidData, &username, &password) == errSecSuccess) {
result = [wifiInterface associateToEnterpriseNetwork:apNetwork
identity:identity username:(NSString *)username password:(NSString *)password
error:&err];
CFRelease(username);
CFRelease(password);
[username release];
[password release];
}
CFRelease(identity);
} else {
CFStringRef password = 0;
if (CWKeychainCopyPassword(ssidData, &password) == errSecSuccess) {
NSString *password = nil;
if (CWKeychainFindWiFiPassword(kCWKeychainDomainSystem, ssidData, &password) == errSecSuccess) {
result = [wifiInterface associateToNetwork:apNetwork password:(NSString *)password error:&err];
CFRelease(password);
[password release];
}
}