From f185da94f628e4384607703928e26fcf2f34fa7a Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 11 Dec 2017 14:24:14 +0100 Subject: 802-11-x: support for PWD EAP method --- src/settings/security8021xsetting.cpp | 7 ++++++- src/settings/security8021xsetting.h | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/settings/security8021xsetting.cpp b/src/settings/security8021xsetting.cpp index 0fc9bde..38323b0 100644 --- a/src/settings/security8021xsetting.cpp +++ b/src/settings/security8021xsetting.cpp @@ -569,7 +569,8 @@ QStringList NetworkManager::Security8021xSetting::needSecrets(bool requestNew) c !privateKeyPasswordFlags().testFlag(NotRequired)) { secrets << QLatin1String(NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD); } else if ((eapMethods().contains(EapMethodTtls) || eapMethods().contains(EapMethodPeap) || - eapMethods().contains(EapMethodLeap) || eapMethods().contains(EapMethodFast)) && + eapMethods().contains(EapMethodLeap) || eapMethods().contains(EapMethodFast) || + eapMethods().contains(EapMethodPwd)) && (password().isEmpty() || requestNew) && !passwordFlags().testFlag(NotRequired)) { secrets << QLatin1String(NM_SETTING_802_1X_PASSWORD); secrets << QLatin1String(NM_SETTING_802_1X_PASSWORD_RAW); @@ -655,6 +656,8 @@ void NetworkManager::Security8021xSetting::fromMap(const QVariantMap &setting) eapMethods << EapMethodSim; } else if (method == "fast") { eapMethods << EapMethodFast; + } else if (method == "pwd") { + eapMethods << EapMethodPwd; } } @@ -862,6 +865,8 @@ QVariantMap NetworkManager::Security8021xSetting::toMap() const methods << "sim"; } else if (method == EapMethodFast) { methods << "fast"; + } else if (method == EapMethodPwd) { + methods << "pwd"; } } diff --git a/src/settings/security8021xsetting.h b/src/settings/security8021xsetting.h index 8b1f5a3..5289771 100644 --- a/src/settings/security8021xsetting.h +++ b/src/settings/security8021xsetting.h @@ -37,7 +37,7 @@ class NETWORKMANAGERQT_EXPORT Security8021xSetting : public Setting public: typedef QSharedPointer Ptr; typedef QList List; - enum EapMethod {EapMethodUnknown = 0, EapMethodLeap, EapMethodMd5, EapMethodTls, EapMethodPeap, EapMethodTtls, EapMethodSim, EapMethodFast}; + enum EapMethod {EapMethodUnknown = 0, EapMethodLeap, EapMethodMd5, EapMethodTls, EapMethodPeap, EapMethodTtls, EapMethodSim, EapMethodFast, EapMethodPwd}; enum PeapVersion {PeapVersionUnknown = -1, PeapVersionZero, PeapVersionOne}; enum PeapLabel {PeapLabelUnknown = 0, PeapLabelForce}; enum FastProvisioning {FastProvisioningUnknown = -1, FastProvisioningDisabled, FastProvisioningAllowUnauthenticated, FastProvisioningAllowAuthenticated, FastProvisioningAllowBoth}; -- cgit v0.11.2