From 270c4830551c9810ad4e83f9a1db2b1cb946208c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 1 Oct 2016 00:33:49 +0200 Subject: New upstream version 1.4.2 --- libnm-util/crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libnm-util/crypto.c') diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c index 3dd89f95..9778edeb 100644 --- a/libnm-util/crypto.c +++ b/libnm-util/crypto.c @@ -708,7 +708,7 @@ crypto_verify_private_key_data (const GByteArray *contents, /* Maybe it's PKCS#8 */ tmp = parse_pkcs8_key_file (contents, &is_encrypted, error); if (tmp) { - if (crypto_verify_pkcs8 (tmp, is_encrypted, password, error)) + if (!password || crypto_verify_pkcs8 (tmp, is_encrypted, password, error)) format = NM_CRYPTO_FILE_FORMAT_RAW_KEY; } else { g_clear_error (error); -- cgit 1.3.0-6-gf8a5