colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto_gnutls: removed dead code

Browse Source 
https://mail.gnome.org/archives/networkmanager-list/2015-November/msg00061.html
This commit is contained in:
Joel Holdsworth
2015-11-19 00:01:08 +00:00
committed by Thomas Haller
parent 8051038b4d
commit 312c72f761
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libnm-core/crypto_gnutls.c
View File

@@ -184,18 +184,15 @@ crypto_encrypt (const char *cipher,
gsize padded_buf_len, pad_len, output_len; gsize padded_buf_len, pad_len, output_len;
char *padded_buf = NULL; char *padded_buf = NULL;
guint32 i; guint32 i;
gsize salt_len;
if (!crypto_init (error)) if (!crypto_init (error))
return NULL; return NULL;
if (!strcmp (cipher, CIPHER_DES_EDE3_CBC)) { if (!strcmp (cipher, CIPHER_DES_EDE3_CBC))
cipher_mech = GNUTLS_CIPHER_3DES_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; cipher_mech = GNUTLS_CIPHER_AES_128_CBC;
salt_len = iv_len; else {
} else {
g_set_error (error, NM_CRYPTO_ERROR, g_set_error (error, NM_CRYPTO_ERROR,
NM_CRYPTO_ERROR_UNKNOWN_CIPHER, NM_CRYPTO_ERROR_UNKNOWN_CIPHER,
_("Private key cipher '%s' was unknown."), _("Private key cipher '%s' was unknown."),