fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 17:30:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm/crypto: mark nm_crypto_make_des_aes_key() as test-only function

Browse source
This commit is contained in:
Thomas Haller 2018-09-03 17:44:11 +02:00
parent 116ee7a4bf
commit fa4f27372c
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libnm-core/nm-crypto.c
View file

@ -467,12 +467,12 @@ _nmtst_convert_iv (const char *src,
}
guint8 *
nm_crypto_make_des_aes_key (NMCryptoCipherType cipher,
const guint8 *salt,
gsize salt_len,
const char *password,
gsize *out_len,
GError **error)
nmtst_crypto_make_des_aes_key (NMCryptoCipherType cipher,
const guint8 *salt,
gsize salt_len,
const char *password,
gsize *out_len,
GError **error)
{
guint8 *key;
const NMCryptoCipherInfo *cipher_info;
@ -537,7 +537,7 @@ _nmtst_decrypt_key (NMCryptoCipherType cipher,
}
/* Convert the password and IV into a DES or AES key */
key.bin = nm_crypto_make_des_aes_key (cipher, bin_iv.bin, bin_iv.len, password, &key.len, error);
key.bin = nmtst_crypto_make_des_aes_key (cipher, bin_iv.bin, bin_iv.len, password, &key.len, error);
if (!key.bin || !key.len)
return FALSE;
@ -969,7 +969,7 @@ nmtst_crypto_rsa_key_encrypt (const guint8 *data,
if (!nm_crypto_randomize (salt, sizeof (salt), error))
return NULL;
key.bin = nm_crypto_make_des_aes_key (NM_CRYPTO_CIPHER_DES_EDE3_CBC, salt, sizeof (salt), in_password, &key.len, NULL);
key.bin = nmtst_crypto_make_des_aes_key (NM_CRYPTO_CIPHER_DES_EDE3_CBC, salt, sizeof (salt), in_password, &key.len, NULL);
if (!key.bin)
g_return_val_if_reached (NULL);

14
libnm-core/nm-crypto.h
View file

@ -92,13 +92,6 @@ void nm_crypto_md5_hash (const guint8 *salt,
guint8 *buffer,
gsize buflen);
guint8 *nm_crypto_make_des_aes_key (NMCryptoCipherType cipher,
const guint8 *salt,
gsize salt_len,
const char *password,
gsize *out_len,
GError **error);
gboolean nm_crypto_randomize (void *buffer, gsize buffer_len, GError **error);
/*****************************************************************************/
@ -120,6 +113,13 @@ GBytes *nmtst_crypto_rsa_key_encrypt (const guint8 *data,
char **out_password,
GError **error);
guint8 *nmtst_crypto_make_des_aes_key (NMCryptoCipherType cipher,
const guint8 *salt,
gsize salt_len,
const char *password,
gsize *out_len,
GError **error);
/*****************************************************************************/
#endif /* __NM_CRYPTO_H__ */