From 8071a6b2ca33c2a46ed1d50ae7283241daaafcd3 Mon Sep 17 00:00:00 2001
From: Andre Heinecke <aheinecke@intevation.de>
Date: Thu, 2 Mar 2017 09:35:05 +0100
Subject: [PATCH] cpp: Add subkey keygrip to API

* lang/cpp/src/key.cpp (Subkey::keyGrip): New.
* lang/cpp/src/key.h: Update accordingly.
---
 NEWS                 | 1 +
 lang/cpp/src/key.cpp | 7 ++++++-
 lang/cpp/src/key.h   | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 4ad1ceab..7899522e 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ Noteworthy changes in version 1.8.1 (unreleased)
  cpp: Key::UserID::revoke()                         NEW.
  cpp: Key::addUid()                                 NEW.
  cpp: GpgGenCardKeyInteractor                       NEW.
+ cpp: Subkey::keyGrip                               NEW.
  qt: CryptoConfig::stringValueList()                NEW.
  gpgme_data_rewind                                  UN-DEPRECATE.
  py: Context.__init__        EXTENDED: New keyword arg home_dir.
diff --git a/lang/cpp/src/key.cpp b/lang/cpp/src/key.cpp
index 3cc26a77..9eebbf01 100644
--- a/lang/cpp/src/key.cpp
+++ b/lang/cpp/src/key.cpp
@@ -476,7 +476,12 @@ bool Subkey::isCardKey() const
 
 const char *Subkey::cardSerialNumber() const
 {
-    return subkey ? subkey->card_number : 0 ;
+    return subkey ? subkey->card_number : nullptr;
+}
+
+const char *Subkey::keyGrip() const
+{
+    return subkey ? subkey->keygrip : nullptr;
 }
 
 bool Subkey::isSecret() const
diff --git a/lang/cpp/src/key.h b/lang/cpp/src/key.h
index b0599c7f..8c11a9d4 100644
--- a/lang/cpp/src/key.h
+++ b/lang/cpp/src/key.h
@@ -270,6 +270,8 @@ public:
 
     const char *cardSerialNumber() const;
 
+    const char *keyGrip() const;
+
 private:
     shared_gpgme_key_t key;
     gpgme_sub_key_t subkey;