fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-02 07:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: add property type for 802-1x certificate properties (pt4)

Browse source
This commit is contained in:
Thomas Haller 2019-03-19 10:16:43 +01:00
parent fe390556ab
commit 8aa19e3f2c
1 changed files with 4 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
clients/common/nm-meta-setting-desc.c
View file

@ -2061,6 +2061,9 @@ _get_fcn_cert_8021x (ARGS_GET_FCN)
switch (vtable->scheme_func (s_8021X)) {
case NM_SETTING_802_1X_CK_SCHEME_BLOB:
if ( vtable->is_secret
&& !NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_SHOW_SECRETS))
return _get_text_hidden (get_type);
str = bytes_to_string (vtable->blob_func (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_PATH:
@ -2142,35 +2145,6 @@ _get_fcn_gobject_bytes (ARGS_GET_FCN)
RETURN_STR_TO_FREE (str);
}
static gconstpointer
_get_fcn_802_1x_private_key (ARGS_GET_FCN)
{
NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
char *key_str = NULL;
RETURN_UNSUPPORTED_GET_TYPE ();
switch (nm_setting_802_1x_get_private_key_scheme (s_8021X)) {
case NM_SETTING_802_1X_CK_SCHEME_BLOB:
if (NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_SHOW_SECRETS))
key_str = bytes_to_string (nm_setting_802_1x_get_private_key_blob (s_8021X));
else
return _get_text_hidden (get_type);
break;
case NM_SETTING_802_1X_CK_SCHEME_PATH:
key_str = g_strdup (nm_setting_802_1x_get_private_key_path (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
key_str = g_strdup (nm_setting_802_1x_get_private_key_uri (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
break;
}
NM_SET_OUT (out_is_default, !key_str || !key_str[0]);
RETURN_STR_TO_FREE (key_str);
}
static gconstpointer
_get_fcn_802_1x_phase2_private_key (ARGS_GET_FCN)
{
@ -4903,10 +4877,7 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
" [file://]<file path> [<password>]\n"
"Note that nmcli does not support specifying private key as raw blob data.\n"
"Example: /home/cimrman/jara-priv-key Dardanely\n"),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_802_1x_private_key,
.set_fcn = _set_fcn_cert_8021x,
),
.property_type = &_pt_cert_8021x,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (cert_8021x,
.scheme_type = NM_SETTING_802_1X_SCHEME_TYPE_PRIVATE_KEY,
),