From 312c72f7617d974abd9de4218f1e9b920a6a999c Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Thu, 19 Nov 2015 00:01:08 +0000 Subject: [PATCH] crypto_gnutls: removed dead code https://mail.gnome.org/archives/networkmanager-list/2015-November/msg00061.html --- libnm-core/crypto_gnutls.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libnm-core/crypto_gnutls.c b/libnm-core/crypto_gnutls.c index 08047bd9f..3f90c77df 100644 --- a/libnm-core/crypto_gnutls.c +++ b/libnm-core/crypto_gnutls.c @@ -184,18 +184,15 @@ crypto_encrypt (const char *cipher, gsize padded_buf_len, pad_len, output_len; char *padded_buf = NULL; guint32 i; - gsize salt_len; if (!crypto_init (error)) return NULL; - if (!strcmp (cipher, CIPHER_DES_EDE3_CBC)) { + if (!strcmp (cipher, CIPHER_DES_EDE3_CBC)) cipher_mech = GNUTLS_CIPHER_3DES_CBC; - salt_len = SALT_LEN; - } else if (!strcmp (cipher, CIPHER_AES_CBC)) { + else if (!strcmp (cipher, CIPHER_AES_CBC)) cipher_mech = GNUTLS_CIPHER_AES_128_CBC; - salt_len = iv_len; - } else { + else { g_set_error (error, NM_CRYPTO_ERROR, NM_CRYPTO_ERROR_UNKNOWN_CIPHER, _("Private key cipher '%s' was unknown."),