diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-12-19 12:49:43 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-01-06 15:56:11 +0100 |
| commit | 234a72cb9163fdb051255b4b3f9a1408022e0600 (patch) | |
| tree | d1c7e6e184e3328acc31aa7e364ea85f2636aae5 | |
| parent | 34b4a0e5617c8ddaa536f75706d09a68f4d5396c (diff) | |
| download | NetworkManager-lr/pkcs11.tar.gz | |
supplicant: allow accessing certs and keys in PKCS#11 tokenslr/pkcs11
| -rw-r--r-- | src/supplicant/nm-supplicant-config.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/src/supplicant/nm-supplicant-config.c b/src/supplicant/nm-supplicant-config.c index 011d3d8658..ed534c132f 100644 --- a/src/supplicant/nm-supplicant-config.c +++ b/src/supplicant/nm-supplicant-config.c @@ -955,6 +955,11 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self, if (!add_string_val (self, path, "ca_cert", FALSE, FALSE, error)) return FALSE; break; + case NM_SETTING_802_1X_CK_SCHEME_PKCS11: + path = nm_setting_802_1x_get_ca_cert_uri (setting); + if (!add_string_val (self, path, "ca_cert", FALSE, FALSE, error)) + return FALSE; + break; default: break; } @@ -976,6 +981,11 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self, if (!add_string_val (self, path, "ca_cert2", FALSE, FALSE, error)) return FALSE; break; + case NM_SETTING_802_1X_CK_SCHEME_PKCS11: + path = nm_setting_802_1x_get_phase2_ca_cert_uri (setting); + if (!add_string_val (self, path, "ca_cert2", FALSE, FALSE, error)) + return FALSE; + break; default: break; } @@ -1018,6 +1028,12 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self, return FALSE; added = TRUE; break; + case NM_SETTING_802_1X_CK_SCHEME_PKCS11: + path = nm_setting_802_1x_get_private_key_uri (setting); + if (!add_string_val (self, path, "private_key", FALSE, FALSE, error)) + return FALSE; + added = TRUE; + break; default: break; } @@ -1055,6 +1071,11 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self, if (!add_string_val (self, path, "client_cert", FALSE, FALSE, error)) return FALSE; break; + case NM_SETTING_802_1X_CK_SCHEME_PKCS11: + path = nm_setting_802_1x_get_client_cert_uri (setting); + if (!add_string_val (self, path, "client_cert", FALSE, FALSE, error)) + return FALSE; + break; default: break; } @@ -1076,6 +1097,12 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self, return FALSE; added = TRUE; break; + case NM_SETTING_802_1X_CK_SCHEME_PKCS11: + path = nm_setting_802_1x_get_phase2_private_key_uri (setting); + if (!add_string_val (self, path, "private_key2", FALSE, FALSE, error)) + return FALSE; + added = TRUE; + break; default: break; } @@ -1113,6 +1140,11 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self, if (!add_string_val (self, path, "client_cert2", FALSE, FALSE, error)) return FALSE; break; + case NM_SETTING_802_1X_CK_SCHEME_PKCS11: + path = nm_setting_802_1x_get_phase2_client_cert_uri (setting); + if (!add_string_val (self, path, "client_cert2", FALSE, FALSE, error)) + return FALSE; + break; default: break; } |