diff options
Diffstat (limited to 'src/nm-core-utils.c')
| -rw-r--r-- | src/nm-core-utils.c | 49 |
1 files changed, 1 insertions, 48 deletions
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index 5e381cd314..b1a4cc25a2 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -2896,44 +2896,6 @@ nm_utils_secret_key_get (const guint8 **out_secret_key, return secret_key->is_good; } -static gboolean -_secret_key_get_opaque (guint32 salt /* number in host-order */, - char *out_hashed_key /* at least 41 bytes */) -{ - gboolean good_secret_key; - const guint8 *secret_key; - gsize key_len; - GChecksum *sum; - guint8 buf[20]; - gsize buf_size; - - /* returns the SHA1 sum of the secret-key in ASCII. Also, it includes - * a salt, so that one cannot obtain the secret-key from the hashed value. */ - - nm_assert (salt != 0); - nm_assert (out_hashed_key); - - salt = htons (salt); - - good_secret_key = nm_utils_secret_key_get (&secret_key, &key_len); - - sum = g_checksum_new (G_CHECKSUM_SHA1); - g_checksum_update (sum, (const guchar *) &salt, sizeof (salt)); - g_checksum_update (sum, (const guchar *) secret_key, key_len); - - buf_size = sizeof (buf); - g_checksum_get_digest (sum, buf, &buf_size); - nm_assert (buf_size == sizeof (buf)); - - g_checksum_free (sum); - - /* converting a buffer of 20 bytes to ascii (without delimiter) requires - * at least 41 bytes. @out_hashed_key must be this large. */ - _nm_utils_bin2str_full (buf, sizeof (buf), '\0', FALSE, out_hashed_key); - - return good_secret_key; -} - /*****************************************************************************/ const char * @@ -3219,7 +3181,6 @@ _stable_id_append (GString *str, NMUtilsStableType nm_utils_stable_id_parse (const char *stable_id, - const char *hostid, const char *deviceid, const char *bootid, const char *uuid, @@ -3227,7 +3188,6 @@ nm_utils_stable_id_parse (const char *stable_id, { gsize i, idx_start; GString *str = NULL; - char hostid_buf[41]; g_return_val_if_fail (out_generated, NM_UTILS_STABLE_TYPE_RANDOM); @@ -3298,14 +3258,7 @@ nm_utils_stable_id_parse (const char *stable_id, _stable_id_append (str, uuid); else if (CHECK_PREFIX ("${BOOT}")) _stable_id_append (str, bootid ?: nm_utils_get_boot_id ()); - else if (CHECK_PREFIX ("${HOST}")) { - if (!hostid) { - /* use an arbitrary, but fixed salt. */ - _secret_key_get_opaque (336556219u, hostid_buf); - hostid = hostid_buf; - } - _stable_id_append (str, hostid); - } else if (CHECK_PREFIX ("${DEVICE}")) + else if (CHECK_PREFIX ("${DEVICE}")) _stable_id_append (str, deviceid); else if (g_str_has_prefix (&stable_id[i], "${RANDOM}")) { /* RANDOM makes not so much sense for cloned-mac-address |