libnm/crypto: rename crypto functions used for testing only

- drop nm_crypto_encrypt(). It's not actually used outside of
  "nm-crypto.c".
- rename internal _nm_crypto_*() functions that are only used
  in tests. It's so much nicer to visually recognize functions
  that are used for testing only.

5 files changed, 88 insertions, 110 deletions

diff --git a/libnm-core/nm-crypto-gnutls.c b/libnm-core/nm-crypto-gnutls.c
index 1cf48aeec9..dea578fd29 100644
--- a/libnm-core/nm-crypto-gnutls.c
+++ b/libnm-core/nm-crypto-gnutls.c
@@ -56,16 +56,16 @@ _nm_crypto_init (GError **error)
 }
 
 char *
-_nm_crypto_decrypt (const char *cipher,
-                    int key_type,
-                    const guint8 *data,
-                    gsize data_len,
-                    const char *iv,
-                    const gsize iv_len,
-                    const char *key,
-                    const gsize key_len,
-                    gsize *out_len,
-                    GError **error)
+_nmtst_crypto_decrypt (const char *cipher,
+                       int key_type,
+                       const guint8 *data,
+                       gsize data_len,
+                       const char *iv,
+                       const gsize iv_len,
+                       const char *key,
+                       const gsize key_len,
+                       gsize *out_len,
+                       GError **error)
 {
 	gnutls_cipher_hd_t ctx;
 	gnutls_datum_t key_dt, iv_dt;
@@ -171,15 +171,15 @@ out:
 }
 
 char *
-_nm_crypto_encrypt (const char *cipher,
-                    const guint8 *data,
-                    gsize data_len,
-                    const char *iv,
-                    const gsize iv_len,
-                    const char *key,
-                    gsize key_len,
-                    gsize *out_len,
-                    GError **error)
+_nmtst_crypto_encrypt (const char *cipher,
+                       const guint8 *data,
+                       gsize data_len,
+                       const char *iv,
+                       const gsize iv_len,
+                       const char *key,
+                       gsize key_len,
+                       gsize *out_len,
+                       GError **error)
 {
 	gnutls_cipher_hd_t ctx;
 	gnutls_datum_t key_dt, iv_dt;
diff --git a/libnm-core/nm-crypto-impl.h b/libnm-core/nm-crypto-impl.h
index 50b9ad4f52..49c5c7a328 100644
--- a/libnm-core/nm-crypto-impl.h
+++ b/libnm-core/nm-crypto-impl.h
@@ -34,27 +34,6 @@ gboolean _nm_crypto_init (GError **error);
 
 gboolean _nm_crypto_randomize (void *buffer, gsize buffer_len, GError **error);
 
-char *_nm_crypto_encrypt (const char *cipher,
-                          const guint8 *data,
-                          gsize data_len,
-                          const char *iv,
-                          gsize iv_len,
-                          const char *key,
-                          gsize key_len,
-                          gsize *out_len,
-                          GError **error);
-
-char *_nm_crypto_decrypt (const char *cipher,
-                          int key_type,
-                          const guint8 *data,
-                          gsize data_len,
-                          const char *iv,
-                          const gsize iv_len,
-                          const char *key,
-                          const gsize key_len,
-                          gsize *out_len,
-                          GError **error);
-
 gboolean _nm_crypto_verify_x509 (const guint8 *data,
                                  gsize len,
                                  GError **error);
@@ -70,4 +49,27 @@ gboolean _nm_crypto_verify_pkcs8 (const guint8 *data,
                                   const char *password,
                                   GError **error);
 
+/*****************************************************************************/
+
+char *_nmtst_crypto_encrypt (const char *cipher,
+                             const guint8 *data,
+                             gsize data_len,
+                             const char *iv,
+                             gsize iv_len,
+                             const char *key,
+                             gsize key_len,
+                             gsize *out_len,
+                             GError **error);
+
+char *_nmtst_crypto_decrypt (const char *cipher,
+                             int key_type,
+                             const guint8 *data,
+                             gsize data_len,
+                             const char *iv,
+                             const gsize iv_len,
+                             const char *key,
+                             const gsize key_len,
+                             gsize *out_len,
+                             GError **error);
+
 #endif  /* __NM_CRYPTO_IMPL_H__ */
diff --git a/libnm-core/nm-crypto-nss.c b/libnm-core/nm-crypto-nss.c
index fb55b95896..6ddc442862 100644
--- a/libnm-core/nm-crypto-nss.c
+++ b/libnm-core/nm-crypto-nss.c
@@ -72,16 +72,16 @@ _nm_crypto_init (GError **error)
 }
 
 char *
-_nm_crypto_decrypt (const char *cipher,
-                    int key_type,
-                    const guint8 *data,
-                    gsize data_len,
-                    const char *iv,
-                    const gsize iv_len,
-                    const char *key,
-                    const gsize key_len,
-                    gsize *out_len,
-                    GError **error)
+_nmtst_crypto_decrypt (const char *cipher,
+                       int key_type,
+                       const guint8 *data,
+                       gsize data_len,
+                       const char *iv,
+                       const gsize iv_len,
+                       const char *key,
+                       const gsize key_len,
+                       gsize *out_len,
+                       GError **error)
 {
 	char *output = NULL;
 	int decrypted_len = 0;
@@ -243,15 +243,15 @@ out:
 }
 
 char *
-_nm_crypto_encrypt (const char *cipher,
-                    const guint8 *data,
-                    gsize data_len,
-                    const char *iv,
-                    gsize iv_len,
-                    const char *key,
-                    gsize key_len,
-                    gsize *out_len,
-                    GError **error)
+_nmtst_crypto_encrypt (const char *cipher,
+                       const guint8 *data,
+                       gsize data_len,
+                       const char *iv,
+                       gsize iv_len,
+                       const char *key,
+                       gsize key_len,
+                       gsize *out_len,
+                       GError **error)
 {
 	SECStatus ret;
 	CK_MECHANISM_TYPE cipher_mech = CKM_DES3_CBC_PAD;
diff --git a/libnm-core/nm-crypto.c b/libnm-core/nm-crypto.c
index 776a6d6858..684867593d 100644
--- a/libnm-core/nm-crypto.c
+++ b/libnm-core/nm-crypto.c
@@ -472,14 +472,14 @@ nm_crypto_make_des_aes_key (const char *cipher,
 }
 
 static gboolean
-_nmtst_crypto_decrypt_key (const char *cipher,
-                           int key_type,
-                           const guint8 *data,
-                           gsize data_len,
-                           const char *iv,
-                           const char *password,
-                           NMSecretPtr *parsed,
-                           GError **error)
+_nmtst_decrypt_key (const char *cipher,
+                    int key_type,
+                    const guint8 *data,
+                    gsize data_len,
+                    const char *iv,
+                    const char *password,
+                    NMSecretPtr *parsed,
+                    GError **error)
 {
 	nm_auto_clear_secret_ptr NMSecretPtr bin_iv = { 0 };
 	nm_auto_clear_secret_ptr NMSecretPtr key = { 0 };
@@ -509,16 +509,16 @@ _nmtst_crypto_decrypt_key (const char *cipher,
 	if (!key.str || !key.len)
 		return FALSE;
 
-	parsed->str = _nm_crypto_decrypt (cipher,
-	                                  key_type,
-	                                  data,
-	                                  data_len,
-	                                  bin_iv.str,
-	                                  bin_iv.len,
-	                                  key.str,
-	                                  key.len,
-	                                  &parsed->len,
-	                                  error);
+	parsed->str = _nmtst_crypto_decrypt (cipher,
+	                                     key_type,
+	                                     data,
+	                                     data_len,
+	                                     bin_iv.str,
+	                                     bin_iv.len,
+	                                     key.str,
+	                                     key.len,
+	                                     &parsed->len,
+	                                     error);
 	if (!parsed->str || parsed->len == 0) {
 		nm_secret_ptr_clear (parsed);
 		return FALSE;
@@ -565,14 +565,14 @@ nmtst_crypto_decrypt_openssl_private_key_data (const guint8 *data,
 			return NULL;
 		}
 
-		if (!_nmtst_crypto_decrypt_key (cipher,
-		                                key_type,
-		                                parsed.bin,
-		                                parsed.len,
-		                                iv,
-		                                password,
-		                                &parsed2,
-		                                error))
+		if (!_nmtst_decrypt_key (cipher,
+		                         key_type,
+		                         parsed.bin,
+		                         parsed.len,
+		                         iv,
+		                         password,
+		                         &parsed2,
+		                         error))
 			return NULL;
 
 		return nm_secret_copy_to_gbytes (parsed2.bin, parsed2.len);
@@ -880,20 +880,6 @@ nm_crypto_md5_hash (const guint8 *salt,
 	}
 }
 
-char *
-nm_crypto_encrypt (const char *cipher,
-                   const guint8 *data,
-                   gsize data_len,
-                   const char *iv,
-                   gsize iv_len,
-                   const char *key,
-                   gsize key_len,
-                   gsize *out_len,
-                   GError **error)
-{
-	return _nm_crypto_encrypt (cipher, data, data_len, iv, iv_len, key, key_len, out_len, error);
-}
-
 gboolean
 nm_crypto_randomize (void *buffer, gsize buffer_len, GError **error)
 {
@@ -957,7 +943,7 @@ nmtst_crypto_rsa_key_encrypt (const guint8 *data,
 	if (!key.str)
 		g_return_val_if_reached (NULL);
 
-	enc.str = nm_crypto_encrypt (CIPHER_DES_EDE3_CBC, data, len, salt, sizeof (salt), key.str, key.len, &enc.len, error);
+	enc.str = _nmtst_crypto_encrypt (CIPHER_DES_EDE3_CBC, data, len, salt, sizeof (salt), key.str, key.len, &enc.len, error);
 	if (!enc.str)
 		return NULL;
 
diff --git a/libnm-core/nm-crypto.h b/libnm-core/nm-crypto.h
index 59c2f7c3e1..8294bdbe1b 100644
--- a/libnm-core/nm-crypto.h
+++ b/libnm-core/nm-crypto.h
@@ -88,16 +88,6 @@ char *nm_crypto_make_des_aes_key (const char *cipher,
                                   gsize *out_len,
                                   GError **error);
 
-char * nm_crypto_encrypt (const char *cipher,
-                          const guint8 *data,
-                          gsize data_len,
-                          const char *iv,
-                          gsize iv_len,
-                          const char *key,
-                          gsize key_len,
-                          gsize *out_len,
-                          GError **error);
-
 gboolean nm_crypto_randomize (void *buffer, gsize buffer_len, GError **error);
 
 /*****************************************************************************/