[Pkg-gnupg-commit] [gpgme] 56/103: cpp: Fix Key::isDeVs for subkeys

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit c7be41a5f850addceb2a95444bad2a31cdcd1ce5
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Jul 26 15:07:27 2017 +0200

    cpp: Fix Key::isDeVs for subkeys
    
    * lang/cpp/src/key.cpp (Key::isDeVs): Check all subkeys.
    
    --
    Previosly only the primary key was checked and not all subkeys.
---
 lang/cpp/src/key.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lang/cpp/src/key.cpp b/lang/cpp/src/key.cpp
index 31e59e1..66fdea9 100644
--- a/lang/cpp/src/key.cpp
+++ b/lang/cpp/src/key.cpp
@@ -236,7 +236,18 @@ bool Key::isQualified() const
 
 bool Key::isDeVs() const
 {
-    return key && key->subkeys && key->subkeys->is_de_vs;
+    if (!key) {
+        return false;
+    }
+    if (!key->subkeys || !key->subkeys->is_de_vs) {
+        return false;
+    }
+    for (gpgme_sub_key_t subkey = key->subkeys ; subkey ; subkey = subkey->next) {
+        if (!subkey->is_de_vs) {
+            return false;
+        }
+    }
+    return true;
 }
 
 const char *Key::issuerSerial() const

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git