35 lines
998 B
Diff
35 lines
998 B
Diff
|
From ac2ca301c6ef2d02810b762c618f1ce504382c4e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Rolf Eike Beer <kde@opensource.sf-tec.de>
|
||
|
|
Date: Tue, 3 Jan 2017 22:46:11 +0100
|
||
|
|
Subject: [PATCH 1/3] fix crash when GnuPG does not output curve fields for
|
||
|
|
keys, take 3
|
||
|
|
|
||
|
|
secret keys, it is.
|
||
|
|
|
||
|
|
BUG:374509
|
||
|
|
CCBUGS:371410,373408
|
||
|
|
FIXED-IN:16.12.1
|
||
|
|
---
|
||
|
|
kgpginterface.cpp | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/kgpginterface.cpp b/kgpginterface.cpp
|
||
|
|
index 6d87093..7c760c0 100644
|
||
|
|
--- a/kgpginterface.cpp
|
||
|
|
+++ b/kgpginterface.cpp
|
||
|
|
@@ -342,9 +342,10 @@ readSecretKeysProcess(GPGProc &p)
|
||
|
|
keytype = Convert::toSubType(caps, true);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ const QString curve = (items > 16) ? lsp.at(16) : QString();
|
||
|
|
result << KgpgKey(lsp.at(4), lsp.at(2).toUInt(), Convert::toTrust(lsp.at(1)),
|
||
|
|
Convert::toAlgo(lsp.at(3)), subtype, keytype,
|
||
|
|
- QDateTime::fromTime_t(lsp.at(5).toUInt()), lsp.at(16));
|
||
|
|
+ QDateTime::fromTime_t(lsp.at(5).toUInt()), curve);
|
||
|
|
|
||
|
|
secretkey = &result.last();
|
||
|
|
|
||
|
|
--
|
||
|
|
2.10.2
|
||
|
|
|