diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-08-31 09:50:02 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-09-03 18:07:59 +0200 |
| commit | 309e9fb07dafcb5cddb465203bbef5405e2665ac (patch) | |
| tree | 9e08e75b031c09c6886453e7f2b7c8333395c388 | |
| parent | aa2a0795fde9b713fd63ec53dc1c1ae39f342b2b (diff) | |
| download | NetworkManager-309e9fb07dafcb5cddb465203bbef5405e2665ac.tar.gz | |
libnm/crypto: remove unused argument key_type for decrypt functions
| -rw-r--r-- | libnm-core/nm-crypto-gnutls.c | 1 | ||||
| -rw-r--r-- | libnm-core/nm-crypto-impl.h | 1 | ||||
| -rw-r--r-- | libnm-core/nm-crypto-nss.c | 1 | ||||
| -rw-r--r-- | libnm-core/nm-crypto.c | 3 |
4 files changed, 0 insertions, 6 deletions
diff --git a/libnm-core/nm-crypto-gnutls.c b/libnm-core/nm-crypto-gnutls.c index be4ba572ed..c8ee85b0d3 100644 --- a/libnm-core/nm-crypto-gnutls.c +++ b/libnm-core/nm-crypto-gnutls.c @@ -57,7 +57,6 @@ _nm_crypto_init (GError **error) guint8 * _nmtst_crypto_decrypt (const char *cipher, - int key_type, const guint8 *data, gsize data_len, const guint8 *iv, diff --git a/libnm-core/nm-crypto-impl.h b/libnm-core/nm-crypto-impl.h index 65db9a28d3..7502e55872 100644 --- a/libnm-core/nm-crypto-impl.h +++ b/libnm-core/nm-crypto-impl.h @@ -62,7 +62,6 @@ guint8 *_nmtst_crypto_encrypt (const char *cipher, GError **error); guint8 *_nmtst_crypto_decrypt (const char *cipher, - int key_type, const guint8 *data, gsize data_len, const guint8 *iv, diff --git a/libnm-core/nm-crypto-nss.c b/libnm-core/nm-crypto-nss.c index a0c3eb1d39..b083439092 100644 --- a/libnm-core/nm-crypto-nss.c +++ b/libnm-core/nm-crypto-nss.c @@ -73,7 +73,6 @@ _nm_crypto_init (GError **error) guint8 * _nmtst_crypto_decrypt (const char *cipher, - int key_type, const guint8 *data, gsize data_len, const guint8 *iv, diff --git a/libnm-core/nm-crypto.c b/libnm-core/nm-crypto.c index 1bd7236cf2..b9be68a989 100644 --- a/libnm-core/nm-crypto.c +++ b/libnm-core/nm-crypto.c @@ -473,7 +473,6 @@ nm_crypto_make_des_aes_key (const char *cipher, static gboolean _nmtst_decrypt_key (const char *cipher, - int key_type, const guint8 *data, gsize data_len, const char *iv, @@ -510,7 +509,6 @@ _nmtst_decrypt_key (const char *cipher, return FALSE; parsed->bin = _nmtst_crypto_decrypt (cipher, - key_type, data, data_len, bin_iv.bin, @@ -566,7 +564,6 @@ nmtst_crypto_decrypt_openssl_private_key_data (const guint8 *data, } if (!_nmtst_decrypt_key (cipher, - key_type, parsed.bin, parsed.len, iv, |