diff options
| author | Andre Heinecke <[email protected]> | 2016-08-25 14:17:46 +0000 |
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2016-08-25 14:17:46 +0000 |
| commit | f311b92ceaedb12c9e00a722b6b47bbe6b50871e (patch) | |
| tree | df8c130b1a7213d6e4eb48872bf73a01bb0b09c4 /lang/cpp/src | |
| parent | qt: Fix tofuinfo test when gpg is gpg2 (diff) | |
| download | gpgme-f311b92ceaedb12c9e00a722b6b47bbe6b50871e.tar.gz gpgme-f311b92ceaedb12c9e00a722b6b47bbe6b50871e.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | lang/cpp/src/context.cpp | 1 | ||||
| -rw-r--r-- | lang/cpp/src/global.h | 3 | ||||
| -rw-r--r-- | lang/cpp/src/util.h | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp index 62cad206..564cff58 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 3f12323a..15cc027c 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 8ccb0bf5..b0d47e3e 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, " |