GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cpp: Use fpr field for primaryFingerprint

Browse Source 
* lang/cpp/src/key.cpp (Key::primaryFingerprint): Return
fpr value if available.

--
Should not be necessary but we might have an incomplete
key without subkeys but the fingerprint already set in
gpgme's data type.
This commit is contained in:
Andre Heinecke 2016-08-24 13:57:49 +02:00
parent 799b168243
commit 40ea1c8577
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lang/cpp/src/key.cpp
View File

@ -259,11 +259,16 @@ const char *Key::shortKeyID() const
const char *Key::primaryFingerprint() const const char *Key::primaryFingerprint() const
{ {
const char *fpr = key && key->subkeys ? key->subkeys->fpr : 0 ; if (!key) {
if (fpr) { return nullptr;
return fpr; }
} else { if (key->fpr) {
return keyID(); /* Return what gpgme thinks is the primary fingerprint */
return key->fpr;
}
if (key->subkeys) {
/* Return the first subkeys fingerprint */
return key->subkeys->fpr;
} }
} }