aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2017-03-02 08:35:05 +0000
committerAndre Heinecke <[email protected]>2017-03-02 08:38:31 +0000
commit8071a6b2ca33c2a46ed1d50ae7283241daaafcd3 (patch)
treee3ecb0dfc072b660978f926e8956237b295baa99
parentcpp: Add interactor to generate keys on smartcard (diff)
downloadgpgme-8071a6b2ca33c2a46ed1d50ae7283241daaafcd3.tar.gz
gpgme-8071a6b2ca33c2a46ed1d50ae7283241daaafcd3.zip
cpp: Add subkey keygrip to API
* lang/cpp/src/key.cpp (Subkey::keyGrip): New. * lang/cpp/src/key.h: Update accordingly.
Diffstat (limited to '')
-rw-r--r--NEWS1
-rw-r--r--lang/cpp/src/key.cpp7
-rw-r--r--lang/cpp/src/key.h2
3 files changed, 9 insertions, 1 deletions
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;