From e152ec7bf4ba252ff9d3eb13eabd417b931dac9a Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 24 Sep 2018 09:29:55 +0100 Subject: Import Upstream version 1.12.2 --- libnm-util/crypto_gnutls.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libnm-util/crypto_gnutls.c') diff --git a/libnm-util/crypto_gnutls.c b/libnm-util/crypto_gnutls.c index 8604c5c3..47c614b9 100644 --- a/libnm-util/crypto_gnutls.c +++ b/libnm-util/crypto_gnutls.c @@ -242,15 +242,12 @@ crypto_encrypt (const char *cipher, gsize padded_buf_len, pad_len, output_len; char *padded_buf = NULL; guint32 i; - gsize salt_len; - 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_ERR_UNKNOWN_CIPHER, _("Private key cipher '%s' was unknown."), -- cgit 1.3.0-6-gf8a5