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

libnm: hide API for generic handling of secrets

Browse source 
The functions nm_setting_clear_secrets(),
nm_setting_clear_secrets_with_flags(), and nm_setting_need_secrets()
are not used outside of libnm-core. Remove them from public API.

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-10-07 08:46:36 +02:00
parent 978724da96
commit e5194fd346
5 changed files with 11 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnm-core/nm-connection.c
View file

@ -1104,7 +1104,7 @@ nm_connection_need_secrets (NMConnection *connection,
GPtrArray *secrets;
setting = NM_SETTING (iter->data);
secrets = nm_setting_need_secrets (setting);
secrets = _nm_setting_need_secrets (setting);
if (secrets) {
if (hints)
*hints = secrets;

2
libnm-core/nm-setting-private.h
View file

@ -158,4 +158,6 @@ void _nm_setting_class_transform_property (NMSettingClass *setting_class,
NMSettingPropertyTransformToFunc to_dbus,
NMSettingPropertyTransformFromFunc from_dbus);
GPtrArray *_nm_setting_need_secrets (NMSetting *setting);
#endif /* NM_SETTING_PRIVATE_H */

26
libnm-core/nm-setting.c
View file

@ -1287,19 +1287,15 @@ nm_setting_enumerate_values (NMSetting *setting,
}
/**
* nm_setting_clear_secrets:
* _nm_setting_clear_secrets:
* @setting: the #NMSetting
*
* Resets and clears any secrets in the setting. Secrets should be added to the
* setting only when needed, and cleared immediately after use to prevent
* leakage of information.
*
* Returns: %TRUE if the setting changed at all
**/
void
nm_setting_clear_secrets (NMSetting *setting)
{
_nm_setting_clear_secrets (setting);
}
gboolean
_nm_setting_clear_secrets (NMSetting *setting)
{
@ -1366,22 +1362,16 @@ clear_secrets_with_flags (NMSetting *setting,
}
/**
* nm_setting_clear_secrets_with_flags:
* _nm_setting_clear_secrets_with_flags:
* @setting: the #NMSetting
* @func: (scope call): function to be called to determine whether a
* specific secret should be cleared or not
* @user_data: caller-supplied data passed to @func
*
* Clears and frees secrets determined by @func.
*
* Returns: %TRUE if the setting changed at all
**/
void
nm_setting_clear_secrets_with_flags (NMSetting *setting,
NMSettingClearSecretsWithFlagsFn func,
gpointer user_data)
{
_nm_setting_clear_secrets_with_flags (setting, func, user_data);
}
gboolean
_nm_setting_clear_secrets_with_flags (NMSetting *setting,
NMSettingClearSecretsWithFlagsFn func,
@ -1411,7 +1401,7 @@ _nm_setting_clear_secrets_with_flags (NMSetting *setting,
}
/**
* nm_setting_need_secrets:
* _nm_setting_need_secrets:
* @setting: the #NMSetting
*
* Returns an array of property names for each secret which may be required
@ -1425,7 +1415,7 @@ _nm_setting_clear_secrets_with_flags (NMSetting *setting,
* free the elements.
**/
GPtrArray *
nm_setting_need_secrets (NMSetting *setting)
_nm_setting_need_secrets (NMSetting *setting)
{
GPtrArray *secrets = NULL;

8
libnm-core/nm-setting.h
View file

@ -269,14 +269,6 @@ void nm_setting_enumerate_values (NMSetting *setting,
char *nm_setting_to_string (NMSetting *setting);
/* Secrets */
void nm_setting_clear_secrets (NMSetting *setting);
void nm_setting_clear_secrets_with_flags (NMSetting *setting,
NMSettingClearSecretsWithFlagsFn func,
gpointer user_data);
GPtrArray *nm_setting_need_secrets (NMSetting *setting);
gboolean nm_setting_get_secret_flags (NMSetting *setting,
const char *secret_name,
NMSettingSecretFlags *out_flags,

3
libnm/libnm.ver
View file

@ -521,8 +521,6 @@ global:
nm_setting_cdma_get_type;
nm_setting_cdma_get_username;
nm_setting_cdma_new;
nm_setting_clear_secrets;
nm_setting_clear_secrets_with_flags;
nm_setting_compare;
nm_setting_compare_flags_get_type;
nm_setting_connection_add_permission;
@ -689,7 +687,6 @@ global:
nm_setting_ip6_config_remove_route_by_value;
nm_setting_lookup_type;
nm_setting_lookup_type_by_quark;
nm_setting_need_secrets;
nm_setting_olpc_mesh_error_get_type;
nm_setting_olpc_mesh_error_quark;
nm_setting_olpc_mesh_get_channel;