diff options
| author | Michael Biebl <biebl@debian.org> | 2016-04-25 15:06:28 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-04-25 15:06:28 +0200 |
| commit | ba829a4f45f619431fa823c39c19046957958dce (patch) | |
| tree | 450b967a7a247b05b794574fd9859fd987b014b2 /libnm-util | |
| parent | 7cba9af6f00e73f211ec9b6c88474044b421ba14 (diff) | |
| parent | 78c3b8801ecf4975e5da1af3b10ae20dd2d876de (diff) | |
Merge tag 'upstream/1.2.0'
Upstream version 1.2.0
Diffstat (limited to 'libnm-util')
| -rw-r--r-- | libnm-util/crypto.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c index 7fdf0f72..3dd89f95 100644 --- a/libnm-util/crypto.c +++ b/libnm-util/crypto.c @@ -654,6 +654,9 @@ crypto_is_pkcs12_data (const GByteArray *data) g_return_val_if_fail (data != NULL, FALSE); + if (!data->len) + return FALSE; + success = crypto_verify_pkcs12 (data, NULL, &error); if (success == FALSE) { /* If the error was just a decryption error, then it's pkcs#12 */ |