diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-01-29 19:29:56 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-02-17 14:48:47 +0100 |
| commit | 8131f3a9a983a2659d8423bb3cd48b42aa7d7ea1 (patch) | |
| tree | 91076e35f095277dedbb195878acafa58ef7b9ba /libnm-core/nm-setting-8021x.c | |
| parent | 21b04b6d93fde257b901081c0b4571e3553060d0 (diff) | |
| download | NetworkManager-8131f3a9a983a2659d8423bb3cd48b42aa7d7ea1.tar.gz | |
Revert "XXX wifi: ask for connection.p11-kit-remote when 802.1x needs it"
This reverts commit 94c8e043c6ad3f13f06413fa20fcafb4d287891c.
Diffstat (limited to 'libnm-core/nm-setting-8021x.c')
| -rw-r--r-- | libnm-core/nm-setting-8021x.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index c159ba6f43..e64769e42d 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -2784,20 +2784,6 @@ nm_setting_802_1x_get_phase2_private_key_format (NMSetting8021x *setting) return NM_SETTING_802_1X_CK_FORMAT_UNKNOWN; } -gboolean -nm_setting_802_1x_uses_pkcs11 (NMSetting8021x *setting) -{ - if ( nm_setting_802_1x_get_ca_cert_scheme (setting) == NM_SETTING_802_1X_CK_SCHEME_PKCS11 - || nm_setting_802_1x_get_client_cert_scheme (setting) == NM_SETTING_802_1X_CK_SCHEME_PKCS11 - || nm_setting_802_1x_get_phase2_ca_cert_scheme (setting) == NM_SETTING_802_1X_CK_SCHEME_PKCS11 - || nm_setting_802_1x_get_phase2_client_cert_scheme (setting) == NM_SETTING_802_1X_CK_SCHEME_PKCS11 - || nm_setting_802_1x_get_private_key_scheme (setting) == NM_SETTING_802_1X_CK_SCHEME_PKCS11 - || nm_setting_802_1x_get_phase2_private_key_scheme (setting) == NM_SETTING_802_1X_CK_SCHEME_PKCS11) - return TRUE; - - return FALSE; -} - static void need_secrets_password (NMSetting8021x *self, GPtrArray *secrets, |