system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 18:54:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libnm: no longer use "nm-utils.h" from "nm-crypto.c"

Browse source 
The goal is to make "nm-crypto.c" independent of libnm-core.
This commit is contained in:
Thomas Haller 2022-03-18 20:35:54 +01:00
parent 526a05d6f2
commit 34b4496028
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libnm-core-impl/nm-crypto.c
View file

@ -16,7 +16,6 @@
#include "libnm-glib-aux/nm-io-utils.h"
#include "nm-crypto-impl.h"
#include "nm-utils.h"
#include "nm-errors.h"
#define PEM_RSA_KEY_BEGIN "-----BEGIN RSA PRIVATE KEY-----"
@ -965,7 +964,7 @@ nmtst_crypto_rsa_key_encrypt(const guint8 *data,
if (!nm_crypto_randomize(pw_buf.bin, pw_buf.len, error))
return NULL;
tmp_password = nm_utils_bin2hexstr(pw_buf.bin, pw_buf.len, -1);
tmp_password = _nm_utils_bin2hexstr(pw_buf.bin, pw_buf.len, -1);
in_password = tmp_password;
}
@ -1009,7 +1008,7 @@ nmtst_crypto_rsa_key_encrypt(const guint8 *data,
pem,
g_strdup_printf("DEK-Info: %s,",
nm_crypto_cipher_get_info(NM_CRYPTO_CIPHER_DES_EDE3_CBC)->name));
g_ptr_array_add(pem, nm_utils_bin2hexstr(salt, sizeof(salt), sizeof(salt) * 2));
g_ptr_array_add(pem, _nm_utils_bin2hexstr(salt, sizeof(salt), sizeof(salt) * 2));
g_ptr_array_add(pem, g_strdup("\n\n"));
/* Convert the encrypted key to a base64 string */