crypto_gnutls: removed dead code
authorJoel Holdsworth <joel.holdsworth@vcatechnology.com>
Thu, 19 Nov 2015 00:01:08 +0000 (00:01 +0000)
committerThomas Haller <thaller@redhat.com>
Thu, 19 Nov 2015 12:58:12 +0000 (13:58 +0100)
https://mail.gnome.org/archives/networkmanager-list/2015-November/msg00061.html

libnm-core/crypto_gnutls.c

index 08047bd..3f90c77 100644 (file)
@@ -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."),