diff options
| author | Michael Biebl <biebl@debian.org> | 2016-10-01 00:34:40 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-10-01 00:34:40 +0200 |
| commit | 636b831a0f663aa53b0e186d5dc44a623150d376 (patch) | |
| tree | 48ef86c0ff45c7c2c7fcddf910a9102d768c957c /libnm-core/crypto.c | |
| parent | c8a2b286220c6b2bbde384d0d7dd2629b66e312c (diff) | |
| parent | 270c4830551c9810ad4e83f9a1db2b1cb946208c (diff) | |
Merge tag 'upstream/1.4.2'
Upstream version 1.4.2
Diffstat (limited to 'libnm-core/crypto.c')
| -rw-r--r-- | libnm-core/crypto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnm-core/crypto.c b/libnm-core/crypto.c index c27f5c0d..e734f40d 100644 --- a/libnm-core/crypto.c +++ b/libnm-core/crypto.c @@ -712,7 +712,7 @@ crypto_verify_private_key_data (const guint8 *data, /* Maybe it's PKCS#8 */ tmp = parse_pkcs8_key_file (data, data_len, &is_encrypted, NULL); if (tmp) { - if (crypto_verify_pkcs8 (tmp->data, tmp->len, is_encrypted, password, error)) + if (!password || crypto_verify_pkcs8 (tmp->data, tmp->len, is_encrypted, password, error)) format = NM_CRYPTO_FILE_FORMAT_RAW_KEY; } else { char *cipher, *iv; |