diff options
| author | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:39 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:39 +0200 |
| commit | 543d05fc6d12cc608dc37ae97d4843431c6de4a8 (patch) | |
| tree | def16257d58256bc116737bdc04edce693a656de /libnm-util/nm-utils.h | |
| parent | 73f59c42ef878adf32efe8c7c4cb0d50ea2d04a1 (diff) | |
| parent | 7f1d08cf21e97f5e60d4636bb1e6c287c34ee2df (diff) | |
Merge tag 'upstream/0.9.5.96' into experimental
Upstream version 0.9.5.96
Diffstat (limited to 'libnm-util/nm-utils.h')
| -rw-r--r-- | libnm-util/nm-utils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libnm-util/nm-utils.h b/libnm-util/nm-utils.h index 7bc536ac..dd29230b 100644 --- a/libnm-util/nm-utils.h +++ b/libnm-util/nm-utils.h @@ -20,7 +20,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2005 - 2011 Red Hat, Inc. + * (C) Copyright 2005 - 2012 Red Hat, Inc. */ #ifndef NM_UTILS_H @@ -113,6 +113,7 @@ GByteArray *nm_utils_rsa_key_encrypt (const GByteArray *data, const char *in_password, char **out_password, GError **error); +gboolean nm_utils_file_is_pkcs12 (const char *filename); guint32 nm_utils_wifi_freq_to_channel (guint32 freq); guint32 nm_utils_wifi_channel_to_freq (guint32 channel, const char *band); |