[Pkg-gnupg-commit] [gpgme] 314/412: cpp: Add WithTofu Keylist Mode

[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 f311b92ceaedb12c9e00a722b6b47bbe6b50871e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 25 16:17:46 2016 +0200

    cpp: Add WithTofu Keylist Mode
    
    * lang/cpp/src/context.cpp: Handle WithTofu.
    * lang/cpp/src/global.h (KeyListMode): Add WithTofu.
    * lang/cpp/src/util.h (add_to_gpgme_keylist_mode_t): Handle WithTofu.
---
 lang/cpp/src/context.cpp | 1 +
 lang/cpp/src/global.h    | 3 ++-
 lang/cpp/src/util.h      | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp
index 62cad20..564cff5 100644
--- a/lang/cpp/src/context.cpp
+++ b/lang/cpp/src/context.cpp
@@ -1420,6 +1420,7 @@ std::ostream &operator<<(std::ostream &os, KeyListMode mode)
     CHECK(Signatures);
     CHECK(Validate);
     CHECK(Ephemeral);
+    CHECK(WithTofu);
 #undef CHECK
     return os << ')';
 }
diff --git a/lang/cpp/src/global.h b/lang/cpp/src/global.h
index 3f12323..15cc027 100644
--- a/lang/cpp/src/global.h
+++ b/lang/cpp/src/global.h
@@ -61,7 +61,8 @@ enum KeyListMode {
     Signatures = 0x4,
     SignatureNotations = 0x8,
     Validate = 0x10,
-    Ephemeral = 0x20
+    Ephemeral = 0x20,
+    WithTofu = 0x40
 };
 
 enum SignatureMode { NormalSignatureMode, Detached, Clearsigned };
diff --git a/lang/cpp/src/util.h b/lang/cpp/src/util.h
index 8ccb0bf..b0d47e3 100644
--- a/lang/cpp/src/util.h
+++ b/lang/cpp/src/util.h
@@ -76,6 +76,9 @@ static inline gpgme_keylist_mode_t add_to_gpgme_keylist_mode_t(unsigned int oldm
     if (newmodes & GpgME::Validate) {
         oldmode |= GPGME_KEYLIST_MODE_VALIDATE;
     }
+    if (newmodes & GpgME::WithTofu) {
+        oldmode |= GPGME_KEYLIST_MODE_WITH_TOFU;
+    }
 #ifndef NDEBUG
     if (newmodes & ~(GpgME::Local | GpgME::Extern | GpgME::Signatures | GpgME::SignatureNotations | GpgME::Ephemeral | GpgME::Validate)) {
         //std::cerr << "GpgME::Context: keylist mode must be one of Local, "

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