mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-03-12 08:50:36 +01:00
From the files under "shared/nm-utils" we build an internal library
that provides glib-based helper utilities.
Move the files of that basic library to a new subdirectory
"shared/nm-glib-aux" and rename the helper library "libnm-core-base.la"
to "libnm-glib-aux.la".
Reasons:
- the name "utils" is overused in our code-base. Everything's an
"utils". Give this thing a more distinct name.
- there were additional files under "shared/nm-utils", which are not
part of this internal library "libnm-utils-base.la". All the files
that are part of this library should be together in the same
directory, but files that are not, should not be there.
- the new name should better convey what this library is and what is isn't:
it's a set of utilities and helper functions that extend glib with
funcitonality that we commonly need.
There are still some files left under "shared/nm-utils". They have less
a unifying propose to be in their own directory, so I leave them there
for now. But at least they are separate from "shared/nm-glib-aux",
which has a very clear purpose.
(cherry picked from commit 80db06f768)
178 lines
4.5 KiB
C
178 lines
4.5 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/* NetworkManager -- Network link manager
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
* Boston, MA 02110-1301 USA.
|
|
*
|
|
* (C) Copyright 2018 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef __NM_SECRET_UTILS_H__
|
|
#define __NM_SECRET_UTILS_H__
|
|
|
|
#include "nm-macros-internal.h"
|
|
|
|
/*****************************************************************************/
|
|
|
|
void nm_explicit_bzero (void *s, gsize n);
|
|
|
|
/*****************************************************************************/
|
|
|
|
char *nm_secret_strchomp (char *secret);
|
|
|
|
/*****************************************************************************/
|
|
|
|
static inline void
|
|
nm_free_secret (char *secret)
|
|
{
|
|
if (secret) {
|
|
nm_explicit_bzero (secret, strlen (secret));
|
|
g_free (secret);
|
|
}
|
|
}
|
|
|
|
NM_AUTO_DEFINE_FCN0 (char *, _nm_auto_free_secret, nm_free_secret)
|
|
/**
|
|
* nm_auto_free_secret:
|
|
*
|
|
* Call g_free() on a variable location when it goes out of scope.
|
|
* Also, previously, calls memset(loc, 0, strlen(loc)) to clear out
|
|
* the secret.
|
|
*/
|
|
#define nm_auto_free_secret nm_auto(_nm_auto_free_secret)
|
|
|
|
/*****************************************************************************/
|
|
|
|
GBytes *nm_secret_copy_to_gbytes (gconstpointer mem, gsize mem_len);
|
|
|
|
/*****************************************************************************/
|
|
|
|
/* NMSecretPtr is a pair of malloc'ed data pointer and the length of the
|
|
* data. The purpose is to use it in combination with nm_auto_clear_secret_ptr
|
|
* which ensures that the data pointer (with all len bytes) is cleared upon
|
|
* cleanup. */
|
|
typedef struct {
|
|
gsize len;
|
|
|
|
/* the data pointer. This pointer must be allocated with malloc (at least
|
|
* when used with nm_secret_ptr_clear()). */
|
|
union {
|
|
char *str;
|
|
void *ptr;
|
|
guint8 *bin;
|
|
};
|
|
} NMSecretPtr;
|
|
|
|
static inline void
|
|
nm_secret_ptr_bzero (NMSecretPtr *secret)
|
|
{
|
|
if (secret) {
|
|
if (secret->len > 0) {
|
|
if (secret->ptr)
|
|
nm_explicit_bzero (secret->ptr, secret->len);
|
|
}
|
|
}
|
|
}
|
|
|
|
#define nm_auto_bzero_secret_ptr nm_auto(nm_secret_ptr_bzero)
|
|
|
|
static inline void
|
|
nm_secret_ptr_clear (NMSecretPtr *secret)
|
|
{
|
|
if (secret) {
|
|
if (secret->len > 0) {
|
|
if (secret->ptr)
|
|
nm_explicit_bzero (secret->ptr, secret->len);
|
|
secret->len = 0;
|
|
}
|
|
nm_clear_g_free (&secret->ptr);
|
|
}
|
|
}
|
|
|
|
#define nm_auto_clear_secret_ptr nm_auto(nm_secret_ptr_clear)
|
|
|
|
#define NM_SECRET_PTR_INIT() \
|
|
((const NMSecretPtr) { \
|
|
.len = 0, \
|
|
.ptr = NULL, \
|
|
})
|
|
|
|
#define NM_SECRET_PTR_STATIC(_len) \
|
|
((const NMSecretPtr) { \
|
|
.len = _len, \
|
|
.ptr = ((guint8 [_len]) { }), \
|
|
})
|
|
|
|
#define NM_SECRET_PTR_ARRAY(_arr) \
|
|
((const NMSecretPtr) { \
|
|
.len = G_N_ELEMENTS (_arr) * sizeof ((_arr)[0]), \
|
|
.ptr = &((_arr)[0]), \
|
|
})
|
|
|
|
static inline void
|
|
nm_secret_ptr_clear_static (const NMSecretPtr *secret)
|
|
{
|
|
if (secret) {
|
|
if (secret->len > 0) {
|
|
nm_assert (secret->ptr);
|
|
nm_explicit_bzero (secret->ptr, secret->len);
|
|
}
|
|
}
|
|
}
|
|
|
|
#define nm_auto_clear_static_secret_ptr nm_auto(nm_secret_ptr_clear_static)
|
|
|
|
static inline void
|
|
nm_secret_ptr_move (NMSecretPtr *dst, NMSecretPtr *src)
|
|
{
|
|
if (dst && dst != src) {
|
|
*dst = *src;
|
|
src->len = 0;
|
|
src->ptr = NULL;
|
|
}
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
|
|
typedef struct {
|
|
const gsize len;
|
|
union {
|
|
char str[0];
|
|
guint8 bin[0];
|
|
};
|
|
} NMSecretBuf;
|
|
|
|
static inline void
|
|
_nm_auto_free_secret_buf (NMSecretBuf **ptr)
|
|
{
|
|
NMSecretBuf *b = *ptr;
|
|
|
|
if (b) {
|
|
nm_assert (b->len > 0);
|
|
nm_explicit_bzero (b->bin, b->len);
|
|
g_free (b);
|
|
}
|
|
}
|
|
#define nm_auto_free_secret_buf nm_auto(_nm_auto_free_secret_buf)
|
|
|
|
NMSecretBuf *nm_secret_buf_new (gsize len);
|
|
|
|
GBytes *nm_secret_buf_to_gbytes_take (NMSecretBuf *secret, gssize actual_len);
|
|
|
|
/*****************************************************************************/
|
|
|
|
gboolean nm_utils_memeqzero_secret (gconstpointer data, gsize length);
|
|
|
|
#endif /* __NM_SECRET_UTILS_H__ */
|